Signed-off-by: zhuhongbin <kptzhu@163.com>

MDK-ARM/BootLoader/Plog.log

@@ -0,0 +1,4 @@
+[2021/12/06 17:42:02] comm.go:734 com17 打开错误:  com17 The system cannot find the file specified.
+[2021/12/06 17:42:02] comm.go:67 发现本机IP： 192.168.1.72 
+[2021/12/06 17:42:03] comm.go:734 com17 打开错误:  com17 The system cannot find the file specified.
+[2021/12/06 17:42:04] comm.go:734 com17 打开错误:  com17 The system cannot find the file specified.

MDK-ARM/BootLoader/conf/app.ini

@@ -0,0 +1,67 @@
+[app]
+LogSavePath = logs/
+LogSaveName = log
+LogFileExt = log
+TimeFormat = 20060102
+
+[server]
+#debug or release
+#RunMode = debug
+RunMode = release
+
+#Mdns_servicename 为空是禁用
+Mdns_servicename = TMRWATCH
+Mdns_serviceport = 5354
+
+#Netcard 为空为随机
+Netcard = WLAN
+
+#broadcast 为0不广播
+Broadcast = 8800
+
+UseAPI = 1
+
+[database]
+Type = mysql
+User = root
+Password = root
+Host = localhost:3326
+Name = tmrwatch
+TablePrefix =
+
+ShowXormlog = false
+ShowGetSqllog = false
+CacheApiSql = false
+Showlog = true
+Showline = true
+
+[comm]
+PortName = com17
+BaudRate = 9600
+DataBits = 8
+StopBits = 1
+ParityMode = 0    #PARITY_NONE  0	PARITY_ODD  1	PARITY_EVEN  2
+InterCharacterTimeout = 100
+MinimumReadSize = 0
+
+[mqtt]
+Enable = false
+
+Host = 218.241.17.66
+Port = 1984
+Nodevalue = kh_bh
+
+Path =
+Topic_Up = test1
+Topic_Down = test2
+Qos = 1
+CleanSession = true
+
+SaslEnable = true
+Username = kptmqtt
+Saslpassword = kepaiteng
+
+TlsEnable = false
+Clientcert = pem/bbbc7ee0f6-certificate.pem.crt
+Clientkey = pem/bbbc7ee0f6-private.pem.key
+Cacert =

MDK-ARM/test/TMRWatch_OTA.build_log.htm

@@ -26,10 +26,139 @@ Project File Date:  11/19/2021
 
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 5 (build 528)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
-Build target 'test'
+Rebuild target 'test'
+assembling startup_stm32f103xe.s...
+compiling syscall_armlibc.c...
+compiling dma.c...
+compiling stm32f1xx_hal_msp.c...
+compiling iwdg.c...
+compiling gpio.c...
+compiling stm32f1xx_it.c...
+compiling main.c...
+../Src/main.c(71): warning:  #177-D: function "exception_hook"  was declared but never referenced
+  static rt_err_t exception_hook(void *context) {
+../Src/main.c(109): warning: C4018W: division by zero: /
+    z = x / y;
+../Src/main.c: 2 warnings, 0 errors
+compiling usart.c...
+compiling stm32f1xx_hal_iwdg.c...
+compiling stm32f1xx_hal_gpio_ex.c...
+compiling stm32f1xx_hal_rcc_ex.c...
+compiling system_stm32f1xx.c...
+compiling stm32f1xx_hal_rcc.c...
+compiling stm32f1xx_hal_gpio.c...
+compiling stm32f1xx_hal.c...
+compiling stm32f1xx_hal_flash_ex.c...
+compiling stm32f1xx_hal_cortex.c...
+compiling stm32f1xx_hal_exti.c...
+compiling stm32f1xx_hal_tim.c...
+compiling stm32f1xx_hal_pwr.c...
+compiling fal.c...
+compiling fal_flash.c...
+..\fal\src\fal_flash.c(45): warning:  #550-D: variable "dev"  was set but never used
+      const struct fal_flash_dev *dev;
+..\fal\src\fal_flash.c: 1 warning, 0 errors
+compiling fal_rtt.c...
+compiling fal_partition.c...
+compiling stm32f1xx_hal_flash.c...
+compiling fdb.c...
+compiling fdb_utils.c...
+compiling stm32f1xx_hal_dma.c...
+compiling fdb_tsdb.c...
+compiling fdb_kvdb.c...
+compiling stm32f1xx_hal_tim_ex.c...
+compiling fal_flash_stm32f1_port.c...
+compiling flash.c...
+compiling init.c...
+compiling stm32f1xx_hal_uart.c...
+compiling buffer.c...
+..\tmr\buffer.c(270): warning:  #167-D: argument of type "uint8_t *" is incompatible with parameter of type "char *"
+  									  rt_strncpy(dataframehead.Buffer, XbeeConst_FRxBuf0, 4);
+..\tmr\buffer.c(270): warning:  #167-D: argument of type "unsigned char *" is incompatible with parameter of type "const char *"
+  									  rt_strncpy(dataframehead.Buffer, XbeeConst_FRxBuf0, 4);
+..\tmr\buffer.c(333): warning:  #223-D: function "findlastplan" declared implicitly
+  																foundlastplan_ = findlastplan();
+..\tmr\buffer.c(708): warning:  #550-D: variable "tempval"  was set but never used
+  		unsigned char tempval;
+..\tmr\buffer.c: 4 warnings, 0 errors
+compiling xBeeAppEscapingMode.c...
+compiling cm_backtrace.c...
+..\cm_backtrace\cm_backtrace.c(567): warning:  #177-D: variable "regs_name"  was declared but never referenced
+      const char *regs_name[] = { "R0 ", "R1 ", "R2 ", "R3 ", "R12", "LR ", "PC ", "PSR" };
+..\cm_backtrace\cm_backtrace.c(108): warning:  #177-D: variable "print_info"  was declared but never referenced
+  static const char * const print_info[] = {
+..\cm_backtrace\cm_backtrace.c(216): warning:  #177-D: function "get_cur_thread_name"  was declared but never referenced
+  static const char *get_cur_thread_name(void) {
+..\cm_backtrace\cm_backtrace.c: 3 warnings, 0 errors
 compiling display.c...
+compiling cmd.c...
+C:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\components\finsh\cmd.c(161): warning:  #177-D: variable "item_title"  was declared but never referenced
+      const char *item_title = "thread";
+C:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\components\finsh\cmd.c(254): warning:  #550-D: variable "thread"  was set but never used
+      struct rt_thread *thread;
+C:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\components\finsh\cmd.c(276): warning:  #177-D: variable "item_title"  was declared but never referenced
+      const char *item_title = "semaphore";
+C:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\components\finsh\cmd.c(343): warning:  #177-D: variable "item_title"  was declared but never referenced
+      const char *item_title = "event";
+C:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\components\finsh\cmd.c(740): warning:  #177-D: variable "item_title"  was declared but never referenced
+      const char *item_title = "timer";
+C:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\components\finsh\cmd.c: 5 warnings, 0 errors
+compiling msh.c...
+assembling context_rvds.S...
+compiling shell.c...
+compiling cpuport.c...
+C:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\libcpu\arm\cortex-m3\cpuport.c(294): warning:  #177-D: variable "context"  was declared but never referenced
+      struct stack_frame* context = &exception_info->stack_frame;
+C:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\libcpu\arm\cortex-m3\cpuport.c: 1 warning, 0 errors
+compiling clock.c...
+compiling components.c...
+compiling idle.c...
+compiling irq.c...
+compiling ipc.c...
+compiling mem.c...
+compiling kservice.c...
+compiling object.c...
+C:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\src\object.c(262): warning:  #550-D: variable "obj"  was set but never used
+          struct rt_object *obj;
+C:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\src\object.c: 1 warning, 0 errors
+compiling scheduler.c...
+compiling thread.c...
+compiling timer.c...
+compiling daScreen.c...
+compiling plan.c...
+compiling button.c...
+compiling Ad.c...
+compiling weight.c...
+..\tmr\weight.c(1882): warning:  #676-D: using out-of-scope declaration of variable "iscowweight"  (declared at line 72)
+  			 if (iscowweight==1) {
+..\tmr\weight.c(1964): warning:  #167-D: argument of type "void (*)(void)" is incompatible with parameter of type "void (*)(void *)"
+  																ReadWeightthread, RT_NULL,
+..\tmr\weight.c(1977): warning:  #167-D: argument of type "void (*)(void)" is incompatible with parameter of type "void (*)(void *)"
+                              CheckWeightthread, RT_NULL,
+..\tmr\weight.c(2014): warning:  #167-D: argument of type "void (*)(void)" is incompatible with parameter of type "void (*)(void *)"
+  																ReadEIDthread, RT_NULL,
+..\tmr\weight.c(43): warning:  #550-D: variable "WeightConst_WeightCur_last3"  was set but never used
+  static signed short WeightConst_WeightCur_last3=0;
+..\tmr\weight.c(363): warning:  #177-D: function "P_300G0"  was declared but never referenced
+  static void P_300G0() {
+..\tmr\weight.c(420): warning:  #177-D: function "P_300G1"  was declared but never referenced
+  static void P_300G1() {
+..\tmr\weight.c(596): warning:  #177-D: function "P_AWH_30_SA"  was declared but never referenced
+  static void P_AWH_30_SA() {
+..\tmr\weight.c(653): warning:  #177-D: function "P_digi"  was declared but never referenced
+  static void P_digi() {
+..\tmr\weight.c(905): warning:  #177-D: function "P_HF"  was declared but never referenced
+  static void P_HF() {
+..\tmr\weight.c(953): warning:  #177-D: function "P_E_2000"  was declared but never referenced
+  static void P_E_2000() {
+..\tmr\weight.c(1272): warning:  #177-D: function "P_TQ"  was declared but never referenced
+  static void P_TQ() {
+..\tmr\weight.c(1480): warning:  #177-D: function "P_NEWLabel"  was declared but never referenced
+  static void P_NEWLabel() {
+..\tmr\weight.c: 13 warnings, 0 errors
+compiling board.c...
 linking...
-Program Size: Code=61976 RO-data=4720 RW-data=1648 ZI-data=46320  
+Program Size: Code=61972 RO-data=4720 RW-data=1648 ZI-data=46320  
 FromELF: creating hex file...
 After Build - User command #1: fromelf.exe --bin -o "test\TMRWatch_OTA.bin" "test\TMRWatch_OTA.axf"
 After Build - User command #2: D:\test\MDK-ARM\BootLoader\TMR.bat
@@ -40,7 +169,7 @@ D:\test\MDK-ARM>fsutil file createnew .\bootLoader\TMRWatchAndBoot.bin 8192
 ÒÑ´´½¨Îļþ D:\test\MDK-ARM\bootLoader\TMRWatchAndBoot.bin
 D:\test\MDK-ARM>.\bootLoader\hbin .\bootLoader\TMRWatchBoot.bin .\bootLoader\TMRWatchAndBoot.bin 
 D:\test\MDK-ARM>.\bootLoader\cat .\bootLoader\TMRWatch_OTA.bin  1>>.\bootLoader\TMRWatchAndBoot.bin 
-"test\TMRWatch_OTA.axf" - 0 Error(s), 0 Warning(s).
+"test\TMRWatch_OTA.axf" - 0 Error(s), 30 Warning(s).
 
 <h2>Software Packages used:</h2>
 
@@ -78,24 +207,24 @@ Package Vendor: Keil
       Source file:   components\finsh\msh.c
 
    * Component: RealThread.RT-Thread::RTOS:kernel:3.1.3
-      Source file:   src\timer.c
-      Source file:   src\components.c
-      Source file:   src\clock.c
-      Source file:   src\idle.c
-      Source file:   src\mem.c
-      Source file:   libcpu\arm\cortex-m3\cpuport.c
-      Include file:  bsp\rtconfig.h
-      Source file:   src\ipc.c
-      Source file:   src\irq.c
+      Source file:   src\kservice.c
       Source file:   src\object.c
       Source file:   src\scheduler.c
       Source file:   libcpu\arm\cortex-m3\context_rvds.S
-      Source file:   bsp\board.c
-      Source file:   src\kservice.c
+      Source file:   src\irq.c
       Source file:   src\thread.c
+      Source file:   bsp\board.c
+      Source file:   libcpu\arm\cortex-m3\cpuport.c
+      Include file:  bsp\rtconfig.h
+      Source file:   src\clock.c
+      Source file:   src\idle.c
+      Source file:   src\mem.c
+      Source file:   src\timer.c
+      Source file:   src\components.c
+      Source file:   src\ipc.c
 
    * Component: ARM::CMSIS:CORE:5.0.1
-Build Time Elapsed:  00:00:03
+Build Time Elapsed:  00:00:19
 </pre>
 </body>
 </html>

MDK-ARM/test/TMRWatch_OTA.hex

@@ -164,7 +164,7 @@
 :102A2000010510196941DDE9084500196941BDE852
 :102A3000F04DA2E7064C074D06E0E06840F00103C8
 :102A400094E8070098471034AC42F6D3FFF774FBC4
-:102A5000682401088824010870B58C1810F8015BFF
+:102A5000642401088424010870B58C1810F8015B07
 :102A600015F0070301D110F8013B2A1106D110F827
 :102A7000012B03E010F8016B01F8016B5B1EF9D12B
 :102A80002B0705D40023521E0DD401F8013BFAE7B1
@@ -199,9 +199,9 @@
 :102C50004C00002050000020142E002010B51A4C0B
 :102C60001A490422606C08601949E07A0870194911
 :102C7000207B08701849A06C08601849606B0860D8
-:102C8000124917A00EF08AFA0122114917A00EF07E
-:102C900085FA01220F4918A00EF080FA04220E498D
-:102CA00018A00EF07BFA04220C4919A00EF076FA57
+:102C8000124917A00EF088FA0122114917A00EF080
+:102C900083FA01220F4918A00EF07EFA04220E4991
+:102CA00018A00EF079FA04220C4919A00EF074FA5B
 :102CB00006F07AFA207808B1012803D1BDE8104067
 :102CC00006F08EBB10BD0000680300204800002005
 :102CD000400000203F0000204C0000205000002059
@@ -215,9 +215,9 @@
 :102D50006F6E00006802002070B5094DFF22134617
 :102D600005F5807606E000BF10F8014B54402A5D5F
 :102D70005A40335D491E89B2F6D243EA022070BD43
-:102D8000F918010830B5034600200246064C08E059
+:102D8000F518010830B5034600200246064C08E05D
 :102D90009D5C4540EDB2521C34F8155092B285EA64
-:102DA00010208A42F4D330BD541B01080F4910B5DE
+:102DA00010208A42F4D330BD501B01080F4910B5E2
 :102DB0007E200870452048700D48007830308870BB
 :102DC000032020220A54401C1228FBDB094C4FF040
 :102DD000FF3120680CF0E1F80C220449064803F0AA
@@ -241,9 +241,9 @@
 :102EF00007F054F9DFF81CA34FF0FF31DAF80000B7
 :102F00000CF04BF8C448C54900880880DAF8000086
 :102F10000CF028F8C24998F8030001220870C1A0FB
-:102F20000EF03CF9DFF80C834FF0FF31D8F80000C9
-:102F30000CF033F80422C049C0A00EF02FF9D8F8E5
-:102F400000000CF00FF80222B449BFA00EF026F9E1
+:102F20000EF03AF9DFF80C834FF0FF31D8F80000CB
+:102F30000CF033F80422C049C0A00EF02DF9D8F8E7
+:102F400000000CF00FF80222B449BFA00EF024F9E3
 :102F500009F008FC9DE0FFE7BE480078002807D094
 :102F6000BD4800680BF0FEFF0021F2200CF07AFE55
 :102F70008FE007F013F9FFF719FFB8480721017038
@@ -256,7 +256,7 @@
 :102FE0006344835402788A42F5DC9C49B8F1000FAF
 :102FF00008780A5CC2F1FF020A5429D0DFF8748213
 :103000004FF0FF31D8F800000BF0C7FF0121C122BB
-:1030100008460DF013F9914997480EF02FF997499A
+:1030100008460DF013F9914997480EF02DF997499C
 :10302000974A08600146012007E0A221C9E70B5C2E
 :1030300002EB000C401C0CF8013C0B788342F6DAE2
 :10304000DAB28F498F4803F007F9D8F800001EE084
@@ -279,7 +279,7 @@
 :10315000835C6344835402788A42F5DC3F48B8F1CB
 :10316000000F0178425CC2F1FF0242542AD0DFF81E
 :1031700004814FF0FF31D8F800000BF00EFF012161
-:10318000C12208460DF05AF834493B480EF076F853
+:10318000C12208460DF05AF834493B480EF074F855
 :103190003A493B4A08600146012008E090E0A2213C
 :1031A000C8E70B5C02EB000C401C0CF8013C0B78F0
 :1031B0008342F6DADAB23249324803F04DF8D8F8F1
@@ -349,7 +349,7 @@
 :1035B000062867D0072872D0082871D0092870D053
 :1035C0000A286FD00B286ED0F2E099F800004E4622
 :1035D000012801D9401E00E00A2030700122B649BE
-:1035E000BCA00DF0DBFD317830318AF80610DFE049
+:1035E000BCA00DF0D9FD317830318AF80610DFE04B
 :1035F000B9490878012801D9401E00E00E20087062
 :103600000122B549B5A0D1E0B549087808B1401EFE
 :1036100003E03078042808D00D2008700CF07CFD01
@@ -377,7 +377,7 @@
 :103770009BF80010012909D0022901D0052907D0A2
 :103780008BF8008001224E4964A00FE0052100E083
 :1037900002218BF80010F5E76348017809B1491E52
-:1037A00000E00321017001225F4960A00DF0F6FCEA
+:1037A00000E00321017001225F4960A00DF0F4FCEC
 :1037B00084F8008065703CE106F0F0FC4448007835
 :1037C000B0B1012822D002282DD0032843D00428EC
 :1037D0004AD005285BD0062867D0072866D008287D
@@ -391,7 +391,7 @@
 :10385000491C0170F6E73078022801D2401C307014
 :103860000122194920A0DFE0204E30780A2802D238
 :10387000401C307001E086F8008001221B491CA02A
-:103880000DF08CFC307830308AF80600CEE0194814
+:103880000DF08AFC307830308AF80600CEE0194816
 :103890000178032902D2491C017000E005700CF088
 :1038A00099FB0122134914A0BEE041E05FE082E0F1
 :1038B0008EE09AE0ACE000003600002055020020C7
@@ -417,7 +417,7 @@
 :1039F00008D0022808D08BF8008057490122AFF286
 :103A0000E40011E0022000E005208BF80000F4E75C
 :103A100052490878032802D2401C087000E00D705B
-:103A20004E490122AFF2FC000DF0B8FB257084F87E
+:103A20004E490122AFF2FC000DF0B6FB257084F880
 :103A30000180A570E57063E049480078062802D04F
 :103A4000072809D010E040490878042802D0401C1B
 :103A5000087007E00D7005E03B494878042808D05D
@@ -445,7 +445,7 @@
 :103BB000DFF844A20025B07810F0780F17D0BBF8DA
 :103BC0000010A1B18D4AC0F3C300C0EB00101188F2
 :103BD000491C89B21180B1EB800F08D904228849B1
-:103BE00088A00DF0DBFA8A4800680BF0BBF9607A18
+:103BE00088A00DF0D9FA8A4800680BF0BBF9607A1A
 :103BF00000287DD04FF0FF373946206B0BF0CDF910
 :103C0000E078022809D9B4F91220E16A891AB4F9D6
 :103C10001020891A801EE162E070E178E06A90FB72
@@ -877,11 +877,11 @@
 :1056B000605040EAC100606000F038F86168084A54
 :1056C000C1F30311515CC8400649086006480068F0
 :1056D000FFF7F8FE0020C2E7002002400010024061
-:1056E00048130108040000200C000020044805496C
+:1056E00044130108040000200C0000200448054970
 :1056F00000684968044AC1F30221515CC840704700
-:105700000400002000100240581301080448054915
+:105700000400002000100240541301080448054919
 :1057100000684968044AC1F3C221515CC84070471F
-:1057200004000020001002405813010812A185B0A7
+:1057200004000020001002405413010812A185B0AB
 :105730000FC98DE80F0014A0144A00680490516846
 :10574000134801F00C03042B10D0082B0ED1C1F329
 :105750008343C9031DF803000AD5516804AAC1F3A5
@@ -1195,7 +1195,7 @@
 :106A90005FFF04F071F91F4A1B4F0020115C39544D
 :106AA000401C2728FADB09F077F81B4900200A5C14
 :106AB0003A54401C272831E03600002037000020DF
-:106AC0003C00002055020020591801083900002020
+:106AC0003C00002055020020551801083900002024
 :106AD0003B000020380000206802002070020020E7
 :106AE00069020020AC030020102B00209001002040
 :106AF000B8020020700600203E0000203F00002069
@@ -1469,7 +1469,7 @@
 :107BB00008464B7169798171C2F1FF0189F807109C
 :107BC0009CF80000AA460028664D2069414618D05E
 :107BD00007F0E3F90121C122084608F02FFB5449C0
-:107BE0006148603109F04AFB0121E06404E0425C35
+:107BE0006148603109F048FB0121E06404E0425C37
 :107BF0006B18491C03F8012C02788A42F7DAD2B2DA
 :107C00000EE007F0CAF90120494699F8002005E086
 :107C10000B5C05EB000C401C0CF8013C8242F7DACF
@@ -1485,11 +1485,11 @@
 :107CB0001A4482741229F8DB4146A06907F06DF975
 :107CC000132232493248FEF7C7FAA06907F04AF991
 :107CD0007F1CBFB2162FDFD392E028798CF800000A
-:107CE000012219492BA009F059FA08F073F97EE036
+:107CE000012219492BA009F057FA08F073F97EE038
 :107CF000294928790122087028A004E02879107009
-:107D000001220E4926A009F049FA70E02549287998
+:107D000001220E4926A009F047FA70E0254928799A
 :107D10000122087024A0F6E702F040FA23492879EE
-:107D20000122087022A009F039FA08F0F5F95EE0A6
+:107D20000122087022A009F037FA08F0F5F95EE0A8
 :107D30009401002018270020EA02002036000020CD
 :107D4000F7020020F802002038000020FB0200208B
 :107D5000D40C00200C030020FC020020360200207E
@@ -1501,7 +1501,7 @@
 :107DB000574C0000144889F80070E9790170A979DE
 :107DC0004170697981702979C1706B2007F07AFC64
 :107DD0000E4D4146286807F0E0F804220A490CA03D
-:107DE00009F0DCF9286807F0BDF80C48077002F0CC
+:107DE00009F0DAF9286807F0BDF80C48077002F0CE
 :107DF000D5F905E0491CC8B220715A287FF6BFADFD
 :107E00002671E670B4E50000140300201C03002076
 :107E100054696D65436F6E73740000006A02002040
@@ -1558,7 +1558,7 @@
 :108140002B5C401C6A5C1A446A5429788142F6DC34
 :10815000C8B2295CC1F1FF0129546048007818B306
 :108160005946386906F019FF0121C122084608F076
-:1081700065F852495A48603109F080F80121594A9E
+:1081700065F852495A48603109F07EF80121594AA0
 :10818000F86404E0435C5518491C05F8013C037889
 :108190008B42F7DADAB253495348FEF75DF83220E2
 :1081A00007F07CF838691CE050480078D8B9594687
@@ -1571,8 +1571,8 @@
 :10821000FE2946D03B49097821B342E001F0BEFF78
 :10822000394C5D465946206806F0B7FE3748384954
 :1082300000880880206806F095FE364C29462068A4
-:1082400006F0ABFE0422344934A008F0A7FF2068F2
-:1082500006F088FE02222E4933A008F09FFF04F0AA
+:1082400006F0ABFE0422344934A008F0A5FF2068F4
+:1082500006F088FE02222E4933A008F09DFF04F0AC
 :1082600081FA1EE00088E0B93248006806F07AFE24
 :10827000A0780109F32007F0F5FC2F4806702F487D
 :1082800006702F4806703D700BE0797849B9008878
@@ -1658,7 +1658,7 @@
 :10878000FF0008F80100B6484FF0FF3100780028DC
 :10879000DAF8000021D006F000FC98F80400F82870
 :1087A0000FD0E8280DD00020C022002107F046FDA0
-:1087B000A749AC4808F062FDAB495A460860012160
+:1087B000A749AC4808F060FDAB495A460860012162
 :1087C00006E00120F0E7435C5418491C04F8013C22
 :1087D00003788B42F7DADAB20EE006F0DEFB012016
 :1087E000594698F8002005E018F800300C18401C95
@@ -1670,7 +1670,7 @@
 :108840000910017086484FF0FF3100780028DAF8EF
 :1088500000001FD006F0A1FB98F80400F8280DD006
 :108860000020C022002107F0E9FC79497D4808F08A
-:1088700005FD7D495A460860012106E00120F0E728
+:1088700003FD7D495A460860012106E00120F0E72A
 :10888000435C5418491C04F8013C03788B42F7DA26
 :1088900057E01BE006F081FB0120594698F80020C4
 :1088A00006E000BF18F800300C18401C04F8013C2A
@@ -1681,7 +1681,7 @@
 :1088F00011F8091001705A484FF0FF310078002834
 :10890000DAF800001FD006F048FB98F80400F828B9
 :108910000DD00020C022002107F090FC4C495148A6
-:1089200008F0ACFC50495A460860012106E00120DD
+:1089200008F0AAFC50495A460860012106E00120DF
 :10893000F0E7445C5318491C03F8014C03788B4260
 :10894000F7DADAB2B6E706F028FB0120594698F8C4
 :10895000002005E018F800300C18401C04F8013C19
@@ -1696,7 +1696,7 @@
 :1089E000234811F8091001704FF0FF31DAF8000048
 :1089F00006F0D3FA1A480078E0B12079F8280DD0B3
 :108A00000020C022002107F019FC1149154808F088
-:108A100035FC15495B460860012106E00120F0E7BE
+:108A100033FC15495B460860012106E00120F0E7C0
 :108A2000445C5A18491C02F8014C02788A42F7DA71
 :108A3000D2B23FE701205946227804E0235C0E18A9
 :108A4000401C06F8013C8242F8DA33E73600002089
@@ -1723,7 +1723,7 @@
 :108B90004A684B6802F470124FF0020413F4803FED
 :108BA00004EB924202D04B689B0301D5064B00E0D8
 :108BB000024B5A43E2E700000010024000127A0024
-:108BC000040000204813010800093D000249014843
+:108BC000040000204413010800093D000249014847
 :108BD000086070470020000808ED00E010B5044868
 :108BE000FCF7ACFFBDE81040014800F0EDB9000013
 :108BF0000C08002010B5406A0021C185C184FCF733
@@ -1818,7 +1818,7 @@
 :109180000AD005280AD1106B04F083BE106AFBE7F1
 :10919000506AF9E7906AF7E7D06AF5E77047000090
 :1091A00094010020FEE700000348044901224078B2
-:1091B000087003A007F0F2BF142E00203E0000202C
+:1091B000087003A007F0F0BF142E00203E0000202E
 :1091C00061645F46530000002DE9F0411D4F884661
 :1091D0000446012204213846FCF723F90120FAF75E
 :1091E00003FF25E008EB0400002510F8016C0022C5
@@ -1853,7 +1853,7 @@
 :1093B000002908D1826B016A036C8A1A1A4402647C
 :1093C000816300F00DB8704768030020024803492C
 :1093D0000068086470470000540000206803002003
-:1093E000034804490422006C086003A007F0D6BEBD
+:1093E000034804490422006C086003A007F0D4BEBF
 :1093F000680300205400002061645F5461726500BE
 :1094000030B51A49C87A4B6C00EB80008400B3FB7E
 :10941000F4F0B3FBF4F3CA6A0024101A13448A6A06
@@ -1870,7 +1870,7 @@
 :1094C000401C704710F47F4F04D0C0F30720085CA5
 :1094D0000930704710F47F0F04D0C0F30740085CD8
 :1094E0001130704701EB10600078193070470000B0
-:1094F000021E010802E008C8121F08C1002AFAD1A2
+:1094F000FE1D010802E008C8121F08C1002AFAD1A7
 :1095000070477047002001E001C1121F002AFBD103
 :1095100070472DE9F04F89B0154683460C4600266A
 :109520008846EA461BE004F12009A94501D220271C
@@ -2082,12 +2082,12 @@
 :10A2000075F858B1012007B030BD05200090062335
 :10A2100001AA2846216BFFF72FFBF3E70020F2E7A6
 :10A220005B466C61736844425D5B6B765D00000069
-:10A230005B25735D20000000A820010870B504466E
+:10A230005B25735D20000000A420010870B5044672
 :10A240000078A8B90D4616460AA0FFF711F90DA02F
 :10A250003168FFF70DF90D486168FFF709F92868C3
 :10A260004FF0FF32401C28603046616801F0C0FFAB
 :10A27000002070BD5B466C61736844425D5B6B7629
-:10A280005D0000005B25735D200000006420010874
+:10A280005D0000005B25735D200000006020010878
 :10A290002DE9F041064600780D680C46012728B1EB
 :10A2A000707802280ED001281DD02DE017A0FFF7EE
 :10A2B000DFF81AA02968FFF7DBF81AA07168FFF72A
@@ -2100,7 +2100,7 @@
 :10A3200020000000536563746F7220283078253058
 :10A330003875292068656164657220696E666F20D2
 :10A34000697320696E636F72726563742E0A000010
-:10A350004421010810B50446072C5FD2DFE804F061
+:10A350004021010810B50446072C5FD2DFE804F065
 :10A360005E04101F2E3D4C00282220212C4804F0B2
 :10A37000AFFC21462A4800F0B9F82521284849E0D9
 :10A38000274828222021283004F0A2FC2448214616
@@ -2214,7 +2214,7 @@
 :10AA400089FC0C49002050310A5C2254401C272804
 :10AA5000FADB05F0A1F80620FFF77CFC0549002091
 :10AA6000C8310A5C2254401C2728FADBBDE870403C
-:10AA700005F092B8C9040020B42500200C1B010881
+:10AA700005F092B8C9040020B4250020081B010885
 :10AA800000B591B024220DA108A8F7F728FC0220F8
 :10AA90000021CDE9041006900790222396221E2162
 :10AAA0001A208DE80F0001230022242108A800F0BD
@@ -2251,7 +2251,7 @@
 :10AC900000280FDD90FBF3F403FB140490FBF3F0AA
 :10ACA00030345454F3E7002014180B5C401CE37359
 :10ACB0000E28F9DB70BD0000E82A002019050020ED
-:10ACC000061B01086003002010B500202649202241
+:10ACC000021B01086003002010B500202649202245
 :10ACD0000A54401CC0B21E28FAD35C2008704320DE
 :10ACE0004870224A3220887013780320D62B0DD06A
 :10ACF000202B08D01E4B1C1814F8034C0C54401C7D
@@ -2262,7 +2262,7 @@
 :10AD4000F7D30C4819220A23B0F900000028E6DDE9
 :10AD500090FBF3F403FB140490FBF3F0521ED2B209
 :10AD600030348C54F2E7000019050020E82A002056
-:10AD7000061B01086003002010B50320FFF7EAFA64
+:10AD7000021B01086003002010B50320FFF7EAFA68
 :10AD80000E480F4900780978084315D003210D4873
 :10AD9000FFF7ACFB0B4A0C49002000BFC0F10703D2
 :10ADA0001418CB5C401CE3760828F7DBBDE81040A4
@@ -2286,14 +2286,14 @@
 :10AEC00080001248007808B9012E11D1022000211B
 :10AED000CDE90410069008220790B021CDE90020AA
 :10AEE000CDE9021501230022802108A8FFF7F8FD13
-:10AEF00031B0F0BDFC1A0108C9040020F1020020A5
+:10AEF00031B0F0BDF81A0108C9040020F1020020A9
 :10AF00000000002055020020B8020020F2020020BC
 :10AF100070B50420FFF71EFA134A144900200C18DC
 :10AF2000135C401CE3730628F9DB114823220068F8
 :10AF3000031E00DA584260B10A2400280DDD90FBA0
 :10AF4000F4F504FB150590FBF4F0521E30358D54DA
 :10AF5000F3E72222302081F82200002B03DA11448B
-:10AF60002D2001F8010C70BD001B010869050020AF
+:10AF60002D2001F8010C70BDFC1A010869050020B4
 :10AF7000B802002010B50120FFF7ECF9044A05499A
 :10AF800000200C18135C401CE3731628F9DB10BD7D
 :10AF900037030020C904002070B500221E49202379
@@ -2324,9 +2324,9 @@
 :10B1200028B1FAF717F84FF0FF3005B0F0BD641CF6
 :10B13000AC42EED3FAF70EF83046F6E710B5054C00
 :10B1400018222168F7F710F908B1002010BD206817
-:10B1500010BD0000A413010810B5064C207808B1FA
+:10B1500010BD0000A013010810B5064C207808B1FE
 :10B16000002010BD04480068406A00B180470120FB
-:10B170002070F5E721000020A413010870B5FFF747
+:10B170002070F5E721000020A013010870B5FFF74B
 :10B18000EBFF114D04000ED400F022F9041E0ADD7D
 :10B190002878002815D1012028700CA0FEF768F946
 :10B1A0000FA111A008E0002028703E221B491CA01E
@@ -2336,7 +2336,7 @@
 :10B1E000302E352E30000000466C617368204162BD
 :10B1F000737472616374696F6E204C61796572203B
 :10B20000285625732920696E697469616C697A65AD
-:10B2100020737563636573732E0000009813010833
+:10B2100020737563636573732E0000009413010837
 :10B220001B5B33313B32326D5B452F46414C5D2019
 :10B230002825733A2564292000000000466C6173BC
 :10B2400068204162737472616374696F6E204C612F
@@ -2351,7 +2351,7 @@
 :10B2D000CFF82FA0FEF7CCF82046BDE8F08140F271
 :10B2E000D512074907A0FEF7C3F8221D41462A4898
 :10B2F000FEF7BEF826A0FEF7BBF83846EDE70000E3
-:10B30000E21301081B5B33313B32326D5B452F4644
+:10B30000DE1301081B5B33313B32326D5B452F4648
 :10B31000414C5D202825733A256429200000000057
 :10B32000506172746974696F6E2065726173652013
 :10B330006572726F722120506172746974696F6EE8
@@ -2360,7 +2360,7 @@
 :10B360006E206572617365206572726F722120466E
 :10B370006C6173682064657669636528257329208C
 :10B380006572617365206572726F72210000000042
-:10B390001B5B306D0A0000001820010870B50646DE
+:10B390001B5B306D0A0000001420010870B50646E2
 :10B3A00000240A4D08E0686800EB84113046091D4E
 :10B3B000F6F7CCFF28B1641CA8688442F3D30020C0
 :10B3C00070BD686800EB841070BD00002400002090
@@ -2371,9 +2371,9 @@
 :10B410006068F36900EB851112484A6B091DFEF75D
 :10B4200027F811A0FEF724F80020A06070BDA068E6
 :10B430006D1C8542D7D301202070CDE72400002069
-:10B44000E8220108A81301081B5B33313B32326D3F
+:10B44000E4220108A41301081B5B33313B32326D47
 :10B450005B452F46414C5D202825733A2564292001
-:10B4600000000000301F01081B5B306D0A00000067
+:10B46000000000002C1F01081B5B306D0A0000006B
 :10B470002DE9F0471E4604460D468819A16B9046FB
 :10B480004FF0FF37884209D94FF4BF721B491CA007
 :10B49000FDF7EEFF21A0FDF7EBFF29E004F11C0012
@@ -2382,7 +2382,7 @@
 :10B4C0000FA0FDF7D5FF494622A0FDF7D1FF2EA022
 :10B4D000FDF7CEFF2046BDE8F08740F28512074910
 :10B4E00007A0FDF7C5FF221D49462948FDF7C0FF0B
-:10B4F00025A0FDF7BDFF3846EDE70000BB130108AE
+:10B4F00025A0FDF7BDFF3846EDE70000B7130108B2
 :10B500001B5B33313B32326D5B452F46414C5D2036
 :10B510002825733A256429200000000050617274C8
 :10B520006974696F6E2072656164206572726F72F2
@@ -2392,7 +2392,7 @@
 :10B560006164206572726F722120466C617368207D
 :10B570006465766963652825732920726561642096
 :10B580006572726F722100001B5B306D0A00000053
-:10B59000CC1F01082DE9F0471E4604460D468819C8
+:10B59000C81F01082DE9F0471E4604460D468819CC
 :10B5A000A16B90464FF0FF37884209D940F2A712AD
 :10B5B0001B491CA0FDF75CFF21A0FDF759FF29E006
 :10B5C00004F11C008146FFF7B9FDC0B1616BC46A8C
@@ -2401,7 +2401,7 @@
 :10B5F0003FFF2FA0FDF73CFF2046BDE8F0874FF44A
 :10B60000D772074907A0FDF733FF221D49462A4894
 :10B61000FDF72EFF26A0FDF72BFF3846EDE70000D3
-:10B62000CE1301081B5B33313B32326D5B452F4635
+:10B62000CA1301081B5B33313B32326D5B452F4639
 :10B63000414C5D202825733A256429200000000034
 :10B64000506172746974696F6E20777269746520D5
 :10B650006572726F722120506172746974696F6EC5
@@ -2410,12 +2410,12 @@
 :10B680006E207772697465206572726F7221204630
 :10B690006C61736820646576696365282573292069
 :10B6A0007772697465206572726F72210000000004
-:10B6B0001B5B306D0A000000801F0108C0E900120A
+:10B6B0001B5B306D0A0000007C1F0108C0E900120E
 :10B6C000704770B505464C680869A04200D2044630
 :10B6D0000A68C96823462846FDF758FF204670BD12
 :10B6E00010B5C043064B07E011F8014B4440E4B2EB
 :10B6F00053F8244084EA1020521EF5D2C04310BDF6
-:10B70000F81301082DE9F0410546007C8EB014467F
+:10B70000F41301082DE9F0410546007C8EB0144683
 :10B710008846B0B1696909B128468847414654F85E
 :10B72000048B002654F80C7B6A46284600F01CFB6C
 :10B7300008B30CB1039820600398B84210D20646B3
@@ -2559,8 +2559,8 @@
 :10BFD0000A210B20CDE900014FF4407300220E49E5
 :10BFE0000EA003F08CF8054600231A460DA16069E7
 :10BFF00002F0A6FF0120FFF7CFFF15B1284603F09E
-:10C0000099F900207CBD4FF0FF307CBDE82201088B
-:10C0100068220108BC0500202DC000087473686503
+:10C0000099F900207CBD4FF0FF307CBDE42201088F
+:10C0100064220108BC0500202DC000087473686507
 :10C020006C6C000073687278000000006B4E002793
 :10C03000706910F8291F41F00101017002F0D2FC73
 :10C040000500FBD41B2D07D0746994F82800012843
@@ -2969,7 +2969,7 @@
 :10D970000230DE070BD023F0800288F802202E4A06
 :10D980004132937823F001039370257000E02270F8
 :10D9900098F8022012061AD52F4D2A7862B900068F
-:10D9A0000AD5217124490122091D2CA003F0F6FBA0
+:10D9A0000AD5217124490122091D2CA003F0F4FBA2
 :10D9B00098F8020000060AD598F8030021798842F9
 :10D9C00005D0287828B998F80000000601D5FEF7A0
 :10D9D000C9FE1B48006801F0C5FA98F80300FD284D
@@ -2980,7 +2980,7 @@
 :10DA20008041094800F020FFD7E60221064800F0B7
 :10DA30001BFFE7E7C02A0020F0020020662A002032
 :10DA4000380200203C000020B82800206A02002094
-:10DA500098020020B2020020F8170108636F6D7071
+:10DA500098020020B2020020F4170108636F6D7075
 :10DA60006C6574656F726465720000001CB50520FA
 :10DA7000009001904FF480630022064906A001F057
 :10DA80003EFB08490028886303D0BDE81C4001F034
@@ -3177,7 +3177,7 @@
 :10E6700020610598606009B0002030BD286DA06061
 :10E680004FF0FF3020610020F4E700000E496B28B6
 :10E690000AD0702810D0886B0422401CC8622C312C
-:10E6A0000AA000BF02F07ABD086B0422401C486239
+:10E6A0000AA000BF02F078BD086B0422401C48623B
 :10E6B000054909A02431F5E7486B0422401C886213
 :10E6C000014908A02831EDE734000020726561643B
 :10E6D0005F77656967687400726561645F6B65790F
@@ -3187,9 +3187,9 @@
 :10E7100071D200086D61696E0000000070B5484359
 :10E72000044600F01DFA050003D02246002100F047
 :10E73000CFFA284670BD000070B5044C044D02E0CD
-:10E7400020688047241DAC42FAD370BD58220108CE
-:10E750005C22010870B5044C044D02E0206880473B
-:10E76000241DAC42FAD370BD5C220108642201086A
+:10E7400020688047241DAC42FAD370BD54220108D2
+:10E750005822010870B5044C044D02E0206880473F
+:10E76000241DAC42FAD370BD582201086022010872
 :10E7700010B5F3F7F9FC044A5188491C5180BDE8F3
 :10E780001040F3F7F5BC00004406002070B51446B5
 :10E790000A460546042100F01BFB6C7405F11C04BD
@@ -3437,7 +3437,7 @@
 :10F6B000D3FD41465046FFF770FC5046BDE8F04789
 :10F6C000FFF750BC10B5034601F0BEFA00282BD05E
 :10F6D000164C6B2B0CD0702B1ED0E06A04F12C0161
-:10F6E000401CE062042212A0BDE8104001F056BDAB
+:10F6E000401CE062042212A0BDE8104001F054BDAD
 :10F6F000FCF7D8FB401C17D010480178401E085C6E
 :10F700000F49097888420FD1606A0849401C0422D9
 :10F71000606224310BA0E7E7A06A0449401C042280
@@ -3496,7 +3496,7 @@
 :10FA600006D0B9F1030F03D041480078F0B367E046
 :10FA7000DFF800814FF0FF31D8F80000FFF78DFA72
 :10FA800020784FF0400201284FF002010BD00220F5
-:10FA900000F0D4FB2F49384801F0F0FB3749384AD1
+:10FA900000F0D4FB2F49384801F0EEFB3749384AD3
 :10FAA0000860012107E00120F2E7435C02EB010C52
 :10FAB000491C0CF8013C03788B42F6DA21780129C5
 :10FAC00005D003290BD12F490978012907D1DAB2D2
@@ -3535,13 +3535,13 @@
 :10FCD00030460A5C401C3A44D7B21028F9DBC7F121
 :10FCE000FF008DF810009DF80100801CC2B22F4863
 :10FCF00000F072FFE87820714FF0FF373946E06A74
-:10FD0000FFF74BF928490422183929A001F046FAD7
+:10FD0000FFF74BF928490422183929A001F044FAD9
 :10FD1000E06AFFF727F97020FFF7D4FCFAF73EFA04
 :10FD2000FAF7AAF9E878FE282AD0E089B8463946D9
 :10FD3000224F401CE0813868FFF72FF92048214905
 :10FD4000008808803868FFF70DF94146E06AFFF740
-:10FD500024F91549042218391BA001F01FFAE06AA2
-:10FD6000FFF700F9022217491AA001F017FAA87844
+:10FD500024F91549042218391BA001F01DFAE06AA4
+:10FD6000FFF700F9022217491AA001F015FAA87846
 :10FD700010F0780F10D0012020820CB0BDE8F08187
 :10FD8000174D39462868FFF708F900F033FBE68184
 :10FD90002868FFF7E7F8F0E7E069FFF7E3F8268265
@@ -3561,9 +3561,9 @@
 :10FE700000F0B2FEF42C26D101201B4C851E3872F6
 :10FE800029462068FFF789F8184819490088088032
 :10FE90002068FFF767F82946F86AFFF77EF81049EF
-:10FEA0000422243113A001F079F9F86AFFF75AF817
-:10FEB00002220F4912A001F071F9094904222431EC
-:10FEC00012A001F06BF90BB0F0BDFAF767F9FD2055
+:10FEA0000422243113A001F077F9F86AFFF75AF819
+:10FEB00002220F4912A001F06FF9094904222431EE
+:10FEC00012A001F069F90BB0F0BDFAF767F9FD2057
 :10FED000F87200208DF80D00B2E700003600002017
 :10FEE000F0020020740C0020C0020020B0020020AC
 :10FEF00044000020626567696E74696D65000000EA
@@ -3575,7 +3575,7 @@
 :10FF50002344835402788A42F6DCD1B2184C425CC6
 :10FF6000C2F1FF0242544FF0FF312068FFF715F84D
 :10FF70000121C122084600F061F90D49114801F044
-:10FF80007DF91149114A0860012104E0435C5518CC
+:10FF80007BF91149114A0860012104E0435C5518CE
 :10FF9000491C05F8013C03788B42F7DADAB20B49C9
 :10FFA0000B48F6F759F92068BDE87040FEF7DABF54
 :10FFB000F40100209401002038000020F602002007
@@ -3687,7 +3687,7 @@
 :10064000F5020020060300203B00002008030020E4
 :100650003C000020F302002090010020B828002078
 :1006600000100140F8F79CBE064810B5006B064923
-:10067000401E884205D200F061FEBDE81040F2F74E
+:10067000401E884205D200F05FFEBDE81040F2F750
 :10068000EDBA10BD680300207FF0FA022DE9F843AF
 :100690001D465FEA02080746894623D0234C0846D8
 :1006A000F1F74DFEC01C20F00301E81C20F0030010
@@ -3786,7 +3786,7 @@
 :100C700070470000340000202DE9FC410446C06CA0
 :100C80000E46804705467068216D884200D9FEE710
 :100C90002B46324604F12001204600F015F90028C9
-:100CA00030D12A463146204600F088FA070029D183
+:100CA00030D12A463146204600F086FA070029D185
 :100CB000206CC4E90C50203020647068616CC01C4A
 :100CC00020F00300081A60647068E16BC01C20F01B
 :100CD0000300081A2038E063A06CA84201D8A5647C
@@ -3794,7 +3794,7 @@
 :100CF0000021A06CCDE900012A460B460848F8F710
 :100D0000B7FB3846BDE8FC815B466C6173684442C2
 :100D10005D5B74736C5D00005B25735D20000000FB
-:100D2000F420010830B58DB00546002410482B464C
+:100D2000F020010830B58DB00546002410482B4650
 :100D3000CDE900400494224603A918460294FEF728
 :100D40003AFD6C656C62002305F1200221462846BD
 :100D5000AC64FDF7C1FB07A0F8F78AFB09A029687E
@@ -3850,347 +3850,347 @@
 :10107000C305D5F8AC508D4206D100EBC3004FF04C
 :10108000FF31C0F8AC1070BD5B1C042BD6D3042C10
 :10109000F9D200EBC400C0E92B1270BD10B5FDF70A
-:1010A000B3FF002010BD000010B51D4A0168914239
-:1010B00008D01C4A914221D11B490978012901D04D
-:1010C00003291BD119494FF496440A780021012ABB
-:1010D00015D0072A16D0042A17D0082A17D0631073
-:1010E000092A18D00A2A16D04360114A1278012A18
+:1010A000B3FF002010BD000010B51C4A016891423A
+:1010B00008D01B4A914221D11A490978012901D04F
+:1010C00003291BD118494FF416535C000A780021FC
+:1010D000012A09D0072A12D0042A13D0082A13D0D3
+:1010E000092A15D00A2A13D04360104A1278012A1F
 :1010F00004D1446012030161C0E9022110BD4FF424
-:10110000E13206E04FF4167203E04460EDE74FF47D
-:1011100016424260E9E70161C0E90131C160E4E7DC
-:1011200000380140004400403A000020390000200F
-:10113000350000202DE9F04700F10064DFF85890F9
-:1011400090460F46800704D0D9F80010491CC9F812
-:101150000010F4F749F8002512E03E6800233246FB
-:1011600021460220F4F700F82068B04205D0F3F7DA
-:10117000F1FF4FF0FF30BDE8F087241D2D1D3F1D0E
-:101180004545EAD3F3F7E6FFD9F808104046491C75
-:10119000C9F80810EFE700001400002010B586B071
-:1011A00004466846FAF78AFA024621460248FAF7E8
-:1011B0000BFB06B010BD0000940D002070B5064674
-:1011C000056C8AB048680C46CDE90620C01C716CDD
-:1011D00020F00300081A089001200090062301AABD
-:1011E00029463046F8F748FB002818D10C2306AAF8
-:1011F00005F114013046F8F7D0F900280FD1D4E9F1
-:10120000002330460899F8F7C8F9002807D10220D2
-:101210000090062301AA29463046F8F72DFB0AB0B4
-:1012200070BD000010B5144A4178517002210B4680
-:1012300014E0C45C7E2C05D07D2C03D0112C01D091
-:10124000132C06D17D245454C45C491CC9B284F0CB
-:1012500020045454491C5B1CC9B2DBB204789C4284
-:10126000E7D24B1E1370002303E0D45CC4545B1C14
-:10127000DBB28B42F9D910BD382B0020F0B50C78C9
-:101280002D4B04F10E02426002785A708288120AD5
-:101290009A700279DA70057A1D71467A5E7135446A
-:1012A0000622EEB2002547196D1CBF7A9F54521CCE
-:1012B000D2B29F18EDB217F8017C082D3E44F6B269
-:1012C000F1D3858A2D0A9D54521CD5B25A1912F8B1
-:1012D000012C3244067D5E556D1CEDB25E1916F888
-:1012E000016C3244067E5E556D1CEDB25E19407E87
-:1012F00016F8016C58556D1CE8B21D18324415F8EB
-:10130000015C2A44D5B20122641C0AE08E5C1E54A2
-:10131000401CC0B21E18521C16F8016CD2B23544E3
-:10132000EDB2A242F2D3C5F1FF0119541870024880
-:10133000FFF778FF0048F0BDCE2B00200148016B7D
-:1013400041637047680300200000000000000000B7
-:10135000010203040607080900000000010203045B
-:1013600073746D33325F6F6E6368697000000000E4
-:101370000000000000000000000000080000040061
-:101380000008000019CD000859DF000835110108D8
-:10139000EFB000082000000066616C5F696E697440
-:1013A000000000006013010866616C5F7061727478
-:1013B0006974696F6E5F696E69740066616C5F70F5
-:1013C0006172746974696F6E5F72656164006661F1
-:1013D0006C5F706172746974696F6E5F7772697443
-:1013E000650066616C5F706172746974696F6E5FCD
-:1013F0006572617365000000000000009630077799
-:101400002C610EEEBA51099919C46D078FF46A70F8
-:1014100035A563E9A395649E3288DB0EA4B8DC7918
-:101420001EE9D5E088D9D2972B4CB609BD7CB17E98
-:10143000072DB8E7911DBF906410B71DF220B06A68
-:101440004871B9F3DE41BE847DD4DA1AEBE4DD6D78
-:1014500051B5D4F4C785D38356986C13C0A86B6478
-:101460007AF962FDECC9658A4F5C0114D96C066398
-:10147000633D0FFAF50D088DC8206E3B5E10694C78
-:10148000E44160D5727167A2D1E4033C47D4044BB8
-:10149000FD850DD26BB50AA5FAA8B5356C98B24298
-:1014A000D6C9BBDB40F9BCACE36CD832755CDF4518
-:1014B000CF0DD6DC593DD1ABAC30D9263A00DE5148
-:1014C0008051D7C81661D0BFB5F4B42123C4B35638
-:1014D0009995BACF0FA5BDB89EB802280888055FB8
-:1014E000B2D90CC624E90BB1877C6F2F114C685818
-:1014F000AB1D61C13D2D66B69041DC760671DB0106
-:10150000BC20D2982A10D5EF8985B1711FB5B606D7
-:10151000A5E4BF9F33D4B8E8A2C9077834F9000F17
-:101520008EA8099618980EE1BB0D6A7F2D3D6D08B7
-:10153000976C6491015C63E6F4516B6B62616C1CA7
-:10154000D83065854E0062F2ED95066C7BA5011BD7
-:10155000C1F4088257C40FF5C6D9B06550E9B71277
-:10156000EAB8BE8B7C88B9FCDF1DDD62492DDA1537
-:10157000F37CD38C654CD4FB5861B24DCE51B53A57
-:101580007400BCA3E230BBD441A5DF4AD795D83D57
-:101590006DC4D1A4FBF4D6D36AE96943FCD96E3497
-:1015A000468867ADD0B860DA732D0444E51D033377
-:1015B0005F4C0AAAC97C0DDD3C710550AA41022787
-:1015C00010100BBE86200CC925B56857B3856F2057
-:1015D00009D466B99FE461CE0EF9DE5E98C9D929B7
-:1015E0002298D0B0B4A8D7C7173DB359810DB42EF7
-:1015F0003B5CBDB7AD6CBAC02083B8EDB6B3BF9A43
-:101600000CE2B6039AD2B1743947D5EAAF77D29DCE
-:101610001526DB048316DC73120B63E3843B6494AE
-:101620003E6A6D0DA85A6A7A0BCF0EE49DFF0993AE
-:1016300027AE000AB19E077D44930FF0D2A308871E
-:1016400068F2011EFEC206695D5762F7CB676580CE
-:1016500071366C19E7066B6E761BD4FEE02BD389CE
-:101660005A7ADA10CC4ADD676FDFB9F9F9EFBE8E2E
-:1016700043BEB717D58EB060E8A3D6D67E93D1A16E
-:10168000C4C2D83852F2DF4FF167BBD16757BCA64E
-:10169000DD06B53F4B36B248DA2B0DD84C1B0AAFEE
-:1016A000F64A0336607A0441C3EF60DF55DF67A86E
-:1016B000EF8E6E3179BE69468CB361CB1A8366BCFE
-:1016C000A0D26F2536E2685295770CCC03470BBB4E
-:1016D000B91602222F260555BE3BBAC5280BBDB24E
-:1016E000925AB42B046AB35CA7FFD7C231CFD0B5EE
-:1016F0008B9ED92C1DAEDE5BB0C2649B26F263ECE0
-:101700009CA36A750A936D02A906099C3F360EEBED
-:101710008567077213570005824ABF95147AB8E2AD
-:10172000AE2BB17B381BB60C9B8ED2920DBED5E58D
-:10173000B7EFDC7C21DFDB0BD4D2D38642E2D4F1DD
-:10174000F8B3DD686E83DA1FCD16BE815B26B9F66D
-:10175000E177B06F7747B718E65A0888706A0FFFCD
-:10176000CA3B06665C0B0111FF9E658F69AE62F88D
-:10177000D3FF6B6145CF6C1678E20AA0EED20DD78D
-:101780005483044EC2B30339612667A7F71660D0AD
-:101790004D476949DB776E3E4A6AD1AEDC5AD6D9ED
-:1017A000660BDF40F03BD83753AEBCA9C59EBBDE0D
-:1017B0007FCFB247E9FFB5301CF2BDBD8AC2BACABD
-:1017C0003093B353A6A3B4240536D0BA9306D7CD2D
-:1017D0002957DE54BF67D9232E7A66B3B84A61C44D
-:1017E000021B685D942B6F2A37BE0BB4A18E0CC30D
-:1017F0001BDF055A8DEF022D00C9E8B1B8B5D8D668
-:10180000B7CCE1C8A1B7BDCABDCDF8C2E7B1E0BA57
-:10181000C5C9E8B1B8C0E0D0CD544D52CAFDC1BF72
-:10182000204150492020202020D0A3D5FDD6D8C16A
-:10183000BFD7EEB4F3B3C6C1BFC2CBB2A8C9EEB630
-:10184000C8D0A1CAFDB5E32020B7D6B6C8D6B5200A
-:1018500020B8F4C0EBD6D8C1BF2020202020202003
-:10186000204E45574C6162656C5A4D333033202011
-:1018700020584B333139302020544D522032202013
-:1018800020544D522033202020455A33343030200C
-:1018900020414432353020202050544D202020203B
-:1018A00020542D323030302020534C313030303005
-:1018B00020584B3331393043385444493230304961
-:1018C000204944353131202020D7D4B6AF20202004
-:1018D000202020202020202020BFD8D6C6C6F720D8
-:1018E00020D4B6B3CCCFD4CABEB4F3C6C120202016
-:1018F00020B4F3C6C13120202000C1814001C08046
-:101900004101C0804100C1814001C0804100C181CE
-:101910004000C1814001C0804101C0804100C181BF
-:101920004000C1814001C0804100C1814001C080B0
-:101930004101C0804100C1814001C0804100C1819E
-:101940004000C1814001C0804100C1814001C08090
-:101950004101C0804100C1814000C1814001C0807F
-:101960004101C0804100C1814001C0804100C1816E
-:101970004000C1814001C0804101C0804100C1815F
-:101980004000C1814001C0804100C1814001C08050
-:101990004101C0804100C1814000C1814001C0803F
-:1019A0004101C0804100C1814001C0804100C1812E
-:1019B0004000C1814001C0804100C1814001C08020
-:1019C0004101C0804100C1814001C0804100C1810E
-:1019D0004000C1814001C0804101C0804100C181FF
-:1019E0004000C1814001C0804100C1814001C080F0
-:1019F0004101C0804100C1814000C0C101C3030258
-:101A0000C2C60607C705C5C404CC0C0DCD0FCFCE8A
-:101A10000E0ACACB0BC90908C8D81819D91BDBDABA
-:101A20001A1EDEDF1FDD1D1CDC14D4D515D71716DA
-:101A3000D6D21213D311D1D010F03031F133F3F2EA
-:101A40003236F6F737F53534F43CFCFD3DFF3F3ECA
-:101A5000FEFA3A3BFB39F9F83828E8E929EB2B2A5A
-:101A6000EAEE2E2FEF2DEDEC2CE42425E527E7E61A
-:101A70002622E2E323E12120E0A06061A163A3A28A
-:101A80006266A6A767A56564A46CACAD6DAF6F6E0A
-:101A9000AEAA6A6BAB69A9A86878B8B979BB7B7A3A
-:101AA000BABE7E7FBF7DBDBC7CB47475B577B7B65A
-:101AB0007672B2B373B17170B0509091519353522A
-:101AC0009296565797559594549C5C5D9D5F9F9E4A
-:101AD0005E5A9A9B5B99595898884849894B8B8ADA
-:101AE0004A4E8E8F4F8D4D4C8C448485458747469A
-:101AF0008682424383418180400000005C43330082
-:101B0000D4D8D6D8A3BAC7EBB1B8A3BA2020202026
-:101B100020BFC6C5C8CCDA544D52576174636820E3
-:101B200020202020202020C8ABBBECBACFC8D5C1D4
-:101B3000B8BCE0B9DCCFB5CDB320202020202020D8
-:101B4000202020C7EBCDA3D6B9BCD3C1CF0D0A202E
-:101B5000202020200000C1C081C1400101C3C0037A
-:101B6000800241C201C6C006800741C70005C1C549
-:101B700081C4400401CCC00C800D41CD000FC1CF09
-:101B800081CE400E000AC1CA81CB400B01C9C009F9
-:101B9000800841C801D8C018801941D9001BC1DB99
-:101BA00081DA401A001EC1DE81DF401F01DDC01D49
-:101BB000801C41DC0014C1D481D5401501D7C01769
-:101BC000801641D601D2C012801341D30011C1D179
-:101BD00081D0401001F0C030803141F10033C1F3B9
-:101BE00081F240320036C1F681F7403701F5C03549
-:101BF000803441F4003CC1FC81FD403D01FFC03F09
-:101C0000803E41FE01FAC03A803B41FB0039C1F9F8
-:101C100081F840380028C1E881E9402901EBC02B58
-:101C2000802A41EA01EEC02E802F41EF002DC1ED48
-:101C300081EC402C01E4C024802541E50027C1E768
-:101C400081E640260022C1E281E3402301E1C02178
-:101C5000802041E001A0C060806141A10063C1A378
-:101C600081A240620066C1A681A7406701A5C06548
-:101C7000806441A4006CC1AC81AD406D01AFC06F08
-:101C8000806E41AE01AAC06A806B41AB0069C1A9F8
-:101C900081A840680078C1B881B9407901BBC07B98
-:101CA000807A41BA01BEC07E807F41BF007DC1BD48
-:101CB00081BC407C01B4C074807541B50077C1B768
-:101CC00081B640760072C1B281B3407301B1C07178
-:101CD000807041B00050C190819140510193C05338
-:101CE000805241920196C056805741970055C19548
-:101CF00081944054019CC05C805D419D005FC19F08
-:101D0000819E405E005AC19A819B405B0199C059F7
-:101D1000805841980188C04880494189004BC18B57
-:101D2000818A404A004EC18E818F404F018DC04D47
-:101D3000804C418C0044C184818540450187C04767
-:101D4000804641860182C042804341830041C18177
-:101D50008180404068656C6C6F0076657273696F56
-:101D60006E005F5F636D645F76657273696F6E00AE
-:101D70006C6973745F746872656164005F5F636D42
-:101D8000645F6C6973745F746872656164006C6928
-:101D900073745F73656D005F5F636D645F6C69731F
-:101DA000745F73656D006C6973745F6576656E74DE
-:101DB000005F5F636D645F6C6973745F6576656E09
-:101DC00074006C6973745F74696D6572005F5F6342
-:101DD0006D645F6C6973745F74696D6572006C69C2
-:101DE0007374005F5F636D645F68656C70005F5F54
-:101DF000636D645F7073005F5F636D645F667265DF
-:101E00006500000001000200010003000100020063
-:101E100001000400010002000100030001000200B3
-:101E200001000500010002000100030001000200A2
-:101E30000100040001000200010003000100020093
-:101E40000100060001000200010003000100020081
-:101E50000100040001000200010003000100020073
-:101E60000100050001000200010003000100020062
-:101E70000100040001000200010003000100020053
-:101E80000100070001000200010003000100020040
-:101E90000100040001000200010003000100020033
-:101EA0000100050001000200010003000100020022
-:101EB0000100040001000200010003000100020013
-:101EC0000100060001000200010003000100020001
-:101ED00001000400010002000100030001000200F3
-:101EE00001000500010002000100030001000200E2
-:101EF00001000400010002000100030001000200D3
-:101F00000100303132333435363738396162636439
-:101F10006566003031323334353637383941424323
-:101F2000444546006C6973745F6D656D0000000088
-:101F3000496E697469616C697A65206661696C656E
-:101F4000642120506172746974696F6E2825732949
-:101F5000206F6666736574206164647265737328AC
-:101F6000256C6429206F7574206F6620666C617320
-:101F70006820626F756E64283C2564292E0000007D
-:101F8000506172746974696F6E207772697465202C
-:101F90006572726F72212020446F6E277420666F05
-:101FA000756E6420666C617368206465766963652C
-:101FB00028257329206F662074686520706172740B
-:101FC0006974696F6E282573292E00005061727440
-:101FD0006974696F6E2072656164206572726F72D8
-:101FE0002120446F6E277420666F756E6420666CC6
-:101FF0006173682064657669636528257329206F9D
-:10200000662074686520706172746974696F6E28E7
-:102010002573292E00000000506172746974696F85
-:102020006E206572617365206572726F7221204443
-:102030006F6E277420666F756E6420666C617368BE
-:102040002064657669636528257329206F6620748E
-:10205000686520706172746974696F6E28257329D0
-:102060002E000000536563746F72206865616465BB
-:102070007220696E666F20697320696E636F727279
-:102080006563742E204175746F20666F726D617484
-:10209000207468697320736563746F7220283078C8
-:1020A00025303858292E0A00466F756E6420616EFF
-:1020B000204B562028252E2A7329207768696368CB
-:1020C00020686173206368616E6765642076616C67
-:1020D0007565206661696C65642E204E6F77207788
-:1020E000696C6C207265636F766572792069742EF5
-:1020F0000A0000005761726E696E673A206375725C
-:1021000072656E742074696D657374616D702028DA
-:10211000256A6429206973206C6573732074686173
-:102120006E20746865206C6173742073617665201D
-:1021300074696D657374616D702028256A64290A5D
-:10214000000000005761726E696E673A2053656344
-:10215000746F722073746174757320697320777261
-:102160006F6E672C20746865726520617265206DE2
-:10217000756C7469706C6520736563746F7273201D
-:10218000696E207573652E0A00000000434300004D
-:10219000424C45004348000041504900574C000064
-:1021A000504D00005451000061645F465300000030
-:1021B000626567696E74696D6500000061645F54F3
-:1021C0006172650061645F496E746576616C0000E0
-:1021D00061645F4D617876616C00000072656164D6
-:1021E0005F706C616E00000061645F5A65726F0021
-:1021F000636F6D706C6574656F726465720000006A
-:10220000726561645F7765696768740062656769B4
-:102210006E7765696768740061645F5065726365B5
-:102220006E74000061645F506F696E74000000009E
-:1022300054696D65436F6E7374000000726561646C
-:102240005F6B65790000000061645F5370616E7AB6
-:102250000000000037F600082FF600082BF60008F3
-:10226000B9BF000833F60008541D010815CD000859
-:102270005A1D01089D100108621D01089D100108EA
-:10228000701D0108F5CF00087C1D0108F5CF00087E
-:102290008E1D01088BCF0008971D01088BCF000809
-:1022A000A61D010895CE0008B11D010895CE0008B5
-:1022B000C21D01086DD00008CD1D01086DD00008B9
-:1022C000DE1D010869CE0008E31D0108E9D40008FD
-:1022D000EE1D010809A50008F71D0108E1A400088A
-:1022E000241F010889CF000830315045626C00007E
+:10110000167203E04460F0E74FF416424260ECE7E9
+:101110000161C0E90131C160E7E70000003801402A
+:10112000004400403A000020390000203500002033
+:101130002DE9F04700F10064DFF8589090460F4623
+:10114000800704D0D9F80010491CC9F80010F4F742
+:101150004BF8002512E03E6800233246214602206B
+:10116000F4F702F82068B04205D0F3F7F3FF4FF030
+:10117000FF30BDE8F087241D2D1D3F1D4545EAD3F6
+:10118000F3F7E8FFD9F808104046491CC9F80810E1
+:10119000EFE700001400002010B586B00446684652
+:1011A000FAF78CFA024621460248FAF70DFB06B020
+:1011B00010BD0000940D002070B50646056C8AB085
+:1011C00048680C46CDE90620C01C716C20F0030075
+:1011D000081A089001200090062301AA29463046EB
+:1011E000F8F74AFB002818D10C2306AA05F11401D0
+:1011F0003046F8F7D2F900280FD1D4E90023304661
+:101200000899F8F7CAF9002807D1022000900623B0
+:1012100001AA29463046F8F72FFB0AB070BD00003E
+:1012200010B5144A4178517002210B4614E0C45C99
+:101230007E2C05D07D2C03D0112C01D0132C06D18F
+:101240007D245454C45C491CC9B284F02004545415
+:10125000491C5B1CC9B2DBB204789C42E7D24B1E2E
+:101260001370002303E0D45CC4545B1CDBB28B42DC
+:10127000F9D910BD382B0020F0B50C782D4B04F1B6
+:101280000E02426002785A708288120A9A700279BD
+:10129000DA70057A1D71467A5E7135440622EEB227
+:1012A000002547196D1CBF7A9F54521CD2B29F185B
+:1012B000EDB217F8017C082D3E44F6B2F1D3858AD1
+:1012C0002D0A9D54521CD5B25A1912F8012C3244E1
+:1012D000067D5E556D1CEDB25E1916F8016C324448
+:1012E000067E5E556D1CEDB25E19407E16F8016CEF
+:1012F00058556D1CE8B21D18324415F8015C2A449B
+:10130000D5B20122641C0AE08E5C1E54401CC0B29F
+:101310001E18521C16F8016CD2B23544EDB2A2422E
+:10132000F2D3C5F1FF01195418700248FFF778FF96
+:101330000048F0BDCE2B00200148016B416370478F
+:101340006803002000000000000000000102030408
+:1013500006070809000000000102030473746D33DE
+:10136000325F6F6E6368697000000000000000006B
+:101370000000000000000008000004000008000059
+:1013800019CD000859DF000831110108EFB000083D
+:101390002000000066616C5F696E697400000000E7
+:1013A0005C13010866616C5F706172746974696FC7
+:1013B0006E5F696E69740066616C5F7061727469FA
+:1013C00074696F6E5F726561640066616C5F706105
+:1013D00072746974696F6E5F7772697465006661B3
+:1013E0006C5F706172746974696F6E5F657261734E
+:1013F0006500000000000000963007772C610EEEBB
+:10140000BA51099919C46D078FF46A7035A563E95B
+:10141000A395649E3288DB0EA4B8DC791EE9D5E082
+:1014200088D9D2972B4CB609BD7CB17E072DB8E781
+:10143000911DBF906410B71DF220B06A4871B9F3D6
+:10144000DE41BE847DD4DA1AEBE4DD6D51B5D4F40F
+:10145000C785D38356986C13C0A86B647AF962FD74
+:10146000ECC9658A4F5C0114D96C0663633D0FFAC1
+:10147000F50D088DC8206E3B5E10694CE44160D5C7
+:10148000727167A2D1E4033C47D4044BFD850DD2B1
+:101490006BB50AA5FAA8B5356C98B242D6C9BBDBC4
+:1014A00040F9BCACE36CD832755CDF45CF0DD6DCBF
+:1014B000593DD1ABAC30D9263A00DE518051D7C866
+:1014C0001661D0BFB5F4B42123C4B3569995BACFF1
+:1014D0000FA5BDB89EB802280888055FB2D90CC612
+:1014E00024E90BB1877C6F2F114C6858AB1D61C18B
+:1014F0003D2D66B69041DC760671DB01BC20D298AA
+:101500002A10D5EF8985B1711FB5B606A5E4BF9F36
+:1015100033D4B8E8A2C9077834F9000F8EA8099629
+:1015200018980EE1BB0D6A7F2D3D6D08976C649194
+:10153000015C63E6F4516B6B62616C1CD8306585AD
+:101540004E0062F2ED95066C7BA5011BC1F408828A
+:1015500057C40FF5C6D9B06550E9B712EAB8BE8BCB
+:101560007C88B9FCDF1DDD62492DDA15F37CD38C54
+:10157000654CD4FB5861B24DCE51B53A7400BCA352
+:10158000E230BBD441A5DF4AD795D83D6DC4D1A484
+:10159000FBF4D6D36AE96943FCD96E34468867AD5B
+:1015A000D0B860DA732D0444E51D03335F4C0AAAFA
+:1015B000C97C0DDD3C710550AA41022710100BBEFD
+:1015C00086200CC925B56857B3856F2009D466B944
+:1015D0009FE461CE0EF9DE5E98C9D9292298D0B079
+:1015E000B4A8D7C7173DB359810DB42E3B5CBDB726
+:1015F000AD6CBAC02083B8EDB6B3BF9A0CE2B603A7
+:101600009AD2B1743947D5EAAF77D29D1526DB045B
+:101610008316DC73120B63E3843B64943E6A6D0DA6
+:10162000A85A6A7A0BCF0EE49DFF099327AE000AF1
+:10163000B19E077D44930FF0D2A3088768F2011E84
+:10164000FEC206695D5762F7CB67658071366C191B
+:10165000E7066B6E761BD4FEE02BD3895A7ADA103C
+:10166000CC4ADD676FDFB9F9F9EFBE8E43BEB7171D
+:10167000D58EB060E8A3D6D67E93D1A1C4C2D838A7
+:1016800052F2DF4FF167BBD16757BCA6DD06B53F0D
+:101690004B36B248DA2B0DD84C1B0AAFF64A03364C
+:1016A000607A0441C3EF60DF55DF67A8EF8E6E31CB
+:1016B00079BE69468CB361CB1A8366BCA0D26F2514
+:1016C00036E2685295770CCC03470BBBB916022261
+:1016D0002F260555BE3BBAC5280BBDB2925AB42B76
+:1016E000046AB35CA7FFD7C231CFD0B58B9ED92C8B
+:1016F0001DAEDE5BB0C2649B26F263EC9CA36A75F0
+:101700000A936D02A906099C3F360EEB85670772A6
+:1017100013570005824ABF95147AB8E2AE2BB17B0D
+:10172000381BB60C9B8ED2920DBED5E5B7EFDC7C94
+:1017300021DFDB0BD4D2D38642E2D4F1F8B3DD68EB
+:101740006E83DA1FCD16BE815B26B9F6E177B06FE6
+:101750007747B718E65A0888706A0FFFCA3B0666D3
+:101760005C0B0111FF9E658F69AE62F8D3FF6B6160
+:1017700045CF6C1678E20AA0EED20DD75483044E02
+:10178000C2B30339612667A7F71660D04D47694990
+:10179000DB776E3E4A6AD1AEDC5AD6D9660BDF40A3
+:1017A000F03BD83753AEBCA9C59EBBDE7FCFB24756
+:1017B000E9FFB5301CF2BDBD8AC2BACA3093B3533B
+:1017C000A6A3B4240536D0BA9306D7CD2957DE5444
+:1017D000BF67D9232E7A66B3B84A61C4021B685D1D
+:1017E000942B6F2A37BE0BB4A18E0CC31BDF055A96
+:1017F0008DEF022D00C9E8B1B8B5D8D6B7CCE1C895
+:10180000A1B7BDCABDCDF8C2E7B1E0BAC5C9E8B15C
+:10181000B8C0E0D0CD544D52CAFDC1BF204150499F
+:101820002020202020D0A3D5FDD6D8C1BFD7EEB42C
+:10183000F3B3C6C1BFC2CBB2A8C9EEB6C8D0A1CA65
+:10184000FDB5E32020B7D6B6C8D6B52020B8F4C081
+:10185000EBD6D8C1BF20202020202020204E455785
+:101860004C6162656C5A4D333033202020584B3325
+:101870003139302020544D522032202020544D52F6
+:101880002033202020455A33343030202041443248
+:10189000353020202050544D2020202020542D323F
+:1018A0003030302020534C313030303020584B33E2
+:1018B0003139304338544449323030492049443575
+:1018C0003131202020D7D4B6AF2020202020202066
+:1018D0002020202020BFD8D6C6C6F72020D4B6B3FB
+:1018E000CCCFD4CABEB4F3C6C120202020B4F3C6E6
+:1018F000C13120202000C1814001C0804101C08051
+:101900004100C1814001C0804100C1814000C181CE
+:101910004001C0804101C0804100C1814000C181BF
+:101920004001C0804100C1814001C0804101C080B0
+:101930004100C1814001C0804100C1814000C1819E
+:101940004001C0804100C1814001C0804101C08090
+:101950004100C1814000C1814001C0804101C0807F
+:101960004100C1814001C0804100C1814000C1816E
+:101970004001C0804101C0804100C1814000C1815F
+:101980004001C0804100C1814001C0804101C08050
+:101990004100C1814000C1814001C0804101C0803F
+:1019A0004100C1814001C0804100C1814000C1812E
+:1019B0004001C0804100C1814001C0804101C08020
+:1019C0004100C1814001C0804100C1814000C1810E
+:1019D0004001C0804101C0804100C1814000C181FF
+:1019E0004001C0804100C1814001C0804101C080F0
+:1019F0004100C1814000C0C101C30302C2C6060745
+:101A0000C705C5C404CC0C0DCD0FCFCE0E0ACACB72
+:101A10000BC90908C8D81819D91BDBDA1A1EDEDF72
+:101A20001FDD1D1CDC14D4D515D71716D6D2121302
+:101A3000D311D1D010F03031F133F3F23236F6F762
+:101A400037F53534F43CFCFD3DFF3F3EFEFA3A3BB2
+:101A5000FB39F9F83828E8E929EB2B2AEAEE2E2F92
+:101A6000EF2DEDEC2CE42425E527E7E62622E2E342
+:101A700023E12120E0A06061A163A3A26266A6A782
+:101A800067A56564A46CACAD6DAF6F6EAEAA6A6BF2
+:101A9000AB69A9A86878B8B979BB7B7ABABE7E7FF2
+:101AA000BF7DBDBC7CB47475B577B7B67672B2B382
+:101AB00073B17170B05090915193535292965657A2
+:101AC00097559594549C5C5D9D5F9F9E5E5A9A9B32
+:101AD0005B99595898884849894B8B8A4A4E8E8F12
+:101AE0004F8D4D4C8C4484854587474686824243C2
+:101AF00083418180400000005C433300D4D8D6D8B5
+:101B0000A3BAC7EBB1B8A3BA2020202020BFC6C516
+:101B1000C8CCDA544D5257617463682020202020CD
+:101B2000202020C8ABBBECBACFC8D5C1B8BCE0B947
+:101B3000DCCFB5CDB320202020202020202020C7BE
+:101B4000EBCDA3D6B9BCD3C1CF0D0A2020202020D5
+:101B50000000C1C081C1400101C3C003800241C275
+:101B600001C6C006800741C70005C1C581C4400445
+:101B700001CCC00C800D41CD000FC1CF81CE400EF5
+:101B8000000AC1CA81CB400B01C9C009800841C805
+:101B900001D8C018801941D9001BC1DB81DA401A75
+:101BA000001EC1DE81DF401F01DDC01D801C41DC45
+:101BB0000014C1D481D5401501D7C017801641D675
+:101BC00001D2C012801341D30011C1D181D0401085
+:101BD00001F0C030803141F10033C1F381F2403275
+:101BE0000036C1F681F7403701F5C035803441F445
+:101BF000003CC1FC81FD403D01FFC03F803E41FEF5
+:101C000001FAC03A803B41FB0039C1F981F8403804
+:101C10000028C1E881E9402901EBC02B802A41EA74
+:101C200001EEC02E802F41EF002DC1ED81EC402C44
+:101C300001E4C024802541E50027C1E781E6402674
+:101C40000022C1E281E3402301E1C021802041E084
+:101C500001A0C060806141A10063C1A381A2406274
+:101C60000066C1A681A7406701A5C065806441A444
+:101C7000006CC1AC81AD406D01AFC06F806E41AEF4
+:101C800001AAC06A806B41AB0069C1A981A8406804
+:101C90000078C1B881B9407901BBC07B807A41BA74
+:101CA00001BEC07E807F41BF007DC1BD81BC407C44
+:101CB00001B4C074807541B50077C1B781B6407674
+:101CC0000072C1B281B3407301B1C071807041B084
+:101CD0000050C190819140510193C0538052419274
+:101CE0000196C056805741970055C1958194405444
+:101CF000019CC05C805D419D005FC19F819E405EF4
+:101D0000005AC19A819B405B0199C0598058419803
+:101D10000188C04880494189004BC18B818A404A73
+:101D2000004EC18E818F404F018DC04D804C418C43
+:101D30000044C184818540450187C0478046418673
+:101D40000182C042804341830041C1818180404083
+:101D500068656C6C6F0076657273696F6E005F5FAB
+:101D6000636D645F76657273696F6E006C6973741E
+:101D70005F746872656164005F5F636D645F6C6966
+:101D800073745F746872656164006C6973745F7307
+:101D9000656D005F5F636D645F6C6973745F73652D
+:101DA0006D006C6973745F6576656E74005F5F6368
+:101DB0006D645F6C6973745F6576656E74006C69E1
+:101DC00073745F74696D6572005F5F636D645F6CEF
+:101DD0006973745F74696D6572006C697374005F18
+:101DE0005F636D645F68656C70005F5F636D645F07
+:101DF0007073005F5F636D645F667265650000000D
+:101E000001000200010003000100020001000400C3
+:101E100001000200010003000100020001000500B2
+:101E200001000200010003000100020001000400A3
+:101E30000100020001000300010002000100060091
+:101E40000100020001000300010002000100040083
+:101E50000100020001000300010002000100050072
+:101E60000100020001000300010002000100040063
+:101E70000100020001000300010002000100070050
+:101E80000100020001000300010002000100040043
+:101E90000100020001000300010002000100050032
+:101EA0000100020001000300010002000100040023
+:101EB0000100020001000300010002000100060011
+:101EC0000100020001000300010002000100040003
+:101ED00001000200010003000100020001000500F2
+:101EE00001000200010003000100020001000400E3
+:101EF0000100020001000300010002000100303176
+:101F000032333435363738396162636465660030A0
+:101F1000313233343536373839414243444546004F
+:101F20006C6973745F6D656D00000000496E6974C3
+:101F300069616C697A65206661696C65642120500D
+:101F40006172746974696F6E28257329206F6666E3
+:101F5000736574206164647265737328256C6429E9
+:101F6000206F7574206F6620666C61736820626FE5
+:101F7000756E64283C2564292E000000506172743F
+:101F80006974696F6E207772697465206572726F0B
+:101F900072212020446F6E277420666F756E642056
+:101FA000666C6173682064657669636528257329AA
+:101FB000206F662074686520706172746974696F3F
+:101FC0006E282573292E0000506172746974696F40
+:101FD0006E2072656164206572726F722120446F99
+:101FE0006E277420666F756E6420666C617368205E
+:101FF00064657669636528257329206F6620746897
+:102000006520706172746974696F6E282573292E5A
+:1020100000000000506172746974696F6E2065720F
+:10202000617365206572726F722120446F6E277430
+:1020300020666F756E6420666C61736820646576D7
+:1020400069636528257329206F6620746865207090
+:102050006172746974696F6E282573292E000000FF
+:10206000536563746F722068656164657220696E80
+:10207000666F20697320696E636F72726563742E78
+:10208000204175746F20666F726D61742074686989
+:102090007320736563746F72202830782530385848
+:1020A000292E0A00466F756E6420616E204B562003
+:1020B00028252E2A73292077686963682068617350
+:1020C000206368616E6765642076616C7565206663
+:1020D00061696C65642E204E6F772077696C6C2087
+:1020E0007265636F766572792069742E0A0000004C
+:1020F0005761726E696E673A2063757272656E74AD
+:102100002074696D657374616D702028256A642977
+:10211000206973206C657373207468616E20746825
+:1021200065206C61737420736176652074696D65D8
+:102130007374616D702028256A64290A000000000C
+:102140005761726E696E673A20536563746F7220CF
+:102150007374617475732069732077726F6E672C66
+:1021600020746865726520617265206D756C746994
+:10217000706C6520736563746F727320696E20756F
+:1021800073652E0A0000000043430000424C4500E6
+:102190004348000041504900574C0000504D00009A
+:1021A0005451000061645F46530000006265676936
+:1021B0006E74696D6500000061645F546172650052
+:1021C00061645F496E746576616C000061645F4DA7
+:1021D000617876616C000000726561645F706C61AB
+:1021E0006E00000061645F5A65726F00636F6D700E
+:1021F0006C6574656F72646572000000726561647D
+:102200005F77656967687400626567696E7765699D
+:102210006768740061645F50657263656E74000086
+:1022200061645F506F696E740000000054696D65F1
+:10223000436F6E7374000000726561645F6B657953
+:102240000000000061645F5370616E7A000000005E
+:1022500037F600082FF600082BF60008B9BF000873
+:1022600033F60008501D010815CD0008561D010861
+:102270009D1001085E1D01089D1001086C1D0108DC
+:10228000F5CF0008781D0108F5CF00088A1D010868
+:102290008BCF0008931D01088BCF0008A21D0108F9
+:1022A00095CE0008AD1D010895CE0008BE1D0108A1
+:1022B0006DD00008C91D01086DD00008DA1D0108A5
+:1022C00069CE0008DF1D0108E9D40008EA1D0108F5
+:1022D00009A50008F31D0108E1A40008201F01085A
+:1022E00089CF000830315045626C000000000000CA
 :1022F00000000000000000000000000000000000DE
-:102300000000000073746D33325F6F6E6368697034
-:1023100000000000000000000000000000000000BD
-:10232000000800000000000030315045617070006E
+:1023000073746D33325F6F6E636869700000000034
+:1023100000000000000000000000000000080000B5
+:102320000000000030315045617070000000000076
 :10233000000000000000000000000000000000009D
-:102340000000000073746D33325F6F6E63686970F4
-:102350000000000000000000000000000008000075
-:102360000080010000000000303150456B76000015
+:1023400073746D33325F6F6E6368697000000000F4
+:1023500000000000000000000008000000800100F4
+:1023600000000000303150456B7600000000000096
 :10237000000000000000000000000000000000005D
-:102380000000000073746D33325F6F6E63686970B4
-:1023900000000000000000000000000000880100B4
-:1023A00000F00000000000003031504574735F7091
-:1023B0006C616E00000000000000000000000000E2
-:1023C0000000000073746D33325F6F6E6368697074
-:1023D0000000000000000000000000000078020083
-:1023E00000680000000000003031504574735F6BDE
-:1023F00065790000000000000000000000000000FF
-:102400000000000073746D33325F6F6E6368697033
-:1024100000000000000000000000000000E00200DA
-:1024200000680000000000003031504574735F7791
-:10243000656967687400000000000000000000008B
-:102440000000000073746D33325F6F6E63686970F3
-:102450000000000000000000000000000048030031
-:1024600000B00000000000008824010800000020E7
-:1024700070060000582A0008F825010870060020A0
-:10248000F0B4000004950008511324F4320102292D
-:102490001012011301071302031204720223307594
-:1024A000456666663F2B202322890401241E942161
-:1024B0000108363B29301AA40C5A390C1AA00C5AC0
-:1024C0003C0C1A9C0C5A370C1A980C5A380C1A8C63
-:1024D0000C5A3B0C1A900C5A3A0C5E182201083D1B
-:1024E0000C1AD0181A480C32041AA80C5A3E181AA2
-:1024F000242419B5390C1AC4185A400C1A48185A11
-:102500004C301AE8185A500C1ABC0C5A540C1A3C8D
-:10251000245A580C1ADC185A5C0C1119185A600C01
-:102520001A0C0C1A440C32021AB0244B1403181A59
-:10253000F00C4BF4026C1A3024691829102904019C
-:10254000527BFFFF08137E15043BF17E450A1701FD
-:10255000A30A122001310B2908085E91224104468A
-:1025600080FF7F7A7EB6AAFD630116021F04380938
-:10257000D2BBBAC5C5A3C9E1DC01322A02630B1E76
-:1025800001108601250324803F181A30313233347C
-:1025900035363738390D0A3A2A4846363031414106
-:1025A00053373031846280146902371CA30602114C
-:1025B00023012E1408800444B880103A0AB32A017B
-:1025C000AE0299130C735C4331280C732020202831
-:1025D000014B32011308062A2004329032021A18E5
-:1025E0000C2904322832042A280C5910320A1A38CD
-:0825F0000C2904022F34000045
+:1023800073746D33325F6F6E6368697000000000B4
+:1023900000000000000000000088010000F00000C4
+:1023A000000000003031504574735F706C616E0046
+:1023B000000000000000000000000000000000001D
+:1023C00073746D33325F6F6E636869700000000074
+:1023D000000000000000000000780200006800001B
+:1023E000000000003031504574735F6B6579000068
+:1023F00000000000000000000000000000000000DD
+:1024000073746D33325F6F6E636869700000000033
+:10241000000000000000000000E002000068000072
+:10242000000000003031504574735F77656967685C
+:102430007400000000000000000000000000000028
+:1024400073746D33325F6F6E6368697000000000F3
+:1024500000000000000000000048030000B0000081
+:102460000000000084240108000000207006000025
+:10247000582A0008F425010870060020F0B4000076
+:1024800004950008511324F432010229101201139B
+:102490000107130204120472022330754566666652
+:1024A0003F2B202322890401241E90210108363B62
+:1024B00029301AA00C5A390C1A9C0C5A3C0C1A9848
+:1024C0000C5A370C1A940C5A380C1A880C5A3B0CBC
+:1024D0001A8C0C5A3A0C5E142201083D0C1ACC18C6
+:1024E0001A480C32041AA40C5A3E181A202419B5A2
+:1024F000390C1AC0185A400C1A44185A4C301AE4B5
+:10250000185A500C1AB80C5A540C1A38245A580C31
+:102510001AD8185A5C0C1AFC0C5A600C1A08241AA7
+:10252000440C32021AAC184B1403181AEC0C4BF47E
+:10253000026C1A2C2469182910290401527BFFFF10
+:1025400008137E15043BF17E450A1701A30A1220E9
+:1025500001310B2908085E912241044680FF7F7AF1
+:102560007EB6AAFD630116021F043809D2BBBAC5A4
+:10257000C5A3C9E1DC01322A02630B1E01108601EA
+:10258000250324803F181A3031323334353637383A
+:10259000390D0A3A2A4846363031414153373031F5
+:1025A000846280146902371CA306021123012E14D1
+:1025B00008800444B880103A0AB32A01AE02991385
+:1025C0000C735C4331280C7320202028014B32010E
+:1025D0001308062A2004329032021A180C290432F9
+:1025E0002832042A280C5910320A1A380C290402FD
+:0425F0002F34000084
 :04000005080021319D
 :00000001FF

MDK-ARM/test/TMRWatch_OTA.map

@@ -6,9 +6,9 @@ Memory Map of the image
 
   Image Entry point : 0x08002131
 
-  Load Region LR_IROM1 (Base: 0x08002000, Size: 0x00010af8, Max: 0x00080000, ABSOLUTE, COMPRESSED[0x000105f8])
+  Load Region LR_IROM1 (Base: 0x08002000, Size: 0x00010af4, Max: 0x00080000, ABSOLUTE, COMPRESSED[0x000105f4])
 
-    Execution Region ER_IROM1 (Exec base: 0x08002000, Load base: 0x08002000, Size: 0x00010488, Max: 0x00080000, ABSOLUTE)
+    Execution Region ER_IROM1 (Exec base: 0x08002000, Load base: 0x08002000, Size: 0x00010484, Max: 0x00080000, ABSOLUTE)
 
     Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
 
@@ -553,66 +553,66 @@ Memory Map of the image
     0x08011036   0x08011036   0x00000066   Code   RO         2326    i.update_sector_cache  fdb_kvdb.o
     0x0801109c   0x0801109c   0x0000000a   Code   RO         4289    i.version           cmd.o
     0x080110a6   0x080110a6   0x00000002   PAD
-    0x080110a8   0x080110a8   0x0000008c   Code   RO         3368    i.weight_usart_Init  weight.o
-    0x08011134   0x08011134   0x00000068   Code   RO         2071    i.write             fal_flash_stm32f1_port.o
-    0x0801119c   0x0801119c   0x00000020   Code   RO         2795    i.write_Flash       flash.o
-    0x080111bc   0x080111bc   0x00000066   Code   RO         2575    i.write_tsl         fdb_tsdb.o
-    0x08011222   0x08011222   0x00000002   PAD
-    0x08011224   0x08011224   0x00000058   Code   RO         3668    i.xBeeApp2EscapingMode  xbeeappescapingmode.o
-    0x0801127c   0x0801127c   0x000000c0   Code   RO         3669    i.xBeeApp2MakeFrame  xbeeappescapingmode.o
-    0x0801133c   0x0801133c   0x0000000c   Code   RO         3766    i.zerocalculate     ad.o
-    0x08011348   0x08011348   0x00000010   Data   RO          597    .constdata          system_stm32f1xx.o
-    0x08011358   0x08011358   0x00000008   Data   RO          598    .constdata          system_stm32f1xx.o
-    0x08011360   0x08011360   0x00000038   Data   RO         2072    .constdata          fal_flash_stm32f1_port.o
-    0x08011398   0x08011398   0x00000009   Data   RO         2130    .constdata          fal.o
-    0x080113a1   0x080113a1   0x00000003   PAD
-    0x080113a4   0x080113a4   0x00000004   Data   RO         2158    .constdata          fal_flash.o
-    0x080113a8   0x080113a8   0x0000004e   Data   RO         2189    .constdata          fal_partition.o
-    0x080113f6   0x080113f6   0x00000002   PAD
-    0x080113f8   0x080113f8   0x00000400   Data   RO         2691    .constdata          fdb_utils.o
-    0x080117f8   0x080117f8   0x00000001   Data   RO         2798    .constdata          flash.o
-    0x080117f9   0x080117f9   0x00000300   Data   RO         3136    .constdata          display.o
-    0x08011af9   0x08011af9   0x00000003   PAD
-    0x08011afc   0x08011afc   0x00000258   Data   RO         4074    .constdata          dascreen.o
-    0x08011d54   0x08011d54   0x00000006   Data   RO         4290    .constdata          cmd.o
-    0x08011d5a   0x08011d5a   0x00000008   Data   RO         4291    .constdata          cmd.o
-    0x08011d62   0x08011d62   0x0000000e   Data   RO         4292    .constdata          cmd.o
-    0x08011d70   0x08011d70   0x0000000c   Data   RO         4293    .constdata          cmd.o
-    0x08011d7c   0x08011d7c   0x00000012   Data   RO         4294    .constdata          cmd.o
-    0x08011d8e   0x08011d8e   0x00000009   Data   RO         4295    .constdata          cmd.o
-    0x08011d97   0x08011d97   0x0000000f   Data   RO         4296    .constdata          cmd.o
-    0x08011da6   0x08011da6   0x0000000b   Data   RO         4297    .constdata          cmd.o
-    0x08011db1   0x08011db1   0x00000011   Data   RO         4298    .constdata          cmd.o
-    0x08011dc2   0x08011dc2   0x0000000b   Data   RO         4299    .constdata          cmd.o
-    0x08011dcd   0x08011dcd   0x00000011   Data   RO         4300    .constdata          cmd.o
-    0x08011dde   0x08011dde   0x00000005   Data   RO         4301    .constdata          cmd.o
-    0x08011de3   0x08011de3   0x0000000b   Data   RO         4380    .constdata          msh.o
-    0x08011dee   0x08011dee   0x00000009   Data   RO         4381    .constdata          msh.o
-    0x08011df7   0x08011df7   0x0000000b   Data   RO         4382    .constdata          msh.o
-    0x08011e02   0x08011e02   0x00000122   Data   RO         4887    .constdata          kservice.o
-    0x08011f24   0x08011f24   0x00000009   Data   RO         5027    .constdata          mem.o
-    0x08011f2d   0x08011f2d   0x00000003   PAD
-    0x08011f30   0x08011f30   0x00000132   Data   RO         2190    .conststring        fal_partition.o
-    0x08012062   0x08012062   0x00000002   PAD
-    0x08012064   0x08012064   0x0000008e   Data   RO         2328    .conststring        fdb_kvdb.o
-    0x080120f2   0x080120f2   0x00000002   PAD
-    0x080120f4   0x080120f4   0x00000095   Data   RO         2576    .conststring        fdb_tsdb.o
-    0x08012189   0x08012189   0x00000003   PAD
-    0x0801218c   0x0801218c   0x000000c5   Data   RO         2799    .conststring        flash.o
-    0x08012251   0x08012251   0x00000003   PAD
-    0x08012254   0x08012254   0x00000004   Data   RO         4612    .rti_fn.0           components.o
-    0x08012258   0x08012258   0x00000004   Data   RO         4613    .rti_fn.0.end       components.o
-    0x0801225c   0x0801225c   0x00000004   Data   RO         4614    .rti_fn.1.end       components.o
-    0x08012260   0x08012260   0x00000004   Data   RO         4448    .rti_fn.6           shell.o
-    0x08012264   0x08012264   0x00000004   Data   RO         4615    .rti_fn.6.end       components.o
-    0x08012268   0x08012268   0x00000060   Data   RO         4302    FSymTab             cmd.o
-    0x080122c8   0x080122c8   0x00000018   Data   RO         4383    FSymTab             msh.o
-    0x080122e0   0x080122e0   0x00000008   Data   RO         5029    FSymTab             mem.o
-    0x080122e8   0x080122e8   0x00000180   Data   RO         2192    FalPartTable        fal_partition.o
-    0x08012468   0x08012468   0x00000020   Data   RO         5855    Region$$Table       anon$$obj.o
+    0x080110a8   0x080110a8   0x00000088   Code   RO         3368    i.weight_usart_Init  weight.o
+    0x08011130   0x08011130   0x00000068   Code   RO         2071    i.write             fal_flash_stm32f1_port.o
+    0x08011198   0x08011198   0x00000020   Code   RO         2795    i.write_Flash       flash.o
+    0x080111b8   0x080111b8   0x00000066   Code   RO         2575    i.write_tsl         fdb_tsdb.o
+    0x0801121e   0x0801121e   0x00000002   PAD
+    0x08011220   0x08011220   0x00000058   Code   RO         3668    i.xBeeApp2EscapingMode  xbeeappescapingmode.o
+    0x08011278   0x08011278   0x000000c0   Code   RO         3669    i.xBeeApp2MakeFrame  xbeeappescapingmode.o
+    0x08011338   0x08011338   0x0000000c   Code   RO         3766    i.zerocalculate     ad.o
+    0x08011344   0x08011344   0x00000010   Data   RO          597    .constdata          system_stm32f1xx.o
+    0x08011354   0x08011354   0x00000008   Data   RO          598    .constdata          system_stm32f1xx.o
+    0x0801135c   0x0801135c   0x00000038   Data   RO         2072    .constdata          fal_flash_stm32f1_port.o
+    0x08011394   0x08011394   0x00000009   Data   RO         2130    .constdata          fal.o
+    0x0801139d   0x0801139d   0x00000003   PAD
+    0x080113a0   0x080113a0   0x00000004   Data   RO         2158    .constdata          fal_flash.o
+    0x080113a4   0x080113a4   0x0000004e   Data   RO         2189    .constdata          fal_partition.o
+    0x080113f2   0x080113f2   0x00000002   PAD
+    0x080113f4   0x080113f4   0x00000400   Data   RO         2691    .constdata          fdb_utils.o
+    0x080117f4   0x080117f4   0x00000001   Data   RO         2798    .constdata          flash.o
+    0x080117f5   0x080117f5   0x00000300   Data   RO         3136    .constdata          display.o
+    0x08011af5   0x08011af5   0x00000003   PAD
+    0x08011af8   0x08011af8   0x00000258   Data   RO         4074    .constdata          dascreen.o
+    0x08011d50   0x08011d50   0x00000006   Data   RO         4290    .constdata          cmd.o
+    0x08011d56   0x08011d56   0x00000008   Data   RO         4291    .constdata          cmd.o
+    0x08011d5e   0x08011d5e   0x0000000e   Data   RO         4292    .constdata          cmd.o
+    0x08011d6c   0x08011d6c   0x0000000c   Data   RO         4293    .constdata          cmd.o
+    0x08011d78   0x08011d78   0x00000012   Data   RO         4294    .constdata          cmd.o
+    0x08011d8a   0x08011d8a   0x00000009   Data   RO         4295    .constdata          cmd.o
+    0x08011d93   0x08011d93   0x0000000f   Data   RO         4296    .constdata          cmd.o
+    0x08011da2   0x08011da2   0x0000000b   Data   RO         4297    .constdata          cmd.o
+    0x08011dad   0x08011dad   0x00000011   Data   RO         4298    .constdata          cmd.o
+    0x08011dbe   0x08011dbe   0x0000000b   Data   RO         4299    .constdata          cmd.o
+    0x08011dc9   0x08011dc9   0x00000011   Data   RO         4300    .constdata          cmd.o
+    0x08011dda   0x08011dda   0x00000005   Data   RO         4301    .constdata          cmd.o
+    0x08011ddf   0x08011ddf   0x0000000b   Data   RO         4380    .constdata          msh.o
+    0x08011dea   0x08011dea   0x00000009   Data   RO         4381    .constdata          msh.o
+    0x08011df3   0x08011df3   0x0000000b   Data   RO         4382    .constdata          msh.o
+    0x08011dfe   0x08011dfe   0x00000122   Data   RO         4887    .constdata          kservice.o
+    0x08011f20   0x08011f20   0x00000009   Data   RO         5027    .constdata          mem.o
+    0x08011f29   0x08011f29   0x00000003   PAD
+    0x08011f2c   0x08011f2c   0x00000132   Data   RO         2190    .conststring        fal_partition.o
+    0x0801205e   0x0801205e   0x00000002   PAD
+    0x08012060   0x08012060   0x0000008e   Data   RO         2328    .conststring        fdb_kvdb.o
+    0x080120ee   0x080120ee   0x00000002   PAD
+    0x080120f0   0x080120f0   0x00000095   Data   RO         2576    .conststring        fdb_tsdb.o
+    0x08012185   0x08012185   0x00000003   PAD
+    0x08012188   0x08012188   0x000000c5   Data   RO         2799    .conststring        flash.o
+    0x0801224d   0x0801224d   0x00000003   PAD
+    0x08012250   0x08012250   0x00000004   Data   RO         4612    .rti_fn.0           components.o
+    0x08012254   0x08012254   0x00000004   Data   RO         4613    .rti_fn.0.end       components.o
+    0x08012258   0x08012258   0x00000004   Data   RO         4614    .rti_fn.1.end       components.o
+    0x0801225c   0x0801225c   0x00000004   Data   RO         4448    .rti_fn.6           shell.o
+    0x08012260   0x08012260   0x00000004   Data   RO         4615    .rti_fn.6.end       components.o
+    0x08012264   0x08012264   0x00000060   Data   RO         4302    FSymTab             cmd.o
+    0x080122c4   0x080122c4   0x00000018   Data   RO         4383    FSymTab             msh.o
+    0x080122dc   0x080122dc   0x00000008   Data   RO         5029    FSymTab             mem.o
+    0x080122e4   0x080122e4   0x00000180   Data   RO         2192    FalPartTable        fal_partition.o
+    0x08012464   0x08012464   0x00000020   Data   RO         5855    Region$$Table       anon$$obj.o
 
 
-    Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x08012488, Size: 0x0000bb60, Max: 0x00010000, ABSOLUTE, COMPRESSED[0x00000170])
+    Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x08012484, Size: 0x0000bb60, Max: 0x00010000, ABSOLUTE, COMPRESSED[0x00000170])
 
     Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
 

MDK-ARM/test/test_test.dep

@@ -809,7 +809,7 @@ I (..\fal\inc\fal_def.h)(0x6035CB23)
 I (..\flashdb\inc\fdb_cfg.h)(0x60594AF1)
 I (..\flashdb\inc\fdb_def.h)(0x5F7E2484)
 I (..\flashdb\inc\fdb_low_lvl.h)(0x5F7E2484)
-F (..\tmr\flash.c)(0x61A0742C)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc -I ../Drivers/CMSIS/Device/ST/STM32F1xx/Include -I ../Drivers/CMSIS/Include -I ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy -I ..\fal\inc -I ..\fal -I ..\flashdb\inc -I ..\tmr -I ..\cm_backtrace

-I.\RTE\RTOS

-I.\RTE\_test

-IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.0.1\CMSIS\Include

-IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.1.0\Device\Include

-IC:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\components\finsh

-IC:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\include

-D__UVISION_VERSION="524" -D_RTE_ -DSTM32F10X_HD -DSTM32F103xE -DUSE_HAL_DRIVER

-o test\flash.o --omf_browse test\flash.crf --depend test\flash.d)
+F (..\tmr\flash.c)(0x61B07E4A)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc -I ../Drivers/CMSIS/Device/ST/STM32F1xx/Include -I ../Drivers/CMSIS/Include -I ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy -I ..\fal\inc -I ..\fal -I ..\flashdb\inc -I ..\tmr -I ..\cm_backtrace

-I.\RTE\RTOS

-I.\RTE\_test

-IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.0.1\CMSIS\Include

-IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.1.0\Device\Include

-IC:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\components\finsh

-IC:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\include

-D__UVISION_VERSION="524" -D_RTE_ -DSTM32F10X_HD -DSTM32F103xE -DUSE_HAL_DRIVER

-o test\flash.o --omf_browse test\flash.crf --depend test\flash.d)
 I (..\flashdb\inc\flashdb.h)(0x5F7E2484)
 I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x588B8344)
 I (C:\Keil_v5\ARM\ARMCC\include\stddef.h)(0x588B8344)
@@ -1084,7 +1084,7 @@ I (..\tmr\buffer.h)(0x60179B36)
 I (..\tmr\ring_buffer.h)(0x58B99CB3)
 I (..\tmr\display.h)(0x618244FC)
 I (..\tmr\xBeeAppEscapingMode.h)(0x5FE2C633)
-F (..\tmr\weight.c)(0x61A0657C)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc -I ../Drivers/CMSIS/Device/ST/STM32F1xx/Include -I ../Drivers/CMSIS/Include -I ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy -I ..\fal\inc -I ..\fal -I ..\flashdb\inc -I ..\tmr -I ..\cm_backtrace

-I.\RTE\RTOS

-I.\RTE\_test

-IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.0.1\CMSIS\Include

-IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.1.0\Device\Include

-IC:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\components\finsh

-IC:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\include

-D__UVISION_VERSION="524" -D_RTE_ -DSTM32F10X_HD -DSTM32F103xE -DUSE_HAL_DRIVER

-o test\weight.o --omf_browse test\weight.crf --depend test\weight.d)
+F (..\tmr\weight.c)(0x61B07E1B)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O3 --apcs=interwork --split_sections -I ../Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc -I ../Drivers/CMSIS/Device/ST/STM32F1xx/Include -I ../Drivers/CMSIS/Include -I ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy -I ..\fal\inc -I ..\fal -I ..\flashdb\inc -I ..\tmr -I ..\cm_backtrace

-I.\RTE\RTOS

-I.\RTE\_test

-IC:\Keil_v5\ARM\PACK\ARM\CMSIS\5.0.1\CMSIS\Include

-IC:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.1.0\Device\Include

-IC:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\components\finsh

-IC:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\include

-D__UVISION_VERSION="524" -D_RTE_ -DSTM32F10X_HD -DSTM32F103xE -DUSE_HAL_DRIVER

-o test\weight.o --omf_browse test\weight.crf --depend test\weight.d)
 I (C:\Keil_v5\ARM\PACK\RealThread\RT-Thread\3.1.3\include\rtthread.h)(0x5DC11BE2)
 I (.\RTE\RTOS\rtconfig.h)(0x6188022B)
 I (.\RTE\_test\RTE_Components.h)(0x5FB24806)

linux安装方法/TMRWatch/webapps/ROOT/feedstorage/feedInventory.jsp

@@ -19,18 +19,51 @@
 		$("#list").jqGrid("setGridWidth",document.body.clientWidth - 5);
 	});
 	
+	
 	//初始化日期
 	function setNowDate(){
 		var myDate = new Date();
 		var year = myDate.getFullYear();
 		var month = myDate.getMonth()+1;
+		if(month<10){
+			month="0"+month;
+		}
 		var day = myDate.getDate();
+		if(day<10){
+			day="0"+day;
+		}
+		//var bdate = year + "-" + month + "-01";
 		var nowdate = year + "-" + month + "-" + day;
+		
+		var bdate = checkDate(nowdate);//当前日期减30天
+		
+		$("#beginDate").val(bdate);
 		$("#endDate").val(nowdate);
-		var lastmonth = myDate.getMonth();
-		var lastdate = year + "-" + lastmonth + "-" + day;		
-		$("#beginDate").val(lastdate);
 	}
+	
+	//当前日期减30天
+	function checkDate(date){
+		var bdate = date.split("-");
+		var cd = bdate[1]+"/"+bdate[2]+"/"+bdate[0];
+		var nd = new Date(cd);
+		nd = nd.valueOf();
+		nd = nd - 24 * 60 * 60 * 1000 * 30;   // * 167 是天数
+		nd = new Date(nd);
+		var y = nd.getFullYear();
+		var m = nd.getMonth() + 1;
+		if(m<10){
+			m="0"+m;
+		}
+		var d = nd.getDate();
+		if(d<10){
+			d="0"+d;
+		}
+		var newdate = y+"-"+m+"-"+d;
+		return newdate;		
+	}
+	
+	
+	
 	//查询数据
 	function queryDate(){
 		var beginDate = $("#beginDate").val();

linux安装方法/TMRWatch/webapps/ROOT/feedstorage/feedstoragein.jsp

@@ -31,6 +31,10 @@
 		var nowdate = year + "-" + month + "-" + day;
 		$("#endDate").val(nowdate);
 		var lastmonth = myDate.getMonth();
+		if(myDate.getMonth()==0){
+			lastmonth=12;
+			year = myDate.getFullYear()-1;
+		}	
 		var lastdate = year + "-" + lastmonth + "-" + day;		
 		$("#beginDate").val(lastdate);
 	}

linux安装方法/TMRWatch/webapps/ROOT/feedstorage/feedstoragereport.jsp

@@ -128,7 +128,7 @@
 			],
 			caption: "库存信息",	//标题
 			pager: "#page",	//#page分页控件绑定的位置对象
-			rowNum: 15,	//每页显示条数
+			rowNum: 500,	//每页显示条数
 		   	rowList: [15,30,50],	//分页下拉选项内容
 			viewrecords: true,		//是否显示总条数
 		   	emptyrecords: "无数据",	//服务器返回空列表时显示的内容

linux安装方法/TMRWatch/webapps/ROOT/main.jsp

@@ -1,4 +1,4 @@
-<%@ page contentType="text/html; charset=utf-8" session="false" %>
+<%@ page contentType="text/html; charset=utf-8" session="false" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -88,15 +88,17 @@
         <c:if test="${!empty RECIPE_PLAN_MANAGE}">
         <div>
         	<p><img src="${contextPath}/images/ico1.gif" />配方计划</p>
-            <ul style="display:block;">
+            <ul>
 				<c:if test="${!empty RECIPE_TEMPLATE}"><li><a target="contfrm" href="${contextPath}/admin/recipeplan/template.html">配方模板</a></li></c:if>
 				<c:if test="${!empty LANSHE_RECIPE}"><li><a target="contfrm" href="${contextPath}/admin/recipeplan/feedp.html?message=">栏舍配方</a></li></c:if>
+				<!--
+				<c:if test="${!empty FEEDP_AMOUNT}"><li><a target="contfrm" href="${contextPath}/admin/recipeplan/feedpamount.html">栏舍加减量</a></li></c:if>
+				-->
 				<c:if test="${!empty FALIAO_PLAN}"><li><a target="contfrm" href="${contextPath}/admin/recipeplan/lpplan.html?cclass=">发料计划</a></li></c:if>
-				<c:if test="${!empty DATE_EXE_PLAN}"><li><a target="contfrm" href="${contextPath}/admin/recipeplan/dateplan.html">日执行计划</a></li></c:if>
 				<c:if test="${!empty FALIAO_PLAN_DATE}"><li><a target="contfrm" href="${contextPath}/admin/recipeplan/lpplandate.html?cclass=">发料时间</a></li></c:if>
-				<!-- <c:if test="${!empty PRODUCE_LPPLAN}"><li><a target="contfrm" href="${contextPath}/admin/recipeplan/producelpplan.html?cclass=">生产计划</a></li></c:if> -->
+				<c:if test="${!empty PRODUCE_LPPLAN}"><li><a target="contfrm" href="${contextPath}/admin/recipeplan/producelpplan.html?cclass=">生产计划</a></li></c:if>
 				<c:if test="${!empty PLUS_PLAN}"><li><a target="contfrm" href="${contextPath}/admin/recipeplan/pluslpplan.html">补料计划</a></li></c:if>
-				<c:if test="${!empty FEEDP_AMOUNT}"><li><a target="contfrm" href="${contextPath}/admin/recipeplan/feedpamount.html">栏舍加减量</a></li></c:if>
+				<c:if test="${!empty DATE_EXE_PLAN}"><li><a target="contfrm" href="${contextPath}/admin/recipeplan/dateplan.html">日执行计划</a></li></c:if>
             </ul>
         </div>
         </c:if>
@@ -108,29 +110,33 @@
 				<c:if test="${!empty LANSHE_PRODUCE_YIELD}"><li><a target="contfrm" href="${contextPath}/admin/produce/milk.html">栏舍产奶量</a></li></c:if>
 				<c:if test="${!empty LANSHE_SURPLUS_YIELD}"><li><a target="contfrm" href="${contextPath}/admin/produce/surplus.html">栏舍剩料量</a></li></c:if>
 				<c:if test="${!empty LANSHE_PLUS}"><li><a target="contfrm" href="${contextPath}/admin/produce/plussurplus.html">栏舍补料量</a></li></c:if>
+				<!--
 				<c:if test="${!empty CATTLE_STORAGE}"><li><a target="contfrm" href="${contextPath}/admin/produce/cattlestorage.html">牲畜出库量</a></li></c:if>
+				-->
 				<c:if test="${!empty TEMPLET_DRY}"><li><a target="contfrm" href="${contextPath}/admin/produce/templetdry.html">配方干物质</a></li></c:if>
-				<!-- <c:if test="${!empty FEED_STORAGE}"><li><a target="contfrm" href="${contextPath}/admin/produce/feedstorage.html">库存量</a></li></c:if> -->
-				<!-- <c:if test="${!empty FEED_STORAGE_CHART}"><li><a target="contfrm" href="${contextPath}/admin/produce/feedstoragechart.html">库存统计</a></li></c:if> -->
+				<!--
+				<c:if test="${!empty FEED_STORAGE}"><li><a target="contfrm" href="${contextPath}/admin/produce/feedstorage.html">库存量</a></li></c:if>
+				<c:if test="${!empty FEED_STORAGE_CHART}"><li><a target="contfrm" href="${contextPath}/admin/produce/feedstoragechart.html">库存统计</a></li></c:if>
+				-->
             </ul>
         </div>
         </c:if>
         
-        <c:if test="${!empty FEED_STORAGE_MANAGE}">
+         <c:if test="${!empty FEED_STORAGE_MANAGE}">
         <div>
         	<p><img src="${contextPath}/images/ico1.gif" />库存管理</p>
-            <ul>
+            <ul style="display:block;">
 				<c:if test="${!empty FEED_STORAGE_IN}"><li><a target="contfrm" href="${contextPath}/admin/feedstorage/feedstoragein.html">入库</a></li></c:if>
 				<c:if test="${!empty FEED_STORAGE_SYSTEM_OUT}"><li><a target="contfrm" href="${contextPath}/admin/feedstorage/feedstoragesystemout.html">系统用量</a></li></c:if>
 				<c:if test="${!empty FEED_STORAGE_EMPLOYEE_OUT}"><li><a target="contfrm" href="${contextPath}/admin/feedstorage/feedstorageemployeeout.html">人工用量</a></li></c:if>
 				<c:if test="${!empty FEED_STORAGE_INVENTORY}"><li><a target="contfrm" href="${contextPath}/admin/feedstorage/feedInventory.html">盘点单</a></li></c:if>
 				<c:if test="${!empty FEED_STORAGE_WARN}"><li><a target="contfrm" href="${contextPath}/admin/feedstorage/feedstoragewarn.html">库存预警</a></li></c:if>
-				<c:if test="${!empty FEED_STORAGE_REPORT}"><li><a target="contfrm" href="${contextPath}/admin/feedstorage/feedstoragereport.html">库存统计</a></li></c:if>
+				<c:if test="${!empty FEED_STORAGE_REPORT}"><li><a target="contfrm" href="${contextPath}/admin/feedstorage/feedstoragereport.html">库存明细</a></li></c:if>
 				<c:if test="${!empty FEED_STORAGE_INIT_INVENTORY}"><li><a target="contfrm" href="${contextPath}/admin/feedstorage/addInitFeedInventory.html">初始化库存</a></li></c:if>
             </ul>
         </div>
         </c:if>
-        
+        	 
         <c:if test="${!empty BASIC_DATA_MANAGE}">
         <div>
         	<p><img src="${contextPath}/images/ico1.gif" />基础数据</p>
@@ -141,10 +147,10 @@
 				<c:if test="${!empty SCOTIA_GROUP_BAR}"><li><a target="contfrm" href="${contextPath}/admin/basicdata/bar.html">舍组栏</a></li></c:if>
 				<c:if test="${!empty FEED_CLASSIFY}"><li><a target="contfrm" href="${contextPath}/admin/basicdata/feedclass.html">饲料分类</a></li></c:if>
 				<c:if test="${!empty FEED_TABLE}"><li><a target="contfrm" href="${contextPath}/admin/basicdata/feed.html">饲料表</a></li></c:if>
-				<c:if test="${!empty FEED_PACKAGE}"><li><a target="contfrm" href="${contextPath}/admin/recipeplan/feedpackage.html">自配料</a></li></c:if>
 				<c:if test="${!empty DEFAULT_CONFIG}"><li><a target="contfrm" href="${contextPath}/admin/basicdata/defaultconfig.html">默认参数配置</a></li></c:if>
+				<!--
 				<c:if test="${!empty BACKUP_DATA}"><li><a target="contfrm" href="${contextPath}/admin/basicdata/backupdate.html">上传登记</a></li></c:if>
-				<c:if test="${!empty SILO_MANAGE}"><li><a target="contfrm" href="${contextPath}/admin/silomanage/silo.html">精料仓管理</a></li></c:if>
+                                 -->
             </ul>
         </div>
         </c:if>

linux安装方法/frpc/frpc.ini

@@ -4,23 +4,23 @@ server_port = 7000
 privilege_token = TMRWatch
 vhost_https_port = 443
 
-[gmsx3.stcp_visitor]
+[ssh.stcp_visitor]
 type = stcp
 # stcp 的访问者
 role = visitor
 # 要访问的 stcp 代理的名字
-server_name = gmsx3.stcp
+server_name = kpttest.stcp
 sk = 123456
 # 绑定本地端口用于访问 ssh 服务
 bind_addr = 127.0.0.1
 bind_port = 8022
 
-[gmsx3.stcp1_visitor]
+[mysql.stcp1_visitor]
 type = stcp
 # stcp 的访问者
 role = visitor
 # 要访问的 stcp 代理的名字
-server_name = gmsx3.stcp1
+server_name = kpttest.stcp1
 sk = 123456
 # 绑定本地端口用于访问 ssh 服务
 bind_addr = 127.0.0.1

tmr/flash.c

@@ -19,7 +19,7 @@ uint8_t XbeeConst_UseAPI = 0x01;
 uint8_t WeightConst_TQ = 0x07;//0x05;
 uint8_t WeightConst_BLE = 0;
 uint8_t WeightConst_ChanCheShu = 0x02;
-uint8_t WeightConst_SBType = 0x03;
+uint8_t WeightConst_SBType = 0x04;
 
 
 int16_t WeightConst_WeightBegin = 0;    //°´¼ü¿ªÊ¼ÖØÁ¿

tmr/weight.c

@@ -75,7 +75,7 @@ void weight_usart_Init(UART_HandleTypeDef* uartHandle)
 	{
 			if (WeightConst_TQ==1)
 			{
-				 uartHandle->Init.BaudRate = 115200;
+				 uartHandle->Init.BaudRate = 9600;
 			}
 			else if (WeightConst_TQ==7)
 			{