485_time + ch

DefaultBuild/multical.map

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
+Renesas Optimizing Linker (W3.07.00 )             27-Feb-2026 16:00:59
+=======
 Renesas Optimizing Linker (W3.07.00 )             27-Feb-2026 11:29:14
+>>>>>>> 4ee2e168dfece858fa5192b727334dcae342c7db
 
 *** Options ***
 
@@ -66,7 +70,7 @@ SECTION                            START      END         SIZE   ALIGN
 .text
                                   0000090d  00000ac1       1b5   1
 .textf
-                                  00000ac2  00002ec2      2401   1
+                                  00000ac2  00002ece      240d   1
 .const
                                   00003000  000033d1       3d2   2
 .SLIB
@@ -86,7 +90,7 @@ SECTION                            START      END         SIZE   ALIGN
 
 RAMDATA SECTION:  00002efb Byte(s)
 ROMDATA SECTION:  00000eb3 Byte(s)
-PROGRAM SECTION:  00004e6c Byte(s)
+PROGRAM SECTION:  00004e78 Byte(s)
 
 *** Symbol List ***
 
@@ -160,7 +164,7 @@ FILE=DefaultBuild\stkinit.obj
   LSTINIT3
                                   00000b05         0   none ,l         * 
 FILE=DefaultBuild\r_main.obj
-                                  00000b06  00001a53       f4e
+                                  00000b06  00001a5f       f5a
   _RS485_Bridge_Push
                                   00000b06        2b   func ,g         * 
   _RS485_Bridge_ResetFifo@1
@@ -208,201 +212,201 @@ FILE=DefaultBuild\r_main.obj
   _process_cmd_by_prefix@1
                                   00001262        11   func ,l         * 
   _process_one_line@1
-                                  00001273       6ea   func ,l         * 
+                                  00001273       6f6   func ,l         * 
   _handle_uart_command_line
-                                  0000195d        78   func ,g         * 
+                                  00001969        78   func ,g         * 
   _main
-                                  000019d5        68   func ,g         * 
+                                  000019e1        68   func ,g         * 
   _R_MAIN_UserInit
-                                  00001a3d        17   func ,g         * 
+                                  00001a49        17   func ,g         * 
 FILE=DefaultBuild\r_systeminit.obj
-                                  00001a54  00001a94        41
+                                  00001a60  00001aa0        41
   _R_Systeminit
-                                  00001a54        3a   func ,g         * 
+                                  00001a60        3a   func ,g         * 
   _hdwinit
-                                  00001a8e         7   func ,g         * 
+                                  00001a9a         7   func ,g         * 
 FILE=DefaultBuild\r_cg_cgc.obj
-                                  00001a95  00001abe        2a
+                                  00001aa1  00001aca        2a
   _R_CGC_Create
-                                  00001a95        2a   func ,g         * 
+                                  00001aa1        2a   func ,g         * 
 FILE=DefaultBuild\r_cg_cgc_user.obj
-                                  00001abf  00001ac1         3
+                                  00001acb  00001acd         3
   _R_CGC_Get_ResetSource
-                                  00001abf         3   func ,g         * 
+                                  00001acb         3   func ,g         * 
 FILE=DefaultBuild\r_cg_serial.obj
-                                  00001ac2  00001da5       2e4
+                                  00001ace  00001db1       2e4
   _R_SAU0_Create
-                                  00001ac2        10   func ,g         * 
+                                  00001ace        10   func ,g         * 
   _R_UART0_Create
-                                  00001ad2        6e   func ,g         * 
+                                  00001ade        6e   func ,g         * 
   _R_UART0_Start
-                                  00001b40        26   func ,g         * 
+                                  00001b4c        26   func ,g         * 
   _R_UART0_Stop
-                                  00001b66        1e   func ,g         * 
+                                  00001b72        1e   func ,g         * 
   _R_UART0_Receive
-                                  00001b84        18   func ,g         * 
+                                  00001b90        18   func ,g         * 
   _R_UART0_Send
-                                  00001b9c        26   func ,g         * 
+                                  00001ba8        26   func ,g         * 
   _R_SAU1_Create
-                                  00001bc2        10   func ,g         * 
+                                  00001bce        10   func ,g         * 
   _R_UART1_Create
-                                  00001bd2        6e   func ,g         * 
+                                  00001bde        6e   func ,g         * 
   _R_UART1_Start
-                                  00001c40        26   func ,g         * 
+                                  00001c4c        26   func ,g         * 
   _R_UART1_Stop
-                                  00001c66        1e   func ,g         * 
+                                  00001c72        1e   func ,g         * 
   _R_UART1_Receive
-                                  00001c84        18   func ,g         * 
+                                  00001c90        18   func ,g         * 
   _R_UART1_Send
-                                  00001c9c        26   func ,g         * 
+                                  00001ca8        26   func ,g         * 
   _R_IICA0_Create
-                                  00001cc2        50   func ,g         * 
+                                  00001cce        50   func ,g         * 
   _R_IICA0_Stop
-                                  00001d12         5   func ,g         * 
+                                  00001d1e         5   func ,g         * 
   _R_IICA0_StopCondition
-                                  00001d17         5   func ,g         * 
+                                  00001d23         5   func ,g         * 
   _R_IICA0_Master_Send
-                                  00001d1c        43   func ,g         * 
+                                  00001d28        43   func ,g         * 
   _R_IICA0_Master_Receive
-                                  00001d5f        47   func ,g         * 
+                                  00001d6b        47   func ,g         * 
 FILE=DefaultBuild\r_cg_serial_user.obj
-                                  00001da6  00001f48       1a3
+                                  00001db2  00001f54       1a3
   _r_uart0_callback_receiveend@1
-                                  00001da6        5e   func ,l         * 
+                                  00001db2        5e   func ,l         * 
   _r_uart0_callback_softwareoverrun@1
-                                  00001e04         1   func ,l         * 
+                                  00001e10         1   func ,l         * 
   _r_uart0_callback_sendend@1
-                                  00001e05         9   func ,l         * 
+                                  00001e11         9   func ,l         * 
   _r_uart0_callback_error@1
-                                  00001e0e        5c   func ,l         * 
+                                  00001e1a        5c   func ,l         * 
   _r_uart1_callback_receiveend@1
-                                  00001e6a        31   func ,l         * 
+                                  00001e76        31   func ,l         * 
   _r_uart1_callback_softwareoverrun@1
-                                  00001e9b         1   func ,l         * 
+                                  00001ea7         1   func ,l         * 
   _r_uart1_callback_sendend@1
-                                  00001e9c         4   func ,l         * 
+                                  00001ea8         4   func ,l         * 
   _r_uart1_callback_error@1
-                                  00001ea0         1   func ,l         * 
+                                  00001eac         1   func ,l         * 
   _iica0_masterhandler@1
-                                  00001ea1        91   func ,l         * 
+                                  00001ead        91   func ,l         * 
   _r_iica0_callback_master_error@1
-                                  00001f32         7   func ,l         * 
+                                  00001f3e         7   func ,l         * 
   _r_iica0_callback_master_receiveend@1
-                                  00001f39         8   func ,l         * 
+                                  00001f45         8   func ,l         * 
   _r_iica0_callback_master_sendend@1
-                                  00001f41         8   func ,l         * 
+                                  00001f4d         8   func ,l         * 
 FILE=DefaultBuild\r_cg_port.obj
-                                  00001f49  00001fa1        59
+                                  00001f55  00001fad        59
   _R_PORT_Create
-                                  00001f49        59   func ,g         * 
+                                  00001f55        59   func ,g         * 
 FILE=DefaultBuild\owi.obj
-                                  00001fa2  000026d7       736
+                                  00001fae  000026e3       736
   _GPIO_Clear
-                                  00001fa2        12   func ,g         * 
+                                  00001fae        12   func ,g         * 
   _GPIO_Input
-                                  00001fb4        11   func ,g         * 
+                                  00001fc0        11   func ,g         * 
   _GPIO_Read
-                                  00001fc5         9   func ,g         * 
+                                  00001fd1         9   func ,g         * 
   _OWI_Release
-                                  00001fce        11   func ,g         * 
+                                  00001fda        11   func ,g         * 
   _GPIO_StrongDriveHighKick@1
-                                  00001fdf        32   func ,l         * 
+                                  00001feb        32   func ,l         * 
   _GPIO_ForceHighKick
-                                  00002011         8   func ,g         * 
+                                  0000201d         8   func ,g         * 
   _OWI_DriveLow
-                                  00002019        12   func ,g         * 
+                                  00002025        12   func ,g         * 
   _OWI_Init
-                                  0000202b        18   func ,g         * 
+                                  00002037        18   func ,g         * 
   _OWI_Start
-                                  00002043        1e   func ,g         * 
+                                  0000204f        1e   func ,g         * 
   _OWI_Stop
-                                  00002061        14   func ,g         * 
+                                  0000206d        14   func ,g         * 
   _OWI_StopRead@1
-                                  00002075        17   func ,l         * 
+                                  00002081        17   func ,l         * 
   _OWI_SecureStop
-                                  0000208c        54   func ,g         * 
+                                  00002098        54   func ,g         * 
   _OWI_WriteBit
-                                  000020e0        4d   func ,g         * 
+                                  000020ec        4d   func ,g         * 
   _OWI_WriteByte
-                                  0000212d        2a   func ,g         * 
+                                  00002139        2a   func ,g         * 
   _OWI_ReadBit
-                                  00002157        80   func ,g         * 
+                                  00002163        80   func ,g         * 
   _OWI_ReadByte
-                                  000021d7        32   func ,g         * 
+                                  000021e3        32   func ,g         * 
   _OWI_T_ReadBytesAndPrint
-                                  00002209        ff   func ,g         * 
+                                  00002215        ff   func ,g         * 
   _OWI_A_CommandMode
-                                  00002308       262   func ,g         * 
+                                  00002314       262   func ,g         * 
   _OWI_disable
-                                  0000256a        15   func ,g         * 
+                                  00002576        15   func ,g         * 
   _OWI_T_CommandMode
-                                  0000257f        5d   func ,g         * 
+                                  0000258b        5d   func ,g         * 
   _OWI_CommandMode
-                                  000025dc        4a   func ,g         * 
+                                  000025e8        4a   func ,g         * 
   _OWI_ReadBytesAndPrint
-                                  00002626        b2   func ,g         * 
+                                  00002632        b2   func ,g         * 
 FILE=DefaultBuild\i2c.obj
-                                  000026d8  00002858       181
+                                  000026e4  00002864       181
   _disable
-                                  000026d8        26   func ,g         * 
+                                  000026e4        26   func ,g         * 
   _I2C_EnablePower
-                                  000026fe         4   func ,g         * 
+                                  0000270a         4   func ,g         * 
   _I2C_DisablePower
-                                  00002702         3   func ,g         * 
+                                  0000270e         3   func ,g         * 
   _I2C_T_Command_Mode_receiveData
-                                  00002705        4d   func ,g         * 
+                                  00002711        4d   func ,g         * 
   _I2C_Command_Mode_receiveData
-                                  00002752        3e   func ,g         * 
+                                  0000275e        3e   func ,g         * 
   _I2C_Command_Mode_Send
-                                  00002790        c9   func ,g         * 
+                                  0000279c        c9   func ,g         * 
 FILE=DefaultBuild\uart.obj
-                                  00002859  00002a2e       1d6
+                                  00002865  00002a3a       1d6
   _rs485_recover
-                                  00002859        56   func ,g         * 
+                                  00002865        56   func ,g         * 
   _UART1_WaitTxIdle@1
-                                  000028af        2c   func ,l         * 
+                                  000028bb        2c   func ,l         * 
   _rs485_set_tx
-                                  000028db         b   func ,g         * 
+                                  000028e7         b   func ,g         * 
   _rs485_init
-                                  000028e6         c   func ,g         * 
+                                  000028f2         c   func ,g         * 
   _UART0_WaitTxDone_Us
-                                  000028f2        2f   func ,g         * 
+                                  000028fe        2f   func ,g         * 
   _RS485_Send
-                                  00002921        1e   func ,g         * 
+                                  0000292d        1e   func ,g         * 
   _RS485_SendString
-                                  0000293f        11   func ,g         * 
+                                  0000294b        11   func ,g         * 
   _uart_send_string
-                                  00002950        11   func ,g         * 
+                                  0000295c        11   func ,g         * 
   _uart1_send_string
-                                  00002961        40   func ,g         * 
+                                  0000296d        40   func ,g         * 
   _uart_send_hex
-                                  000029a1        43   func ,g         * 
+                                  000029ad        43   func ,g         * 
   _uart1_send_hex
-                                  000029e4        4b   func ,g         * 
+                                  000029f0        4b   func ,g         * 
 FILE=DefaultBuild\delay.obj
-                                  00002a2f  00002aed        bf
+                                  00002a3b  00002af9        bf
   _delay
-                                  00002a2f        18   func ,g         * 
+                                  00002a3b        18   func ,g         * 
   _delay_us
-                                  00002a47        82   func ,g         * 
+                                  00002a53        82   func ,g         * 
   _delay_ms
-                                  00002ac9        25   func ,g         * 
+                                  00002ad5        25   func ,g         * 
 FILE=DefaultBuild\dipSwitch.obj
-                                  00002aee  00002afe        11
+                                  00002afa  00002b0a        11
   _DipSwitch_Init
-                                  00002aee         8   func ,g         * 
+                                  00002afa         8   func ,g         * 
   _DipSwitch_ReadAddr_0to31
-                                  00002af6         9   func ,g         * 
+                                  00002b02         9   func ,g         * 
 FILE=DefaultBuild\gatectrl.obj
-                                  00002aff  00002ec2       3c4
+                                  00002b0b  00002ece       3c4
   _Gate_SetByNum
-                                  00002aff       372   func ,g         * 
+                                  00002b0b       372   func ,g         * 
   _Cal_Init
-                                  00002e71        21   func ,g         * 
+                                  00002e7d        21   func ,g         * 
   _Eol_Init
-                                  00002e92        21   func ,g         * 
+                                  00002e9e        21   func ,g         * 
   _GateCtrl_SelectChannel
-                                  00002eb3        10   func ,g         * 
+                                  00002ebf        10   func ,g         * 
 
 SECTION=.const
 FILE=DefaultBuild\r_main.obj
@@ -706,7 +710,7 @@ FILE=rlink_generates_05
   __s.textf
                                   00000ac2         0   none ,g         * 
   __e.textf
-                                  00002ec3         0   none ,g         * 
+                                  00002ecf         0   none ,g         * 
   __s.const
                                   00003000         0   none ,g         * 
   __e.const

DefaultBuild/multical.mot

@@ -144,33 +144,33 @@ S11308D8000000000000000000000000000000000C
 S11308E800000000000000000000000000000000FC
 S11308F800000000B0040000000000000000010235
 S10809080101000001E3
-S113090DCBF820FE30FCE3FCC20A00FC8E1A003644
+S113090DCBF820FE30FCE3FCC20A00FC9A1A003638
 S113091D00B530C6DBEF04CC0000A747DFF9362065
 S113092DFE3020FEEF04CC0000A747DFF941003272
 S113093D3508EF08B31149D80048C6DBF643DFF498
 S113094D4100320000EF08B3114980004820FEF643
 S113095D43DFF4320000EF0FB3B34100117994007B
-S113096DCEFC00C361CAC2F643DFEDFCD51900F617
+S113096DCEFC00C361CAC2F643DFEDFCE11900F60B
 S113097DEFFED7C1C3C5C78EFD708EFCC1C7AF02D4
 S113098D01605C0798008800318EBF06018D1298B6
-S113099D018800D1DD088800FC0E1E00EF29AF1080
+S113099D018800D1DD088800FC1A1E00EF29AF1074
 S11309ADC9420EC9880161D318EB0CC999A20CC9AF
-S11309BDA20EC9AF10C9420EC9DF0CFCA61D00EF73
+S11309BDA20EC9AF10C9420EC9DF0CFCB21D00EF67
-S11309CD06318EFC041E00C0C09EFC609EFDC6C494
+S11309CD06318EFC101E00C0C09EFC609EFDC6C488
 S11309DDC2C061FCC1C3C5C78EFD708EFCC1AF0A18
 S11309EDC96168DD18EB08C9899D10A208C9B20A4E
-S11309FDC9C09EFC609EFDC6C4C2C061FCFC051E40
+S11309FDC9C09EFC609EFDC6C4C2C061FCFC111E34
 S1130A0D00EFEEC1C3C5C78EFD708EFCC1C7AF42EA
 S1130A1D01605C0798008800318EBF46018800D1C3
-S1130A2D8E4ADD088800FCA01E00EF2B9801AF1A3A
+S1130A2D8E4ADD088800FCAC1E00EF2B9801AF1A2E
 S1130A3DC94218C9880161D318EB16C999A216C900
-S1130A4DA218C9AF1AC94218C9DF0CFC6A1E00EFFF
+S1130A4DA218C9AF1AC94218C9DF0CFC761E00EFF3
-S1130A5D06318EFC9B1E00C0C09EFC609EFDC6C46C
+S1130A5D06318EFCA71E00C0C09EFC609EFDC6C460
 S1130A6DC2C061FCC1C3C5C78EFD708EFCC1AF147D
 S1130A7DC96168DD18EB12C9899E48A212C9B21466
-S1130A8DC9C09EFC609EFDC6C4C2C061FCFC9C1E18
+S1130A8DC9C09EFC609EFDC6C4C2C061FCFCA81E0C
 S1130A9D00EFEEC1C3C5C78EFD708EFCC18E513102
-S1130AAD8E319D61D8FCA11E00C09EFC609EFDC6CA
+S1130AAD8E319D61D8FCAD1E00C09EFC609EFDC6BE
 S1080ABDC4C2C061FC8D
 S1130AC216C80300AEF82761D339315E12F643DD4E
 S1130AD227BBBC02BC04BC06BC08BC0ABC0CBC0ED2
@@ -186,7 +186,7 @@ S1130B62F6BFE6E3674C0DDD2CA806B17C8012A823
 S1130B72007C8043DE0BC2C3A80803146799A3C098
 S1130B82C367FBF8FF4C0ADF0CA80861090014CA0A
 S1130B920000E6EF36AFE6E342E4E3DFB1F7E6FC5A
-S1130BA2472A00A80414C5C2A8021604FFFFB8020B
+S1130BA2532A00A80414C5C2A8021604FFFFB802FF
 S1130BB261C8B515B8041703DFDBDCD9A80012013C
 S1130BC261D307A8080314CA0000F6100AD7C3C1E8
 S1130BD214894C56DD044C76DF2D8A01318EFCD209
@@ -198,12 +198,12 @@ S1130C222D00A80261F844C1C6DE0C15B802C0C387
 S1130C32AF14C96168DFDE1004D7C1C76168DD3053
 S1130C42FECBFFA802FC003500B800440004DC051A
 S1130C5230FF03B80014A802123000BDFCDC3300DC
-S1130C62C2C33900BD003000BDFC9C1C00FE9EFFC7
+S1130C62C2C33900BD003000BDFCA81C00FE9EFFBB
 S1130C721004D7C7AF14C96168DF43F6B800EF1F89
 S1130C82DBE6E34900B573A800334800BDA2E6E3FE
 S1130C92AFE6E3440008A3C0C3DC04F6BFE6E3A85E
 S1130CA200440004AFE6E3DBE4E3DE0343DFD1A860
-S1130CB200440000DD08123000BDFC9C1C00C0D7BB
+S1130CB200440000DD08123000BDFCA81C00C0D7AF
 S1130CC2C173318E446100DC0C63318E446700DEF3
 S1130CD204630CE0738800318E446100DC0F8800E9
 S1130CE2318E446700DE0688000CE0980063318E82
@@ -231,7 +231,7 @@ S1130E32090CD09BA814168A0A0CD09BA804440B54
 S1130E4200DF0BA81614300B00B9E6EEF0FE7C802E
 S1130E52440C8061D8EEE3FE8A0B4C3A61E8EEDA88
 S1130E62FEA81614300C00EFE0D113DF04FECAFD15
-S1130E72D7FC502900D7320030F1FEECFFD7C5C1B0
+S1130E72D7FC5C2900D7320030F1FEECFFD7C5C1A4
 S1130E82C71613440400DF498B4C78DD044C58DF49
 S1130E92408C01318EFCD233006168DD34A8021427
 S1130EA28A02318EFCD233006168DD25A802148ADD
@@ -248,8 +248,8 @@ S1130F42609800A80216A8041488000E020CF099F6
 S1130F52E6EF01F61006D7200A980060C80256315F
 S1130F628E340A00CEFB0300600C309803646C30AC
 S1130F729804C8050DC8060AC80700880091DF084E
-S1130F82F7305802FC472A00AEF804020012880027
+S1130F82F7305802FC532A00AEF80402001288001B
-S1130F92FED6FE100AD7C1C3EF06F7E6FC472A00C5
+S1130F92FED6FE100AD7C1C3EF06F7E6FC532A00B9
 S1130FA2D5F6E3DF1DA80204FFFF16C4C5C5C2615E
 S1130FB2C8B3A8020561F8DE045500EF0C17B802A5
 S1130FC2C0C35501A80216C2C317B802C0C3653113
@@ -265,18 +265,18 @@ S1131052F0C1202CD161F8EEEC00C80478318E3452
 S11310620A00CEFB0300600C309805646C309806CD
 S1131072C80776C8080DC8090AC80A00F1EEA30019
 S1131082E5DEE3F5DFE3FEA6FAF5CCDFF6B802BF50
-S1131092CEDFBFD0E3E730D0DFFC841B00F5F6E3FC
+S1131092CEDFBFD0E3E730D0DFFC901B00F5F6E3F0
-S11310A2AEF8040400FC50290030C409B800F7FE6D
+S11310A2AEF8040400FC5C290030C409B800F7FE61
-S11310B2E4FEF1FCDB2800F7305000FC472A00FB79
+S11310B2E4FEF1FCE72800F7305000FC532A00FB61
 S11310C2F8FFEF40F6C130F401C1322000AEF8045B
 S11310D21000FE68FA61681004DD1C882D72AEF8F7
 S11310E2040C00FEE8FA6168DD0DAEF8040C00FEA3
 S11310F2E3FEF5DEE3EF4FFBF8FFAB040CFEBB614E
 S1131102C8618902AB610902DFBADCB8F5DEE3D556
-S1131112F8E361E8FC592800F730F401FC472A009F
+S1131112F8E361E8FC652800F730F401FC532A0087
 S1131122882C81982C318E44030061D8EE51FF88BB
 S11311322DFEA1FDF5CCDFF6BFCEDFBFD0E3E73055
-S1131142D0DFFC841B00102ED7C3C5C1C7A806710B
+S1131142D0DFFC901B00102ED7C3C5C1C7A80671FF
 S1131152FCA80CDE05F6B806A80CB17C8012A80621
 S11311627C8034000043C5C261D31FA80CB1B80609
 S1131172EF18A80205168B98004C0DDD0C4C0ADD05
@@ -286,84 +286,471 @@ S11311A2D1A8040314CA0000131008D7734C49DFF2
 S11311B208604C57DF035102D7634C49DF08604C87
 S11311C252DF035103D7634C4FDF08604C57DF03F0
 S11311D25104D7634C4FDF08604C52DF035105D7EB
-S11311E25106D7320B30F1FE7FFCE730A086FC2F8C
+S11311E25106D7320B30F1FE7FFCE730A086FC3B80
 S11311F22A00D7C1C79800C3C68800D1DD1D91D18A
 S1131202DD2591D1DD2D91D1DD3591D1DD3D91DF0A
-S11312124688027215FC262600EF42880273647225
+S11312124688027215FC322600EF42880273647219
-S113122217FC052700EF36880273647217FC7F25CA
+S113122217FC112700EF36880273647217FC8B25B2
-S113123200EF2A880273647217FC522700EF1E64BF
+S113123200EF2A880273647217FC5E2700EF1E64B3
-S11312427388027063FC902700EF12880273647241
+S11312427388027063FC9C2700EF12880273647235
-S113125217FCDC2500EF06C5C217FE86FF1004D773
+S113125217FCE82500EF06C5C217FE86FF1004D767
 S1131262C1C3C5C2A80814C0C18802FE85FF100408
 S1131272D777AEF80488F5BEF8679806C3C6C5C228
 S1131282C80D00F5E8E3300004C1AEF804680014A8
-S113129217FEB5FEB80AC20161E3EEB606880691EE
+S113129217FEB5FEB80AC20161E3EEC206880691E2
-S11312A2DF0F88664C78DD0988664C5861E8EEA247
+S11312A2DF0F88664C78DD0988664C5861E8EEAE3B
 S11312B206AEF8040D0014A80812AEF8046600FE87
 S11312C2BCFB6168DD53880D318E442000DC088844
-S11312D206321930EE5506D5E3E3DF258806D1DF61
+S11312D206321930EE6106D5E3E3DF258806D1DF55
 S11312E220880DD1DF1BF6FE6DFCE1EF088800FEBD
-S11312F25FFD8800819800318E442000DCEFEE52BD
+S11312F25FFD8800819800318E442000DCEFEE5EB1
-S113130206AEF8040D00168FE3E34D61E8EE4306E2
+S113130206AEF8040D00168FE3E34D61E8EE4F06D6
-S1131312708806FE41FCEE3A06C81300AEF80413C8
+S1131312708806FE41FCEE4606C81300AEF80413BC
 S11313220014A80812AEF8046600FED3FB616861DB
-S1131332F8EE9A0188139800318E442000DC088864
+S1131332F8EE950188139800318E442000DC088869
-S113134206322A30EEE505C0C18FE3E36140DF12C5
+S113134206322A30EEF105C0C18FE3E36140DF12B9
-S1131352FC712E008806323B30FE0DFBFE17FBEEBD
+S1131352FC7D2E008806323B30FE0DFBFE17FBEEB1
-S1131362F105D161E8EEEB058806D161E8EEE3050B
+S1131362FD05D161E8EEF7058806D161E8EEEF05E7
 S1131372E5DEE3F5DFE3FEB6F7F5CCDFF6BFCEDF5D
-S1131382BFD0E3E730D0DFFC841B00A808147C80C4
+S1131382BFD0E3E730D0DFFC901B00A808147C80B8
 S1131392440284DC0634010415B808AEF80466007D
 S11313A2123000C1FCDC3300A8080400C114CA00D6
 S11313B20DA5CA000AA5CA0000F61412EF161504F8
 S11313C201001461D8A3A800442D00A80261F844C6
 S11313D2C1C6DE0C15B802C0C3AF0AC96168DFDE3C
-S11313E23000C1FC50290030C027B806F6B800F11D
+S11313E23000C1FC5C29003010AFB806F6B800F139
-S11313F29802AFE0E3B80A300900B808EF30FE7291
+S11313F29802AFE0E3B80A301300B808EF30FE7287
-S1131402F8F7303200FC472A00FBF8FFA80604CEA6
+S1131402F8F7303200FC532A00FBF8FFA80604CE9A
 S1131412FFB80661C8618908D5DFE3DF40A80A4244
 S1131422E0E3DD0FF6BBE19802AFE0E3B80AF6B8F9
 S113143204EF1C8802D1DD17AB043200BBA804619F
 S1131442D8A1B804440000AB61F8448813DE0EA8A6
 S113145208440000A80661F8443200DEA1FE13F835
-S1131462F5DEE3A808440000A80661F844320061EE
+S1131462F5DEE3A808440000A80661F8442C0161F3
-S1131472C8EEDF04FC592800324630F1FEEAF9DBFB
+S1131472C8EEEB04FC652800A80612F1FEEAF93274
-S1131482D4E3EBD2E3FBD8E3AFD6E3B804AFDCE3B7
+S11314824630F1FEE3F9DBD4E3EBD2E3FBD8E3AF7E
-S1131492B802AFDAE3B800AEF8042600B806B81A08
+S1131492D6E3B804AFDCE3B802AFDAE3B800AEF8DF
-S11314A2C81C0F305A30B822C8240FA802C1A8029F
+S11314A2042600B806B81AC81C0F305A30B822C82D
-S11314B2C1C7A80AC1C3C5A82E12A82614882850D9
+S11314B2240FA802C1A802C1C7A80AC1C3C5A82E85
-S11314C20FFCFA3300100CA80612F1EE5E04A80811
+S11314C212A826148828EE0002A80814AEF80466AE
-S11314D214AEF8046600B80212041106B800FCDC6B
+S11314D200B80212041106B800FCDC3300A808129A
-S11314E23300A80812A8000314CA0000C81200C8D6
+S11314E2A8000314CA0000C81200C80C00C81100E6
-S11314F20C00C81100F6B814C81000C80F00C80EBA
+S11314F2F6B814C81000C80F00C80E01AFE0E3AE7E
-S113150201AFE0E3AEF8041400C104FAFFC1A1C1C3
+S1131502F8041400C104FAFFC1A1C1A1C1A1C1041C
-S1131512A1C1A1C104FBFFC104060014A80EFEF57B
+S1131512FBFFC104060014A80EFEFAF744FFFF10F5
-S1131522F744FFFF100CDF088806328630EEFC0316
+S11315220CDF088806328630EE0D0444010061E8BF
-S113153244010061E8EE26028812318E442000DC68
+S1131532EE37028812318E442000DC088806329588
-S1131542088806329530EEE303880CD1DD07318E2C
+S113154230EEF403880CD1DD07318E441500DC083B
-S1131552441500DC08880632A630EECF03AEF80448
+S1131552880632A630EEE003AEF8041200168FE3DA
-S11315621200168FE3E34D61F8EE6001D161E8EEFB
+S1131562E34D61F8EE7101D161E8EEF2038806D130
-S1131572E1038806D161E8EED903E5DEE3F5DFE3B2
+S113157261E8EEEA03E5DEE3F5DFE3FEB1F5F5CC7F
-S1131582FEACF5F5CCDFF6BFCEDFBFD0E3E730D05B
+S1131582DFF6BFCEDFBFD0E3E730D0DFFC901B0035
-S1131592DFFC841B00A808147C80440284DC06342B
+S1131592A808147C80440284DC0634010415B808CB
-S11315A2010415B808AEF8047706123004C5FCDC51
+S11315A2AEF8047706123004C5FCDC3300A8080444
-S11315B23300A8080404C514CA000DA5CA000AA56C
+S11315B204C514CA000DA5CA000AA5CA0000F6147F
-S11315C2CA0000F61412EF16150401001461D8A320
+S11315C212EF16150401001461D8A3A800442D00DB
-S11315D2A800442D00A80261F844C1C6DE0C15B867
+S11315D2A80261F844C1C6DE0C15B802C0C3AF0A42
-S11315E202C0C3AF0AC96168DFDE3004C5FC5029FA
+S11315E2C96168DFDE3004C5FC5C29003010AFB885
-S11315F20030C027B806F6B800F19802AFE0E3B8AD
+S11315F206F6B800F19802AFE0E3B80A301300B877
-S11316020A300900B808EF30FE68F6F7303200FC01
+S113160208EF30FE6DF6F7303200FC532A00FBF887
-S1131612472A00FBF8FFA80604CEFFB80661C8619A
+S1131612FFA80604CEFFB80661C8618908D5DFE3D6
-S11316228908D5DFE3DF40A80A42E0E3DD0FF6BB19
+S1131622DF40A80A42E0E3DD0FF6BBE19802AFE037
-S1131632E19802AFE0E3B80AF6B804EF1C8802D1DD
+S1131632E3B80AF6B804EF1C8802D1DD17AB043212
-S1131642DD17AB043200BBA80461D8A1B80444007E
+S113164200BBA80461D8A1B804440000AB61F8440B
-S113165200AB61F8448813DE0EA808440000A80613
+S11316528813DE0EA808440000A80661F84432008C
-S113166261F8443200DEA1FE09F6F5DEE3A808447F
+S1131662DEA1FE0EF6F5DEE3A808440000A806613A
-S11316720000A80661F844320061C8EED502FC59A4
+S1131672F8442C0161C8EEE60212F1FEEBF7FC65B8
 S1131682280032B530F1FEE0F7DBD4E3EBD2E3FB22
 S1131692D8E3AFD6E3B804AFDCE3B802AFDAE3B819
 S11316A200AEF8042600B806B816C8180F30C930C0
 S11316B2B81EC8200FA802C1A802C1C7A80AC1C384
+<<<<<<< HEAD
+S11316C2C5A82A12A822148824500FFCFA33001049
+S11316D20CA80612F1EE600288114C43DF09E5E81A
+S11316E2E3FC7D2E00EF08CFE8E302FC9E2E008887
+S11316F20E73880F72881070880CFC0B2B00880CF8
+S1131702FCBF2E00FBF8FFA814B804A80861290442
+S1131712B8081601881161C3124C458806DF0632E7
+S1131722F530EE1302320131EE0D024C45DD04F7C1
+S113173213EF218806321831EEFD0104660012A867
+S1131742021403B800A8040503148973C4C5639979
+S1131752A802A112B802177C8014137C8045AEF84B
+S1131762DCD90466000714CA0000A8087C80440778
+S113177280DE088806322D31EEBD018866318EFC8A
+S11317820B3500B8008867318EFC0B3500128800D7
+S113179275627065FE15FA98074C06DF08880632F2
+S11317A23931EE930188684C74DD0E88684C54DD3F
+S11317B20832020013B802EF1988073203004C04FE
+S11317C2DF0613B802E1EF084C02DFE813B802F1B6
+S11317D29807AEF80466000314894C5FDD05894C52
+S11317E23ADF04A313B802A8087C801413A17C80F6
+S11317F245DC088806324231EE3D01AEF80466004B
+S113180203B80414897315A1B80014897063FEAF78
+S1131812F4980AA808127C8014A8020404007C80AC
+S113182245DE4EC4C5A589318E443000DC43A8048C
+S113183214040200168B318E443A00DE341504037C
+S113184200168B318E443000DC2715040300168BFE
+S1131852318E443A00DE1A15040400168B318E448C
+S11318623000DC0D15040400168B318E443A00DC82
+S1131872088806325131EEBF0015040300168B505E
+S11318820AD6161504020014895064D6B800A804B6
+S11318920404001489318E14A802040500B804A8B3
+S11318A20007FBF8FF050430EBB802441202DC081F
+S11318B28806325F31EE800088074C04DD044C0355
+S11318C2DE63A8026168DF078806326F31EF69635D
+S11318D27C8073A802016109047C804361C303F61E
+S11318E2EF2A8806327E31EF4F016109040704664C
+S11318F200148973A5897063FEC5F377C2C3AEF879
+S1131902046604031467FBF8FF99A313BBAB614994
+S113191202DCD6A80201610904614908DD2B8806AC
+S1131922329131EF134C05DD044C03DF1CA8026134
+S113193268DF0A880632A131FE2EF5EF22A804439D
+S1131942DD07880632B831EFEFA802C1AEF80468A9
+S11319520414880C728809708FE8E3FE02F9C0AEA1
+S1131962F804780ABEF8D7EF6FF5DEE3F5DFE3FE9D
+S1131972BDF1F5CCDFF6BFCEDFBFD0E3FC652800B6
+S1131982F5F8E3D5DEE361E8FEE8F2D5C6DBDD1F58
+S1131992F5C6DBEBCADF32CADBF1FED4F8F6BFC808
+S11319A2DBBFCADF30CADB02C8DBE7FC901C00D510
+S11319B2CCDFDD24F5CCDFD5DEE3DF0AEBD0E33286
+S11319C2D0DFE1FEABF8F6BFCEDFBFD0E330D0DF2D
+S11319D202CEDFE7FC901B00D5F8E3DF8CEFA420F6
+S11319E24AFE6300FCDE1A00FCDE1B00FCCE1C0077
+S11319F2FC4C1B00FC4C1C00AEF8040A00B800B8F6
+S1131A0202C8040F30CE31B806C8080F8FE3E331A1
+S1131A128EC1A80812A804148806500FFCFA3300D9
+S1131A22C0A800FE14F2A800FC5C290030CADB0244
+S1131A32C8DBE7FC901C0030D0DF02CEDFE7FC906D
+S1131A421B00FE22FFEFFE717AFAFC551F00FCF226
+S1131A522800FCFA2A00FC022B009FE3E3D7341689
+S1131A6200CA0000CA0100CA0200CA0300CA040074
+S1131A72CA0500CA0600CA0700CA0800FCCB1A003D
+S1131A82FCA11A00FC551F00FCCE1A00FCCE1B0060
+S1131A92FCCE1C00F57800D7717BFAFEC0FFD73666
+S1131AA2C4027182CEA000717AA1714BA4CC03014D
+S1131AB27128C502716AA1716BA4710BA1CC048057
+S1131AC28C046C429C0471A3D78EA8D77120F000B9
+S1131AD200000000F6BF1601FE0100D7347000AA10
+S1131AE2A4086C0308BAA4711AE5711BE1712AE512
+S1131AF2712BE1711AED711AE9712AED712AE9303B
+S1131B022200BA98309780BA9CC910004489718A1D
+S1131B1299300700BA96302201BA9A309740BA9E99
+S1131B22C9120044AAA8086C0108BAA8AAB0BAB09B
+S1131B32AAAA086C0108BAAA51406F21FF9E216A21
+S1131B42012051DF5F21FF9E21D7341201AA06082A
+S1131B526C0108BA06AA08086C0108BA08A9086C3C
+S1131B620308B9711BE1712BE1711BE5712BE5D7F8
+S1131B72711AE5712AE5341401A9086C0308B9AA9B
+S1131B8206085CFE08BA06711BE1712BE1D7141337
+S1131B926168DD0EF6BF0EC913BF10C915BF0CC9AB
+S1131BA2F6D7308100D714136168DD1C15BF08C94C
+S1131BB213BF0AC9711AE5EB08C9899D10A208C9A5
+S1131BC2B20AC9711BE5F6D7308100D77130F00033
+S1131BD200000000F6BF5601FE0100D7347000AACF
+S1131BE2E4086C0308BAE4715AE7715BE3716AE7CB
+S1131BF2716BE3715AEF715AEB716AEF716AEB30F0
+S1131C022200BAD8309780BADCCB4800448971AA42
+S1131C1299300700BAD6302201BADA309740BADED8
+S1131C22CB4A0044AAE8086C0108BAE8AAF0BAF060
+S1131C32AAEA086C0108BAEA51026F21FF9E216ADE
+S1131C42010451FB5F21FF9E21D7345201AA0608E9
+S1131C526C0108BA06AA08086C0108BA08A9086C3B
+S1131C620308B9715BE3716BE3715BE7716BE7D7EF
+S1131C72715AE7716AE7345401A9086C0308B9AAD6
+S1131C8206085CFE08BA06715BE3716BE3D71413B2
+S1131C926168DD0EF6BF18C913BF1AC915BF16C98C
+S1131CA2F6D7308100D714136168DD1C15BF12C941
+S1131CB213BF14C9715AE7EB12C9899E48A212C90B
+S1131CC2B214C9715BE7F6D7308100D77140F000D6
+S1131CD236300271F3712AE6712BE2712AEE712A0F
+S1131CE2EA5A06F3510C6F26FF9E267138310234EC
+S1131CF23002CA024CCA03558A01718A9A01CA0483
+S1131D0210711A52710A5271C371B271A2712BE627
+S1131D1271F271E251F35F26FF9E26D77178300289
+S1131D22D771003002D7C79800C3C6712AE631E4DE
+S1131D32520C31F25108712BE6308200C2D7711075
+S1131D423002712BE66091D070DFFA31945103F7BF
+S1131D52EF0332830015BF26C917BF24C9F51CC976
+S1131D628800718B9E5013C2D7C79800C3C6712ACC
+S1131D72E631E4520C31F25108712BE6308200C292
+S1131D82D771103002712BE66091D070DFFA319472
+S1131D925103F7EF0332830015BF20C9F6BF22C9EE
+S1131DA217BF1EC9F51CC98800718A9E5013C2D779
+S1131DB2D5DEE3DD168FD0DFFC060B00A2E0E3F6EE
+S1131DC2BFCEDFBFD0E330D0DFEF3DDBCEDF49D083
+S1131DD2DF734C0DA2CEDFAFCEDFBFD0E3DD0D63E8
+S1131DE24C0ADD08AFCEDF44FF03DC16AFD0E3615B
+S1131DF268DDCC8FD0DF4C78DD044C58DFC1E5CCF4
+S1131E02DFD730D0DF02CEDFE7FC901B00D7D7F15B
+S1131E12FCE72800E5F6E3D775318E31EDDE13DBFE
+S1131E22D4E3E602D2E31661D8A313BFD4E317BF07
+S1131E32D2E365318E311EDE13DBD8E3E602D6E34C
+S1131E421661D8A313BFD8E317BFD6E365318E3129
+S1131E52FDDE13DBDCE3E602DAE31461D8A313BF8D
+S1131E62DCE315BFDAE3F5CCDFF6BFCEDFBFD0E3A8
+S1131E72E5F8E3D7DBC8DB49CADB73AFC8DB44FF51
+S1131E8203DE12A2C8DBAFC8DBBFCADF634C0DDDC1
+S1131E92084C0ADF04E5C6DBD730CADB02C8DBE73D
+S1131EA2FC901C00D7D7E5F7E3D7D731E2520CAF49
+S1131EB226C96168DD05E6FE8200D78F1CC9318E12
+S1131EC2319DDC2931A4513451806F1CC99F1CC936
+S1131ED231B4510F71303002AF26C96168DF22FE7E
+S1131EE26900D736300271A271B371D2D731B451BD
+S1131EF21D31A251E3AF26C96168DDDC300200EF77
+S1131F02B6EB24C9899E50A224C9B226C9D7AF22EE
+S1131F12C94220C9DE22EB1EC98E5099A21EC9A253
+S1131F2222C9AF22C94220C9DF0936300271A37126
+S1131F32B2EFB771503002D7FE0800D7E5EFE3E500
+S1131F42EEE3D771003002E5EFE3D771003002E52A
+S1131F52EEE3D7CD0009CD0119CD0305F404CD0577
+S1131F62F0F406CD0702F409CD0AF0F40CF40DCD19
+S1131F720FF0345600CA000CCA0101CA11E0CA1695
+S1131F82DEF52002CA2004CE20F0CE21E6CE23FACA
+S1131F92CE2401CE2508CE260CCE2700CE28FFCE95
+S1131FA22903CE2A00CE2C1ECE2F00D73457008907
+S1131FB2718A995A07FE51FE5F27FF9E27D734572D
+S1131FC20089718A996A0701E16F27FF9E27D78DDD
+S1131FD207318E31FD31FED734570089718A996AEF
+S1131FE20701E16F27FF9E27D7C1C3FEEAFFFEDE8A
+S1131FF2FF6168DD2334570089718B996A070151A7
+S1132002FE5F27FF9E27C2C3A802FC532A0034574F
+S11320120089718A99FEC0FF1004D7F7300500FECB
+S1132022C7FFD734570089718A995A07FE51FE5F58
+S113203227FF9E27D7BFEAE313BFECE33437008AB6
+S113204220718A9A2089718B99FE72FFD7FE5CFFF8
+S1132052F7303200FC532A00FE63FFF7300500FE1E
+S113206287FFF730B004FC532A00D7FE50FFF73045
+S11320726009FC532A00F730100EFC532A00D7FEE5
+S1132082A1FFF7306009FC532A00FE4BFFF7301022
+S11320920EFC532A00D7C7FE12FFF6B800F73060D1
+S11320A209FC532A00EF1CFE14FFF730F000FC5326
+S11320B22A00FEF7FEF7302C01FC532A00FBF8FF3E
+S11320C2617900A8007C80440380DCDBFEEFFEFE25
+S11320D249FFF7305B09FC532A00FECFFEF730328A
+S11320E200FC532A00FED6FEC0D7C76168DD053066
+S11320F22C01EF03308403B800FEDCFEF730050048
+S1132102FEE6FEFBF8FF30B00461290014F6F76125
+S1132112D8B123124400001561F8440600DC0C0413
+S1132122FBFF1461C8B315FC532A00FEF5FEF7A8A1
+S113213200FC532A00C0D7C1C7300700EF186073F0
+S11321428803318ED3EF03311E93DFFB31FD31FE61
+S1132152FE97FFA800B1B8003175E3FE60FE1004DB
+S1132162D7C730F401B800EF06F7E6FC532A00FEA5
+S11321725DFE6168DF0DA8001201B3C0C361D30321
+S1132182F1EF01E13105E2A8000161C319D5E3E3EE
+S1132192DF0B30DE31FC6D290051FFC2D730EC3148
+S11321A2FC5C2900EFF3AFECE31231FD1413311E92
+S11321B212AFEAE3311E05FC532A00FE11FEB800F9
+S11321C2AFEAE31431FE12AFECE301031215013658
+S11321D20000340500CEFB0B00FC532A008800C229
+S11321E2D72004F3300700EF1BFE75FF72C4C5FB52
+S11321F2F8FF647362318ED3EF020193DFFC606EE9
+S11322020273B515B800639802A8003175DB880221
+S11322121004D7C120A87C80448280DC0530810070
+S1132222B8A8F7EF10FEB9FF77C2C3AEF8042600D0
+S113223203146799A3C0C3A8A87C8014137C8045A7
+S1132242DCE3AEF8041E00B800B80AC80C0F30FA7A
+S113225231B81AC81C0F8826318EC1A81C12A80CCA
+S113226214880E500FFCFA3300C0C2C3AEF8040E39
+S113227200FCF33400AEF8040E00D5E3E3DF07FC00
+S11322826D2900E6EF77FC5C2900EFF7AEF804262F
+S1132292000314899801A5899800F7301027FC3BA4
+S11322A22A00AEF8041E00B802B806C8080F3000AF
+S11322B232B816C8180F8800318EC18803318EC116
+S11322C2A81A12A80A14880C500FFCFA330010043E
+S11322D2A80212AEF8040E00FCF33400AEF8040EA9
+S11322E200D5E3E3DF06FC6D2900EF04FC5C290062
+S11322F2F7301027FC3B2A00A804040200B804A803
+S1132302A87C8014A804127C804561D8EE7DFF105D
+S1132312AAD7C3C120C6341800320A32AEF8042E3A
+S113232200FCDC3300F6B806F730581BFC532A00D5
+S1132332FBF8FFF6EEF000FE5CFDF6EF13A80431A5
+S11323422D07042E006109001489FEEAFDA800A1EC
+S1132352B800FBF8FF7C80440480DCE1FE0CFDF74E
+S113236230F401FC532A00F7EF0BAEF80414000317
+S113237214CA00FFA3137C80440D80DCEDF6EF56F3
+S1132382F6B800F730F401FC532A00FE08FD51515F
+S1132392FEA4FDEF12FE49FE77C2C3AEF804140098
+S11323A203146799A3C0C3A8007C80440D80DCE5B4
+S11323B2FEB8FCF612EF0DAEF80414000314898182
+S11323C2DF1DA3137C80440D80DCECA802440200D0
+S11323D261F8EE9C01A1B8027C80440380DCA1FB7D
+S11323E2F8FF17044600BB610906B810C8120F3083
+S11323F22232B82AC82C0F8816318EC18817318E22
+S1132402C1A82E12A814148816500FFCFA33001215
+S11324121004FBF8FFA806031261090014CA002C79
+S1132422A313B806A804A1B8047C8044068061D82A
+S1132432EE04FF88C84C0361E8EEE200A8C66168B6
+S113244261F8EED900F6EE9900FE4AFC88C96101F2
+S1132452FEE4FCF6EF0DA8C66109001489FED7FC60
+S1132462A800A1B800FBF8FF7C80440380DCE7FEEF
+S1132472F9FBF730F401FC532A00F7EF0BAEF80432
+S113248214000314CA00FFA3137C80440D80DCED06
+S1132492FE03FC88C9610181FE9CFCF6EF13FE4039
+S11324A2FD73FBF8FF17041400610900146399AB70
+S11324B2A1B8007C80440D80DCE4FEAEFBFBF8FF97
+S11324C2F612EF0C1704140003148981DF20A313FE
+S11324D27C80440D80DCEDA80244020061F8EE9099
+S11324E200A1B8027C8044038061D8EE5BFF17042C
+S11324F24600610906B80CC80E0F302B32B826C844
+S1132502280F8816318EC18817318EC1A82A12A8C5
+S113251210148812500FFCFA33001004EF2217042F
+S11325224600610906B808C80A0F303432B822C816
+S1132532240FA82212A80814880A500FFCFA3300A8
+S1132542FBF8FF6109060704460014CA000DA5CA78
+S1132552000AA5CA000017044600D5E3E3DF06FC1F
+S11325626D2900EF04FC5C2900F7301027FC3B2A9C
+S11325720010CAD7D5E3E3DF08303932FC6D2900F5
+S1132582D7303E32FC5C2900D7C3C12004639800D3
+S1132592F6B802F7301027FC532A00F730B004FED5
+S11325A293FAFEF1FA88006101FE8BFBEF0EA80498
+S11325B2031489FE81FBFBF8FF6179028806318EE0
+S11325C26C8014A802127C8045DCE3FE9DFAD5E3FC
+S11325D2E3DF0A304332FC6D29001008D730483259
+S11325E2FC5C2900EFF4C3C1C7639800FEA7FA8814
+S11325F2006101FE41FBF713EF0CA802031489FEEC
+S113260235FBA800A112B8008804318E6C80141323
+S11326127C8045DCE5FE53FAD5E3E3DF0A304D3234
+S1132622FC6D29001006D7305232FC5C2900EFF40D
+S1132632C1C7C3A8040161C318D5E3E3DF0A305755
+S113264232FC6D29001006D7306E32FC5C2900EF93
+S1132652F4A8047C80445982DC05305802B804FE94
+S113266234FA8800610181FECDFAF7EF0BFE71FBAB
+S113267273A800334828C9A3C0C3A8047C801413D8
+S11326827C8045DCE8F713B80213EF270480CB14EF
+S11326924928C97731CE1249853299A567318E31DD
+S11326A2CD31CE1249963299A802A112B802A800DD
+S11326B2040200B800A8047C8014137C8045A8009E
+S11326C2DCCA0480CB14CA000DA5CA000AA5CA003C
+S11326D200FEABF93080CBD5E3E361F8EE62FFEEA6
+S11326E269FF34020032F4E3306450FC281D0061B7
+S11326F268DD14D5E3E3DF0830A832FC6D2900D786
+S113270230BA32FC5C2900D7CD0702D7F407D7C10F
+S1132712C3FCCE1C00FEF0FFF7301027FC3B2A005E
+S11327228800318E14A80212880161015064FC28C9
+S11327321D0061688FE3E3DD16D1DF0A30CC32FC81
+S11327426D29001004D730DE32FC5C2900EFF4D18D
+S1132752DF0530F032EFE830F532EFEDC71663985B
+S11327620062318E14C7C2880061015064FC281DC6
+S11327720061688FE3E3DD15D1DF0930FA32FC6DC5
+S11327822900C0D7300C33FC5C2900C0D7D1DF0547
+S1132792301E33EFE9302333EFEDC1C7C18805D1D1
+S11327A2DD6E345802F73034D0FCEC3300F5EFE33D
+S11327B28805318E14880061013234D050E8FC6BF4
+S11327C21D006168DF11F61612C7C4C0C3D5EFE35A
+S11327D2DD14F6B802EF65D5E3E3DF05302833EF05
+S11327E222303D33EF26150401001661D8A3A80058
+S11327F2442D001561F844C1C6DCCED5E3E3DF09FC
+S1132802305233FC6D2900EF07306333FC5C29003E
+S11328121006D7048CD214A802124934D07731CED0
+S11328221249743399A567FBF8FF318E31CD31CE4D
+S11328321249853399617902AB040200B800880514
+S1132842318E12A80243A800DCC9048CD214CA0037
+S11328520DA5CA000AA5CA0000308CD2D5E3E3DD77
+S1132862A2EFA9717BFAF1FE7B00FC721B00F73028
+S1132872C800FC532A00FCDE1A00F730C800FC53DF
+S11328822A00FC4C1B00F730C800FC532A00F6BF98
+S1132892D4E3BFD2E3BFD8E3BFD6E3BFDCE3BFDAFE
+S11328A2E3F5CCDFF5CEDFBFD0E3E730D0DFFC9039
+S11328B21B00F5F8E3717AFAD72004F61412EF1626
+S11328C2150401001461D8A3A800442D00A80261D4
+S11328D2F844C1C6DE0C15B802C0C3AF14C961689E
+S11328E2DFDE1004D7D1DD046A0420D75A04DFD70F
+S11328F251DF5F24FF9E24F1FEEAFFD7C3C113EF29
+S113290216F7300A00FC532A00A80004F6FFB800A8
+S1132912A802DC03B1B802D5F6E3DF0C440000A838
+S11329220061F8440A00DED91004D7C1C36168DD2E
+S113293215A8006168DD0FF5F6E3E1FEA7FFC2C347
+S1132942A802FCA81B001004D714F7EF01A3130577
+S1132952168BD1DFF815FED2FFD714F7EF01A313BC
+S113296205168BD1DFF815FEC1FFD7C1C7FBF8FFEF
+S11329726168DD34F6EF02ABA1BB6109021489D1AF
+S1132982DFF5FE34FFF5F7E3A800440004DC05306C
+S1132992FF03B80014A802123040D7FCDC3300C293
+S11329A2C33040D7FCA81C001004D7C7705C0F7753
+S11329B260314A318E440A00DE05323000EF0834B9
+S11329C2410004F6FF12150360980067318E440A31
+S11329D200DE05323000EF0834410004F6FF121520
+S11329E203609801320200AEF8FE3FFFC0D7705C6C
+S11329F20F7760314A318E440A00DE05323000EF2F
+S1132A020834410004F6FF121503609F40DB67316E
+S1132A128E440A00DE05323000EF0834410004F629
+S1132A22FF121503609F41DBFE8EFEF5F7E33202CF
+S1132A32003040DBFCA81C00D7C104FFFF16136161
+S1132A42C8B114A80003C5C217B800DFEDDCEBC09F
+S1132A52D7200EB80613B808A808440000A80661D7
+S1132A62F8449700A806DE0D326400CEFB01C3C40D
+S1132A72326400EF0B326A00CEFB01C3C4326A0037
+S1132A8216A808CEFB020512170432001461D8A35B
+S1132A9215360000346400CEFB0B001413B80C1579
+S1132AA2B80AF6B804EF1100A80414A8020401003D
+S1132AB2121561D8A1B80413B802A80416A802B862
+S1132AC200A80C12A80A141743A80061F845DCD721
+S1132AD2100ED7200414F6EF12F6EF03A800A1B8E3
+S1132AE200A800442003DCF4A802A1B802A8021240
+S1132AF2154361C3E41004D7513E6F28FF9E28D7C3
+S1132B028D08311A5C1F7C1FD7C3C19175318E1297
+S1132B12654C1461C8EE6003131249BE33311C9E26
+S1132B22FC79963361CB8800D1DD056A0F08EF0387
+S1132B325A0FF78802D1DD056A0610EF035A06EF31
+S1132B428803D1DD066A0F10EE2D035A0FEFEE272C
+S1132B52038800D1DD056A0F04EF035A0FFB8802D4
+S1132B62D1DD056A0620EF035A06DF8803D1DD06AC
+S1132B726A0F20EE02035A0FDFEEFC028800D1DD59
+S1132B82056A0F02EF035A0FFD8802D1DD056A06BA
+S1132B9240EF035A06BF8803D1DD066A0001EED76F
+S1132BA2025A00FEEED1028800D1DD056A0F01EF60
+S1132BB2035A0FFE8802D1DD056A0680EF035A0626
+S1132BC27F8803D1DD066A0F40EEAC025A0FBFEED6
+S1132BD2A6028800D1DD056A0C01EF035A0CFE88B7
+S1132BE202D1DD056A0410EF035A04EF8803D1DD34
+S1132BF2066A0301EE81025A03FEEE7B028800D1CB
+S1132C02DD056A0C20EF035A0CDF8802D1DD056A68
+S1132C120408EF035A04F78803D1DD066A0304EEBD
+S1132C2256025A03FBEE50028800D1DD056A000207
+S1132C32EF035A00FD8802D1DD056A0404EF035A4A
+S1132C4204FB8803D1DD066A0008EE2B025A00F762
+S1132C52EE25028800D1DD056A0C40EF035A0CBF51
+S1132C628802D1DD056A0402EF035A04FD8803D108
+S1132C72DD066A0440EE00025A04BFEEFA0188003F
+S1132C82D1DD056A0C80EF035A0C7F8802D1DD0581
+S1132C926A0501EF035A05FE8803D1DD066A0702BD
+S1132CA2EED5015A07FDEECF018800D1DD056A0099
+S1132CB204EF035A00FB8802D1DD056A0502EF0323
+S1132CC25A05FD8803D1DD066A0A10EEAA015A0AE2
+S1132CD2EFEEA4018800D1DD056A0904EF035A0965
+S1132CE2FB8802D1DD056A0D01EF035A0DFE88034C
+S1132CF2D1DD066A0110EE7F015A01EFEE790188F7
+S1132D0200D1DD056A0908EF035A09F78802D1DD0B
+S1132D12056A0780EF035A077F8803D1DD066A013B
+S1132D2208EE54015A01F7EE4E018800D1DD056A1E
+S1132D320910EF035A09EF8802D1DD056A0740EF53
+S1132D42035A07BF8803D1DD066A0101EE29015A3D
+S1132D5201FEEE23018800D1DD056A0920EF035A42
+S1132D6209DF8802D1DD056A0710EF035A07EF88ED
+S1132D7203D1DD066A0510EEFE005A05EFEEF800F7
+S1132D828800D1DD056A0940EF035A09BF8802D1E0
+S1132D92DD056A0720EF035A07DF8803D1DD066ADF
+S1132DA20520EED3005A05DFEECD008800D1DD0503
+S1132DB26A0980EF035A097F8802D1DD056A070890
+S1132DC2EF035A07F78803D1DD066A0540EEA8002F
+S1132DD25A05BFEEA2008800D1DD056A0A01EF039D
+S1132DE25A0AFE8802D1DD056A0704EF035A07FB7B
+S1132DF28803D1DD056A0580EF7E5A057FEF798865
+S1132E0200D1DD056A0A02EF035A0AFD8802D1DD08
+S1132E12056A0602EF035A06FD8803D1DD056A0A34
+S1132E2280EF555A0A7FEF508800D1DD056A0A0403
+S1132E32EF035A0AFB8802D1DD056A0601EF035A41
+S1132E4206FE8803D1DD056A0A40EF2C5A0ABFEF59
+S1132E52278800D1DD056A0A08EF035A0AF78802B7
+S1132E62D1DD056A0504EF035A05FB8803D1DD05AC
+S1132E726A0A20EF035A0ADF1004D7C75A047F6A8A
+S1132E820F80E1EF0C8800320001F0FE7BFC880029
+S1132E92819800318E441500DCEBC0D7C76A0480E8
+S1132EA26A0F80E1EF0C8800320001F0FE5AFC88C0
+S1132EB200819800318E441500DCEBC0D773D1DD5C
+S1102EC20B318E441500DE04639FFAE3D744
+=======
 S11316C2C5A82A12A822148824EEF3FD88114C43DB
 S11316D2DF09E5E8E3FC712E00EF08CFE8E302FC42
 S11316E2922E00880E73880F72881070880CFCFF8B
@@ -749,6 +1136,7 @@ S1132E92C76A04806A0F80E1EF0C8800320001F0F7
 S1132EA2FE5AFC8800819800318E441500DCEBC088
 S1132EB2D773D1DD0B318E441500DE04639FFAE330
 S1042EC2D734
+>>>>>>> 4ee2e168dfece858fa5192b727334dcae342c7db
 S11330003C656E643E0D0A000D0A00556E6B6E6FD2
 S1133010776E20636D640D0A004572723A616464D0
 S1133020725F72616E67650D0A004572723A61647F
@@ -806,9 +1194,9 @@ S11333500A004932432052582054696D656F7574D0
 S11333600D0A004932432052582054696D656F7527
 S1133370740D0A003031323334353637383941422E
 S113338043444546003031323334353637383941D9
-S11333904243444546001C2B472B722B9D2BC82BC4
+S1133390424344454600282B532B7E2BA92BD42B88
-S11333A0F32B1E2C492C742C9F2CCA2CF52C202D6D
+S11333A0FF2B2A2C552C802CAB2CD62C012D2C2D0C
-S11333B04B2D762DA12DCC2DF52D1E2E472E000044
+S11333B0572D822DAD2DD82D012E2A2E532E0000EF
 S11333C000000000000000000000000000000000F9
 S10533D00000F7
 S11333D2243000440A00F66110D73305350316433E

QualityReport(multical,DefaultBuild).txt

@@ -1,100 +1,22 @@
 QualityReport
-2026년 2월 26일 목요일 오후 3:07:50
+2026년 2월 27일 금요일 오후 4:02:12
 
 ------ Start build(multical, DefaultBuild) ------
-C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.15.00\Bin\ccrl.exe r_main.c -cpu=S3 -o DefaultBuild\r_main.obj "-dev=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F10PPJ.DVF" -g -g_line -I "..\..\Documents\카카오톡 받은 파일\IDH1.1\IDH1.1" -I ..\IDH1.1 -I . -c -msg_lang=english
+------ Build ended(Error:0, Warning:0)(multical, DefaultBuild) ------
-C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.15.00\Bin\ccrl.exe owi.c -cpu=S3 -o DefaultBuild\owi.obj "-dev=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F10PPJ.DVF" -g -g_line -I "..\..\Documents\카카오톡 받은 파일\IDH1.1\IDH1.1" -I ..\IDH1.1 -I . -c -msg_lang=english
-W0511106:The folder "..\..\Documents\카카오톡 받은 파일\IDH1.1\IDH1.1" specified by the "-I" option is not found.
-W0511106:The folder "..\..\Documents\카카오톡 받은 파일\IDH1.1\IDH1.1" specified by the "-I" option is not found.
-W0511187:The evaluation period for the option "-Odefault" of CC-RL V1 has expired. It is implicitly changed to "-Olite". Please consider purchasing the product to continue using "-Odefault". By explicitly specifying "-Olite" or "-Onothing", this warning message disappears. 
-W0511187:The evaluation period for the option "-Odefault" of CC-RL V1 has expired. It is implicitly changed to "-Olite". Please consider purchasing the product to continue using "-Odefault". By explicitly specifying "-Olite" or "-Onothing", this warning message disappears. 
-C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.15.00\inc\stdint.h(18):W0520301:Typedef name has already been declared (with same type)
-C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.15.00\inc\stdint.h(19):W0520301:Typedef name has already been declared (with same type)
-C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.15.00\inc\stdint.h(20):W0520301:Typedef name has already been declared (with same type)
-C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.15.00\inc\stdint.h(25):W0520301:Typedef name has already been declared (with same type)
-C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.15.00\inc\stdint.h(26):W0520301:Typedef name has already been declared (with same type)
-C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.15.00\inc\stdint.h(18):W0520301:Typedef name has already been declared (with same type)
-C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.15.00\inc\stdint.h(27):W0520301:Typedef name has already been declared (with same type)
-C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.15.00\inc\stdint.h(19):W0520301:Typedef name has already been declared (with same type)
-uart.h(15):W0520047:Incompatible redefinition of macro "RAM_BYTES" (declared at line 40 of "owi.h")
-C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.15.00\inc\stdint.h(20):W0520301:Typedef name has already been declared (with same type)
-owi.c(147):W0520177:Function "OWI_StopWrite" was declared but never referenced
-C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.15.00\inc\stdint.h(25):W0520301:Typedef name has already been declared (with same type)
-C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.15.00\inc\stdint.h(26):W0520301:Typedef name has already been declared (with same type)
-C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.15.00\inc\stdint.h(27):W0520301:Typedef name has already been declared (with same type)
-i2c.h(8):W0520047:Incompatible redefinition of macro "RAM_BYTES" (declared at line 15 of "uart.h")
-r_main.c(595):W0520172:External/internal linkage conflict with previous declaration
-r_main.c(799):W0520177:Variable "total_us" was declared but never referenced
-r_main.c(800):W0520177:Variable "idle_us" was declared but never referenced
-r_main.c(802):W0520177:Variable "got_any" was declared but never referenced
-r_main.c(84):W0520177:Variable "s_end_pat" was declared but never referenced
-r_main.c(179):W0520177:Function "UART1_SendBytes_Safe" was declared but never referenced
-r_main.c(318):W0520177:Function "bridge_wait_until_end" was declared but never referenced
-r_main.c(433):W0520177:Function "RS485_FlushJunk" was declared but never referenced
-C:\Program Files (x86)\Renesas Electronics\CS+\CC\CC-RL\V1.15.00\Bin\rlink.exe -subcommand=DefaultBuild\multical.clnk
-W0561017:Paid license of CC-RL V1 is not found, and the evaluation period has expired. Please consider purchasing the product.
-W0561017:Paid license of CC-RL V1 is not found, and the evaluation period has expired. Please consider purchasing the product.
-Renesas Optimizing Linker Completed
------- Build ended(Error:0, Warning:29)(multical, DefaultBuild) ------
-
---- CommandFile 1 ---
-DefaultBuild\multical.clnk :
--Input=DefaultBuild\cstart.obj
--Input=DefaultBuild\stkinit.obj
--Input=DefaultBuild\r_main.obj
--Input=DefaultBuild\r_systeminit.obj
--Input=DefaultBuild\r_cg_cgc.obj
--Input=DefaultBuild\r_cg_cgc_user.obj
--Input=DefaultBuild\r_cg_serial.obj
--Input=DefaultBuild\r_cg_serial_user.obj
--Input=DefaultBuild\r_cg_port.obj
--Input=DefaultBuild\r_cg_port_user.obj
--Input=DefaultBuild\owi.obj
--Input=DefaultBuild\i2c.obj
--Input=DefaultBuild\uart.obj
--Input=DefaultBuild\delay.obj
--Input=DefaultBuild\dipSwitch.obj
--Input=DefaultBuild\gatectrl.obj
--SECURITY_ID=00000000000000000000
--DEVICE=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F10PPJ.DVF
--DEBug
--NOCOmpress
--NOOPtimize
--OUtput=DefaultBuild\multical.abs
--OCDBG=84
--DEBUG_MONITOR=3FE00-3FFFF
--USER_OPT_BYTE=E9FFF8
--OCDTR
--LISt=DefaultBuild\multical.map
--SHow=SYmbol,Total_size
--AUTO_SECTION_LAYOUT
--ROm=.data=.dataR
--ROm=.sdata=.sdataR
--NOMessage
--MEMory=High
--NOLOgo
--LIBrary=DefaultBuild\multical.lib
--end
--Input=DefaultBuild\multical.abs
--DEVICE=C:\Program Files (x86)\Renesas Electronics\CS+\CC\Device\RL78\Devicefile\DR5F10PPJ.DVF
--OUtput=DefaultBuild\multical.mot
--FOrm=Stype
--NOMessage
--exit
 
 
 --- SHA1 hash value of output files ---
-C:\Users\temp\Desktop\new_fw\DefaultBuild\multical.abs: 1947f253be33a4aba45260908d2563bea790220c
+C:\Users\MSI\Desktop\amosense\multical_4251_fw\new_fw\DefaultBuild\multical.abs: a34e0e15d0273217195e73a51272cd2c6445a5d9
-C:\Users\temp\Desktop\new_fw\DefaultBuild\multical.mot: 50dc2b3a715b1bb77821df492910d9f9fb500912
+C:\Users\MSI\Desktop\amosense\multical_4251_fw\new_fw\DefaultBuild\multical.mot: 8da64306d693b2202e8d009e7b6185556bfed304
 
 
 --- System Information ---
 *OS Version
- Microsoft Windows 10 Pro (-, 10.0.19045, WOW64)
+ Microsoft Windows 11 Home (-, 10.0.26200, WOW64)
 *Language
  한국어(대한민국)
 *.NET Framework Version
- Microsoft .NET Framework 4 [.NET 4.8 or later] (533325)
+ Microsoft .NET Framework 4 [.NET 4.8 or later] (533509)
 *WebView2 Version
  145.0.3800.70
 
@@ -107,19 +29,21 @@ C:\Users\temp\Desktop\new_fw\DefaultBuild\multical.mot: 50dc2b3a715b1bb77821df49
  V9.13.00.05 [12 Nov 2024]
 *Assembly Version
  3.12.10.1
+*Sales Area
+ Japan
 *Product License
  
 *Execution Place
  C:\Program Files (x86)\Renesas Electronics\CS+\CC
 *Memory Usage
  *Private Working Set
-  271 MB
+  329 MB
  *Number of GDI Objects
-  2598
+  2581
  *Number of USER Objects
-  1568
+  1386
  *Opened Files
-  24 editors, 24 files, 200 KB
+  25 editors, 25 files, 211 KB
 
 --- Build Tool Plug-in Information ---
 RH850 Build tool CC-RH Plug-in
@@ -224,6 +148,20 @@ Editor plug-in DLL
   1.1.0.0
  *DLL File Name
   SEditor.dll
+Smart Configurator for RH850 Communication Plug-in
+ *Version
+  V1.02.10.03 [14 Nov 2024]
+ *Assembly Version
+  1.0.0.0
+ *DLL File Name
+  SmcCodePartRH850.dll
+Smart Configurator for RL78 Communication Plug-in
+ *Version
+  V1.00.11.01 [25 Nov 2024]
+ *Assembly Version
+  1.0.0.0
+ *DLL File Name
+  SmcCodePartRL78.dll
 Stack Usage Tracer
  *Version
   V1.05.00.02 [30 Jul 2014]
@@ -255,7 +193,7 @@ Device Information Common Interface
   DeviceInformation.dll
 
 --- Main Project Information ---
-C:\Users\temp\Desktop\new_fw\multical.mtpj
+C:\Users\MSI\Desktop\amosense\multical_4251_fw\new_fw\multical.mtpj
 Microcontroller Information
  *R5F10PPJ
   *File Name: Version
@@ -296,6 +234,10 @@ Other Tool Information
   *Version
    V4.13.00.03 [24 May 2023]
 
+ *None
+
+ *None
+
  *Code Generator
 Other Information
  *RL78/F14 Code Library

gatectrl.c

@@ -55,7 +55,11 @@ void Gate_SetByNum(uint8_t ch, uint8_t hash_on, uint8_t anaout_on, uint8_t check
         case 8: /* P12.6, P4.1, P7.0 */
             PORT_BIT_SETCLR(P12, 0x40, hash_on);    // P12.6
             PORT_BIT_SETCLR(P4,  0x02, anaout_on);  // P4.1
+<<<<<<< HEAD
+            PORT_BIT_SETCLR(P4,  0x40, check_on);   // P7.0 -> p4.6         
+=======
             PORT_BIT_SETCLR(P4,  0x40, check_on);   // P7.0 -> p4.6???? ????
+>>>>>>> 4ee2e168dfece858fa5192b727334dcae342c7db
             break;
 
         case 9: /* P12.7, P5.0, P7.1 */
@@ -70,6 +74,66 @@ void Gate_SetByNum(uint8_t ch, uint8_t hash_on, uint8_t anaout_on, uint8_t check
             PORT_BIT_SETCLR(P10, 0x10, check_on);   // P10.4
             break;
 
+<<<<<<< HEAD
+   case 11: /* P9.2, P13.0, P1.4 */
+       PORT_BIT_SETCLR(P9,  0x04, hash_on);    // P9.2
+       PORT_BIT_SETCLR(P13, 0x01, anaout_on);  // P13.0
+       PORT_BIT_SETCLR(P1,  0x10, check_on);   // P1.4
+       break;
+
+   case 12: /* P9.3, P7.7, P1.3 */
+       PORT_BIT_SETCLR(P9,  0x08, hash_on);    // P9.3
+       PORT_BIT_SETCLR(P7,  0x80, anaout_on);  // P7.7
+       PORT_BIT_SETCLR(P1,  0x08, check_on);   // P1.3
+       break;
+
+   case 13: /* P9.4, P7.6, P1.0 */
+       PORT_BIT_SETCLR(P9,  0x10, hash_on);    // P9.4
+       PORT_BIT_SETCLR(P7,  0x40, anaout_on);  // P7.6
+       PORT_BIT_SETCLR(P1,  0x01, check_on);   // P1.0
+       break;
+
+   case 14: /* P9.5, P7.4, P5.4 */
+       PORT_BIT_SETCLR(P9,  0x20, hash_on);    // P9.5
+       PORT_BIT_SETCLR(P7,  0x10, anaout_on);  // P7.4
+       PORT_BIT_SETCLR(P5,  0x10, check_on);   // P5.4
+       break;
+
+   case 15: /* P9.6, P7.5, P5.5 */
+       PORT_BIT_SETCLR(P9,  0x40, hash_on);    // P9.6
+       PORT_BIT_SETCLR(P7,  0x20, anaout_on);  // P7.5
+       PORT_BIT_SETCLR(P5,  0x20, check_on);   // P5.5
+       break;
+
+   case 16: /* P9.7, P7.3, P5.6 */
+       PORT_BIT_SETCLR(P9,  0x80, hash_on);    // P9.7
+       PORT_BIT_SETCLR(P7,  0x08, anaout_on);  // P7.3
+       PORT_BIT_SETCLR(P5,  0x40, check_on);   // P5.6
+       break;
+
+   case 17: /* P10.0, P7.2, P5.7 */
+       PORT_BIT_SETCLR(P10, 0x01, hash_on);    // P10.0
+       PORT_BIT_SETCLR(P7,  0x04, anaout_on);  // P7.2
+       PORT_BIT_SETCLR(P5,  0x80, check_on);   // P5.7
+       break;
+
+   case 18: /* P10.1, P6.1, P10.7 */
+       PORT_BIT_SETCLR(P10, 0x02, hash_on);    // P10.1
+       PORT_BIT_SETCLR(P6,  0x02, anaout_on);  // P6.1
+       PORT_BIT_SETCLR(P10, 0x80, check_on);   // P10.7
+       break;
+
+   case 19: /* P10.2, P6.0, P10.6 */
+       PORT_BIT_SETCLR(P10, 0x04, hash_on);    // P10.2
+       PORT_BIT_SETCLR(P6,  0x01, anaout_on);  // P6.0
+       PORT_BIT_SETCLR(P10, 0x40, check_on);   // P10.6
+       break;
+
+   case 20: /* P10.3, P5.2, P10.5 */
+       PORT_BIT_SETCLR(P10, 0x08, hash_on);    // P10.3
+       PORT_BIT_SETCLR(P5,  0x04, anaout_on);  // P5.2
+       PORT_BIT_SETCLR(P10, 0x20, check_on);   // P10.5
+=======
 	case 11: /* P9.2, P13.0, P1.4 */
 	    PORT_BIT_SETCLR(P9,  0x04, hash_on);    // P9.2
 	    PORT_BIT_SETCLR(P13, 0x01, anaout_on);  // P13.0
@@ -128,6 +192,7 @@ void Gate_SetByNum(uint8_t ch, uint8_t hash_on, uint8_t anaout_on, uint8_t check
 	    PORT_BIT_SETCLR(P10, 0x08, hash_on);    // P10.3
 	    PORT_BIT_SETCLR(P5,  0x04, anaout_on);  // P5.2
 	    PORT_BIT_SETCLR(P10, 0x20, check_on);   // P10.5
+>>>>>>> 4ee2e168dfece858fa5192b727334dcae342c7db
     break;
 
 
@@ -140,7 +205,11 @@ void Cal_Init(void)
 {
     uint8_t i;
 
+<<<<<<< HEAD
+    // P4.7 = 0, P15.7 = 1 ( ?    ?     !)
+=======
     // P4.7 = 0, P15.7 = 1 (??? ??? ????!)
+>>>>>>> 4ee2e168dfece858fa5192b727334dcae342c7db
     PORT_BIT_SETCLR(P4,  0x80, 0);
     PORT_BIT_SETCLR(P15, 0x80, 1);
 
@@ -153,7 +222,11 @@ void Eol_Init(void)
 {
     uint8_t i;
 
+<<<<<<< HEAD
+    // P4.7 = 1, P15.7 = 0 ( ?    ?     !)
+=======
     // P4.7 = 1, P15.7 = 0 (??? ??? ????!)
+>>>>>>> 4ee2e168dfece858fa5192b727334dcae342c7db
     PORT_BIT_SETCLR(P4,  0x80, 1);
     PORT_BIT_SETCLR(P15, 0x80, 1);
 

r_main.c

@@ -55,7 +55,7 @@ Includes
 #define RS485_BRIDGE_FIFO_SZ 2048
 
 #define BRIDGE_IDLE_DONE_US   5000U   // 마지막 바이트 이후 3ms 조용하면 종료로 판단
-#define BRIDGE_TOTAL_WAIT_US  600000U
+#define BRIDGE_TOTAL_WAIT_US   1290000U
 
 /* =========================
  * UART RX Buffers
@@ -764,8 +764,9 @@ static void process_one_line(CmdSource src, const volatile uint8_t *rx_buf, uint
                     RS485_Bridge_DrainToPC();
                     g_rs485_bridge_active = 0;
 
-                    if (total_us < 50U) {
+                    if (total_us < 300U) {
 			     rs485_recover();
+			     OUT_PRINT(CMD_SRC_PC, total_us);
                         OUT_PRINT(CMD_SRC_PC, "Err:rs485_timeout\r\n");
                         sprintf(msg, "Err:rs485_timeout fef=%lu ovf=%lu pef=%lu\r\n",
                                 g_uart0_err_fef, g_uart0_err_ovf, g_uart0_err_pef);
@@ -881,7 +882,8 @@ static void process_one_line(CmdSource src, const volatile uint8_t *rx_buf, uint
                     RS485_Bridge_DrainToPC();
                     g_rs485_bridge_active = 0;
 
-                    if (total_us < 50U) {
+                    if (total_us < 300U) {
+			    OUT_PRINT(CMD_SRC_PC,total_us);
 			     rs485_recover();
                         OUT_PRINT(CMD_SRC_PC, "Err:rs485_timeout\r\n");
                         sprintf(msg, "Err:rs485_timeout fef=%lu ovf=%lu pef=%lu\r\n",
@@ -1061,7 +1063,7 @@ void handle_uart_command_line(void)
  * ========================= */
 void R_MAIN_UserInit(void);
 
-void main(void)
+                  void main(void)
 {
     char b[64];