diff --git a/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Boot/bin/openblt_stm32f303.elf b/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Boot/bin/openblt_stm32f303.elf index 955cc611..562faa6e 100644 Binary files a/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Boot/bin/openblt_stm32f303.elf and b/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Boot/bin/openblt_stm32f303.elf differ diff --git a/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Boot/bin/openblt_stm32f303.map b/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Boot/bin/openblt_stm32f303.map index 649d5043..416b6e7b 100644 --- a/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Boot/bin/openblt_stm32f303.map +++ b/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Boot/bin/openblt_stm32f303.map @@ -6,23 +6,23 @@ EXEC_P, HAS_SYMS, D_PAGED start address 0x08000000 Program Header: -0x70000001 off 0x00011ac4 vaddr 0x08001ac4 paddr 0x08001ac4 align 2**2 +0x70000001 off 0x00011adc vaddr 0x08001adc paddr 0x08001adc align 2**2 filesz 0x00000008 memsz 0x00000008 flags r-- LOAD off 0x00010000 vaddr 0x08000000 paddr 0x08000000 align 2**16 - filesz 0x00001acc memsz 0x00001acc flags r-x - LOAD off 0x00020000 vaddr 0x20000000 paddr 0x08001acc align 2**16 + filesz 0x00001ae4 memsz 0x00001ae4 flags r-x + LOAD off 0x00020000 vaddr 0x20000000 paddr 0x08001ae4 align 2**16 filesz 0x0000009c memsz 0x000005ac flags rw- private flags = 5000400: [Version5 EABI] [hard-float ABI] Sections: Idx Name Size VMA LMA File off Algn - 0 .text 00001ac4 08000000 08000000 00010000 2**2 + 0 .text 00001adc 08000000 08000000 00010000 2**2 CONTENTS, ALLOC, LOAD, READONLY, CODE - 1 .ARM.exidx 00000008 08001ac4 08001ac4 00011ac4 2**2 + 1 .ARM.exidx 00000008 08001adc 08001adc 00011adc 2**2 CONTENTS, ALLOC, LOAD, READONLY, DATA - 2 .data 0000009c 20000000 08001acc 00020000 2**2 + 2 .data 0000009c 20000000 08001ae4 00020000 2**2 CONTENTS, ALLOC, LOAD, DATA - 3 .bss 00000510 2000009c 08001b68 0002009c 2**2 + 3 .bss 00000510 2000009c 08001b80 0002009c 2**2 ALLOC 4 .stack_dummy 00000100 200005b0 200005b0 000200a0 2**3 CONTENTS, READONLY @@ -30,27 +30,27 @@ Idx Name Size VMA LMA File off Algn CONTENTS, READONLY 6 .comment 0000006e 00000000 00000000 000201d0 2**0 CONTENTS, READONLY - 7 .debug_line 00005131 00000000 00000000 0002023e 2**0 + 7 .debug_line 00005136 00000000 00000000 0002023e 2**0 CONTENTS, READONLY, DEBUGGING - 8 .debug_info 00006609 00000000 00000000 0002536f 2**0 + 8 .debug_info 00006617 00000000 00000000 00025374 2**0 CONTENTS, READONLY, DEBUGGING - 9 .debug_abbrev 00001a7d 00000000 00000000 0002b978 2**0 + 9 .debug_abbrev 00001a8c 00000000 00000000 0002b98b 2**0 CONTENTS, READONLY, DEBUGGING - 10 .debug_aranges 00000900 00000000 00000000 0002d3f8 2**3 + 10 .debug_aranges 00000900 00000000 00000000 0002d418 2**3 CONTENTS, READONLY, DEBUGGING - 11 .debug_ranges 00000780 00000000 00000000 0002dcf8 2**0 + 11 .debug_ranges 00000780 00000000 00000000 0002dd18 2**0 CONTENTS, READONLY, DEBUGGING - 12 .debug_macro 00015338 00000000 00000000 0002e478 2**0 + 12 .debug_macro 0001533e 00000000 00000000 0002e498 2**0 CONTENTS, READONLY, DEBUGGING - 13 .debug_str 000815c4 00000000 00000000 000437b0 2**0 + 13 .debug_str 000815f3 00000000 00000000 000437d6 2**0 CONTENTS, READONLY, DEBUGGING - 14 .debug_frame 000012fc 00000000 00000000 000c4d74 2**2 + 14 .debug_frame 000012fc 00000000 00000000 000c4dcc 2**2 CONTENTS, READONLY, DEBUGGING - 15 .debug_loc 00002ecc 00000000 00000000 000c6070 2**0 + 15 .debug_loc 00002ecf 00000000 00000000 000c60c8 2**0 CONTENTS, READONLY, DEBUGGING SYMBOL TABLE: 08000000 l d .text 00000000 .text -08001ac4 l d .ARM.exidx 00000000 .ARM.exidx +08001adc l d .ARM.exidx 00000000 .ARM.exidx 20000000 l d .data 00000000 .data 2000009c l d .bss 00000000 .bss 200005b0 l d .stack_dummy 00000000 .stack_dummy @@ -72,7 +72,7 @@ SYMBOL TABLE: 08000294 l .text 00000000 .fill_zero_bss 08000290 l .text 00000000 .loop_zero_bss 00000000 l df *ABS* 00000000 crtstuff.c -08001ac0 l O .text 00000000 __EH_FRAME_BEGIN__ +08001ad8 l O .text 00000000 __EH_FRAME_BEGIN__ 08000188 l F .text 00000000 __do_global_dtors_aux 2000009c l .bss 00000000 completed.8605 20000098 l O .data 00000000 __do_global_dtors_aux_fini_array_entry @@ -116,7 +116,7 @@ SYMBOL TABLE: 08000ed4 l F .text 00000028 XcpCmdProgramClear 08000efc l F .text 00000018 XcpCmdProgramReset 08000f14 l F .text 0000000a XcpTransmitPacket -08001a40 l O .text 00000008 xcpStationId +08001a58 l O .text 00000008 xcpStationId 200000c0 l O .bss 0000004c xcpInfo 00000000 l df *ABS* 00000000 com.c 2000010c l O .bss 00000040 xcpCtoReqPacket.4277 @@ -145,7 +145,7 @@ SYMBOL TABLE: 200003a4 l O .bss 00000204 blockInfo 00000000 l df *ABS* 00000000 can.c 080016d8 l F .text 00000058 CanGetSpeedConfig -08001a98 l O .text 00000024 canTiming +08001ab0 l O .text 00000024 canTiming 00000000 l df *ABS* 00000000 timer.c 200005a8 l O .bss 00000004 millisecond_counter 00000000 l df *ABS* 00000000 cpu_comp.c @@ -157,7 +157,7 @@ SYMBOL TABLE: 00000000 l df *ABS* 00000000 impure.c 20000034 l O .data 00000060 impure_data 00000000 l df *ABS* 00000000 crtstuff.c -08001ac0 l O .text 00000000 __FRAME_END__ +08001ad8 l O .text 00000000 __FRAME_END__ 00000000 l df *ABS* 00000000 20000098 l .data 00000000 __init_array_end 20000094 l .data 00000000 __preinit_array_end @@ -170,10 +170,10 @@ SYMBOL TABLE: 08000870 g F .text 00000020 FLASH_Unlock 080011ac g F .text 00000008 AssertFailure 080002aa w F .text 00000002 DebugMon_Handler -080018cc g F .text 00000074 CanReceivePacket +080018cc g F .text 0000008c CanReceivePacket 08000b48 g F .text 0000002e GPIO_PinAFConfig 00000000 g *ABS* 00000000 __HEAP_SIZE -08001970 g F .text 0000001c TimerUpdate +08001988 g F .text 0000001c TimerUpdate 08000f4c g F .text 00000010 XcpPacketTransmitted 20000000 g .data 00000000 __data_start__ 080002e6 w F .text 00000002 TIM1_CC_IRQHandler @@ -185,16 +185,16 @@ SYMBOL TABLE: 08001114 g F .text 0000001c BootInit 080002ac w F .text 00000002 PendSV_Handler 0800029e w F .text 00000002 NMI_Handler -08001acc g .ARM.exidx 00000000 __exidx_end +08001ae4 g .ARM.exidx 00000000 __exidx_end 080002c2 w F .text 00000002 EXTI3_IRQHandler 0800118c g F .text 00000020 BackDoorInit -08001acc g .ARM.exidx 00000000 __etext +08001ae4 g .ARM.exidx 00000000 __etext 08000a90 g F .text 0000000e USART_GetFlagStatus 0800114c g F .text 00000008 CopService -0800199c g F .text 00000004 CpuIrqDisable +080019b4 g F .text 00000004 CpuIrqDisable 08000900 g F .text 0000003c FLASH_ErasePage 080016d0 g F .text 00000008 FlashGetUserProgBaseAddress -08001940 g F .text 0000000c TimerReset +08001958 g F .text 0000000c TimerReset 080002bc w F .text 00000002 EXTI0_IRQHandler 08000304 w F .text 00000002 FPU_IRQHandler 080002c0 w F .text 00000002 EXTI2_TS_IRQHandler @@ -212,14 +212,14 @@ SYMBOL TABLE: 08000a68 g F .text 00000016 USART_Cmd 080002fc w F .text 00000002 TIM6_DAC_IRQHandler 08000854 g F .text 0000001c RCC_APB1PeriphClockCmd -08001ac4 g .text 00000000 __exidx_start -08001abc g O .text 00000004 _global_impure_ptr -080019cc g F .text 0000004c __libc_init_array +08001adc g .text 00000000 __exidx_start +08001ad4 g O .text 00000004 _global_impure_ptr +080019e4 g F .text 0000004c __libc_init_array 08000838 g F .text 0000001c RCC_AHBPeriphClockCmd 080002cc w F .text 00000002 DMA1_Channel4_IRQHandler 080001e4 g F .text 00000000 _mainCRTStartup 08000f3c g F .text 00000010 XcpIsConnected -08001a28 g F .text 00000000 _init +08001a40 g F .text 00000000 _init 0800132c g F .text 00000008 NvmInit 0800150c g F .text 00000018 FlashInit 08000890 g F .text 00000010 FLASH_Lock @@ -269,7 +269,7 @@ SYMBOL TABLE: 08000f20 g F .text 0000001c XcpInit 00000000 w *UND* 00000000 __sf_fake_stdin 08001574 g F .text 0000007c FlashErase -08001a18 g F .text 00000010 memset +08001a30 g F .text 00000010 memset 080004c8 g F .text 00000010 LedBlinkExit 080002a2 w F .text 00000002 MemManage_Handler 08000000 g .text 00000188 __isr_vector @@ -285,13 +285,13 @@ SYMBOL TABLE: 080002c4 w F .text 00000002 EXTI4_IRQHandler 080002d8 w F .text 00000002 USB_LP_CAN1_RX0_IRQHandler 08000bdc g F .text 00000070 SystemInit -08001a34 g F .text 00000000 _fini +08001a4c g F .text 00000000 _fini 080002e4 w F .text 00000002 TIM1_TRG_COM_TIM17_IRQHandler 080002d6 w F .text 00000002 USB_HP_CAN1_TX_IRQHandler 080010e8 g F .text 00000024 ComGetActiveInterfaceMaxTxLen 00000000 w *UND* 00000000 atexit 0800128c g F .text 000000a0 UartReceivePacket -080019a0 g F .text 00000004 CpuIrqEnable +080019b8 g F .text 00000004 CpuIrqEnable 080002ca w F .text 00000002 DMA1_Channel3_IRQHandler 20003000 g .bss 00000000 __StackTop 080002b0 w F .text 00000002 WWDG_IRQHandler @@ -307,7 +307,7 @@ SYMBOL TABLE: 08000302 w F .text 00000002 COMP4_6_IRQHandler 20002f00 g *ABS* 00000100 __StackLimit 080002f4 w F .text 00000002 USART2_IRQHandler -080019a4 g F .text 00000028 exit +080019bc g F .text 00000028 exit 0800110c g F .text 00000008 ComIsConnected 080002c8 w F .text 00000002 DMA1_Channel2_IRQHandler 00000000 w *UND* 00000000 __sf_fake_stdout @@ -320,10 +320,10 @@ SYMBOL TABLE: 08000454 g F .text 0000000a CopInitHook 08001154 g F .text 00000038 BackDoorCheck 080002ee w F .text 00000002 I2C1_ER_IRQHandler -0800198c g F .text 00000010 TimerGet +080019a4 g F .text 00000010 TimerGet 00000000 w *UND* 00000000 _Jv_RegisterClasses 08000b30 g F .text 0000000e GPIO_ReadInputDataBit -0800194c g F .text 00000024 TimerInit +08001964 g F .text 00000024 TimerInit 00000000 w *UND* 00000000 __register_frame_info 08000460 g F .text 00000008 CopServiceHook 080002e0 w F .text 00000002 TIM1_BRK_TIM15_IRQHandler diff --git a/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Boot/bin/openblt_stm32f303.srec b/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Boot/bin/openblt_stm32f303.srec index e232bf49..ff20313b 100644 --- a/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Boot/bin/openblt_stm32f303.srec +++ b/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Boot/bin/openblt_stm32f303.srec @@ -25,20 +25,20 @@ S315080001600000000000000000000000000000000081 S315080001700000000000000000000000000000000071 S31508000180000000000503000810B5054C237833B9B4 S31508000190044B13B10448AFF300800123237010BD4C -S315080001A09C00002000000000C01A0008084B10B58B +S315080001A09C00002000000000D81A0008084B10B573 S315080001B01BB108490848AFF300800848036803B92B S315080001C010BD074B002BFBD0BDE81040184700BFF9 -S315080001D000000000A0000020C01A00089C000020B3 +S315080001D000000000A0000020D81A00089C0000209B S315080001E000000000154B002B08BF134B9D46A3F5D6 S315080001F0803A00218B460F461348144A121A01F01A -S315080002000BFC0F4B002B00D098470E4B002B00D051 +S3150800020017FC0F4B002B00D098470E4B002B00D045 S3150800021098470020002104000D000D48002802D050 -S315080002200C48AFF3008001F0D1FB2000290000F054 -S31508000230FBF801F0B7FB00BF000008000030002003 +S315080002200C48AFF3008001F0DDFB2000290000F048 +S31508000230FBF801F0C3FB00BF0000080000300020F7 S3150800024000000000000000009C000020AC05002013 S3150800025000000000000000000649074A074B9A42C2 S31508000260BEBF51F8040B42F8040BF8E70448804770 -S3150800027004480047CC1A0008000000209C00002013 +S3150800027004480047E41A0008000000209C000020FB S31508000280DD0B0008E50100081F49204A002301E0AC S3150800029041F8043B9142FBD300F0C6F8FEE7FEE7BF S315080002A0FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE718 @@ -70,10 +70,10 @@ S3150800043071FE00F07DFEFCE708B500F045F84FF4C4 S3150800044000714FF0904000F073FB034600B10123A2 S31508000450184608BD08B5642000F006F808BD00BFB8 S3150800046008B500F007F808BD014B1880704700BFB3 -S31508000470BC00002008B501F089FA0F4B1B689842AA +S31508000470BC00002008B501F095FA0F4B1B6898429E S3150800048018D30E4B1B783BB901220C4B1A70082166 S315080004900B4800F055FB06E00022084B1A700821AD -S315080004A0074800F04FFB01F071FA064B1B88184409 +S315080004A0074800F04FFB01F07DFA064B1B881844FD S315080004B0014B186008BD00BFB8000020BE00002030 S315080004C000040048BC00002008B50821014800F0D7 S315080004D039FB08BD00040048FEE700BFF0B5A04B95 @@ -206,7 +206,7 @@ S31508000CB01A71597859719A71DA711A720622A3F85B S31508000CC044207047C000002008B50020FFF7D4FF75 S31508000CD008BD00BF084BFF22DA70084A9A64002252 S31508000CE01A715A719A710721D9711A725A729A72BF -S31508000CF00822A3F844207047C0000020401A0008C4 +S31508000CF00822A3F844207047C0000020581A0008AC S31508000D00044BFF22DA7042689A640122A3F8442051 S31508000D10704700BFC000002010B5084CFF23E370E1 S31508000D20E21D4168A06CFFF791FF207100236371F3 @@ -273,14 +273,14 @@ S315080010E00820704730000020074B1B78022B05D0DC S315080010F0032B05D0012B05D04020704700207047F0 S3150800110000207047082070473000002008B5FFF718 S3150800111015FF08BD08B500F027F900F013F800F030 -S3150800112015FC00F003F9FFF789FF00F02FF808BD5A -S3150800113008B500F00BF800F01BFCFFF78FFF00F076 +S3150800112021FC00F003F9FFF789FF00F02FF808BD4E +S3150800113008B500F00BF800F027FCFFF78FFF00F06A S3150800114009F808BD08B5FFF785F908BD08B5FFF722 S3150800115087F908BD08B5FFF7D9FF012810D0094B54 -S315080011601B78012B0CD100F011FC074B1B6803F50B +S315080011601B78012B0CD100F01DFC074B1B6803F5FF S31508001170FA73984204D30022024B1A7000F0F8F86A S3150800118008BD00BF4C0100205001002008B501220F -S31508001190044B1A7000F0FAFB034B1860FFF7DAFFEE +S31508001190044B1A7000F006FC034B1860FFF7DAFFE1 S315080011A008BD00BF4C0100205001002008B5FFF71C S315080011B0CDFFFCE710B5044680210948FFF768FC17 S315080011C058B121460648FFF75BFC80210448FFF723 @@ -295,24 +295,24 @@ S315080012400D46402903D975210F48FFF7AFFF2846F9 S31508001250FFF7B0FF012803D079210B48FFF7A6FF57 S3150800126000240CE0FFF772FF305DFFF7A3FF0128AB S3150800127003D082210448FFF799FF0134A4B2ABB228 -S315080012809C42EFD370BD00BF481A000838B5224B00 +S315080012809C42EFD370BD00BF601A000838B5224BE8 S315080012901C789CB92148FFF7A5FF01283AD11F4BB6 -S315080012A01B78002B31D000F071FB1D4B1860002213 +S315080012A01B78002B31D000F07DFB1D4B1860002207 S315080012B01C4B1A700122184B1A702BE00546194B65 S315080012C01B78013315481844FFF78CFF044601289C S315080012D010D1144B1A780132D2B21A700F4B1B7800 S315080012E09A4214D11049284600F05EF800220A4BAB -S315080012F01A700FE000F04AFB094B1B6864339842EA +S315080012F01A700FE000F056FB094B1B6864339842DE S3150800130007D90024044B1C7004E01C4602E00024A4 S3150800131000E00024204638BD9D0100205C01002025 S3150800132054010020580100205D01002008B500F096 S31508001330EDF808BD08B500F0F5F808BD08B500F0E9 S3150800134019F908BD08B500F07BF908BD08B500F025 S31508001350BFF908BD08B500F04BF9034610B100F017 -S3150800136097F90346184608BD08B500F017FB08BDEF +S3150800136097F90346184608BD08B500F023FB08BDE3 S3150800137010B5FFF7E7FFA0B1FFF75EF888B1FFF7F2 -S3150800138089FE00F0DDFAFFF7E1FF20F0604020F06B -S315080013907F00044B1860FFF7D9FF446800F000FB94 +S3150800138089FE00F0E9FAFFF7E1FF20F0604020F05F +S315080013907F00044B1860FFF7D9FF446800F00CFB88 S315080013A0A04710BD08ED00E070B508E0461C4D1CCE S315080013B00B780370FFF7CAFE224630462946531EAD S315080013C09CB2002AF2D170BD08B5C1F3080353B91F @@ -369,9 +369,9 @@ S315080016E015F814E005EB44056F780EEB070606FBC4 S315080016F000064FF4FA4595FBF6F506FB05F5B5F534 S31508001700FA4F0DD195FBF6F6B6B20E80013EB6B28B S31508001710B6F5806F04D282F800E01F700120F0BD94 -S315080017200134E4B2112CDAD90020F0BD981A000869 +S315080017200134E4B2112CDAD90020F0BDB01A000851 S3150800173000B583B001AB0DF105020DF106014FF4BA -S31508001740FA70FFF7C9FF012803D0E2213848FFF7EE +S31508001740FA70FFF7C9FF012803D0E4213848FFF7EC S315080017502DFD384B00225A611A6842F400421A607D S3150800176001E0FFF7F3FC334B1B6813F4004FF8D185 S31508001770304B1A6822F002021A601A6842F0010217 @@ -386,8 +386,8 @@ S315080017F0C3F84022C3F84422D3F8042222F0010297 S31508001800C3F80422D3F8142222F00102C3F81422E2 S31508001810D3F81C2242F00102C3F81C22D3F8002296 S3150800182022F00102C3F8002203B05DF804FB00BFF2 -S31508001830701A00080064004038B504460D46214B6E -S315080018409B6813F0806F04D140F221111E48FFF700 +S31508001830881A00080064004038B504460D46214B56 +S315080018409B6813F0806F04D140F225111E48FFF7FC S31508001850ADFC1C4BD3F8802102F00102C3F88021AD S31508001860D3F8802142F07C4242F40012C3F880216A S31508001870C3F88451E178A278120442EA01626178D9 @@ -395,48 +395,49 @@ S3150800188042EA012221780A43C3F88821E179A2793C S31508001890120442EA0162617942EA012221790A4385 S315080018A0C3F88C21D3F8802142F00102C3F88021C5 S315080018B001E0FFF74BFC034B9B6813F0806FF8D0F1 -S315080018C038BD00BF00640040701A00081B4BDB6877 -S315080018D013F0030F2FD0194BD3F8B02140F26763EA -S315080018E0B3EB525F20D1154BD3F8B8210270D3F869 -S315080018F0B821120A4270D3F8B821120C8270D3F8B4 -S31508001900B821120EC270D3F8BC210271D3F8BC21DB -S31508001910120A4271D3F8BC21120C8271D3F8BC3179 -S315080019201B0EC371012000E00020044AD36843F06F -S315080019302003D36070470020704700BF0064004052 -S315080019400022014B1A60704710E000E008B5FFF767 -S31508001950F7FF054B4FF6FF125A6000229A600521E1 -S315080019601960024B1A6008BD10E000E0A8050020C7 -S31508001970044B1B6813F4803F03D0034A13680133F2 -S315080019801360704710E000E0A805002008B5FFF7CF -S31508001990EFFF014B186808BDA805002072B670470E -S315080019A062B6704708B5074B044613B10021AFF37A -S315080019B00080054B1868836A03B198472046FEF7EE -S315080019C08BFD00BF00000000BC1A000870B50E4B66 -S315080019D00E4CE41AA41000251E46A54204D056F85B -S315080019E0253098470135F8E700F01EF8084C094BF2 -S315080019F0E41AA41000251E46A54204D056F8253040 -S31508001A0098470135F8E770BD94000020940000203F -S31508001A10980000209400002002440346934202D016 -S31508001A2003F8011BFAE77047F8B500BFF8BC08BC15 -S31508001A309E467047F8B500BFF8BC08BC9E4670477E -S31508001A404F70656E424C54002E2E2F2E2E2F2E2EA2 -S31508001A502F536F757263652F41524D434D345F5353 -S31508001A60544D333246332F756172742E630000006D -S31508001A702E2E2F2E2E2F2E2E2F536F757263652F17 -S31508001A8041524D434D345F53544D333246332F63E1 -S31508001A90616E2E63000000000502060206030703B6 -S31508001AA00803090309040A040B040C040C050D05B4 -S31508001AB00E050F050F061006100710083400002043 -S30908001AC00000000014 -S30D08001AC420E7FF7F0100000086 -S31508001ACC010002000400060008000A000C001000C1 -S31508001ADC200040008000000100000000000000000B -S31508001AEC00000000010203040102030406070809AA -S31508001AFC04000000000000000000000000000000C8 -S31508001B0C00000000000000000000000000000000BB -S31508001B1C00000000000000000000000000000000AB -S31508001B2C000000000000000000000000000000009B -S31508001B3C000000000000000000000000000000008B -S31508001B4C000000000000000000000000000000007B -S31108001B5C00000000AD0100088901000827 +S315080018C038BD00BF00640040881A0008214BDB6859 +S315080018D013F0030F3CD01F4BD3F8B03113F0040FAD +S315080018E004D11C4BD3F8B0315B0D05E0194BD3F886 +S315080018F0B031DB0843F0004340F26762934220D1DF +S31508001900144BD3F8B8210270D3F8B821120A4270E2 +S31508001910D3F8B821120C8270D3F8B821120EC2700F +S31508001920D3F8BC210271D3F8BC21120A4271D3F84C +S31508001930BC21120C8271D3F8BC311B0EC371012075 +S3150800194000E00020034AD36843F02003D3607047C1 +S3150800195000207047006400400022014B1A6070475F +S3150800196010E000E008B5FFF7F7FF054B4FF6FF124A +S315080019705A6000229A6005211960024B1A6008BD58 +S3150800198010E000E0A8050020044B1B6813F4803F14 +S3150800199003D0034A136801331360704710E000E070 +S315080019A0A805002008B5FFF7EFFF014B186808BD2A +S315080019B0A805002072B6704762B6704708B5074B8F +S315080019C0044613B10021AFF30080054B1868836AFB +S315080019D003B198472046FEF77FFD00BF00000000D0 +S315080019E0D41A000870B50E4B0E4CE41AA410002544 +S315080019F01E46A54204D056F8253098470135F8E723 +S31508001A0000F01EF8084C094BE41AA41000251E46DF +S31508001A10A54204D056F8253098470135F8E770BD39 +S31508001A2094000020940000209800002094000020D4 +S31508001A3002440346934202D003F8011BFAE77047B3 +S31508001A40F8B500BFF8BC08BC9E467047F8B500BF9D +S31508001A50F8BC08BC9E4670474F70656E424C5400F1 +S31508001A602E2E2F2E2E2F2E2E2F536F757263652F27 +S31508001A7041524D434D345F53544D333246332F75DF +S31508001A806172742E630000002E2E2F2E2E2F2E2EFE +S31508001A902F536F757263652F41524D434D345F5313 +S31508001AA0544D333246332F63616E2E6300000000B7 +S31508001AB005020602060307030803090309040A04C4 +S31508001AC00B040C040C050D050E050F050F06100674 +S31108001AD010071008340000200000000079 +S30D08001ADC08E7FF7F0100000086 +S31508001AE4010002000400060008000A000C001000A9 +S31508001AF420004000800000010000000000000000F3 +S31508001B040000000001020304010203040607080991 +S31508001B1404000000000000000000000000000000AF +S31508001B2400000000000000000000000000000000A3 +S31508001B340000000000000000000000000000000093 +S31508001B440000000000000000000000000000000083 +S31508001B540000000000000000000000000000000073 +S31508001B640000000000000000000000000000000063 +S31108001B7400000000AD010008890100080F S70508000000F2 diff --git a/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Boot/blt_conf.h b/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Boot/blt_conf.h index bdbe5163..d5aa8f5b 100644 --- a/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Boot/blt_conf.h +++ b/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Boot/blt_conf.h @@ -61,7 +61,8 @@ * in bits/second. Two CAN messages are reserved for communication with the host. The * message identifier for sending data from the target to the host is configured with * BOOT_COM_CAN_TXMSG_ID. The one for receiving data from the host is configured with - * BOOT_COM_CAN_RXMSG_ID. The maximum amount of data bytes in a message for data + * BOOT_COM_CAN_RXMSG_ID. Note that an extended 29-bit CAN identifier is configured by + * OR-ing with mask 0x80000000. The maximum amount of data bytes in a message for data * transmission and reception is set through BOOT_COM_CAN_TX_MAX_DATA and * BOOT_COM_CAN_RX_MAX_DATA, respectively. It is common for a microcontroller to have more * than 1 CAN controller on board. The zero-based BOOT_COM_CAN_CHANNEL_INDEX selects the @@ -73,11 +74,11 @@ /** \brief Configure the desired CAN baudrate. */ #define BOOT_COM_CAN_BAUDRATE (500000) /** \brief Configure CAN message ID target->host. */ -#define BOOT_COM_CAN_TX_MSG_ID (0x7E1) +#define BOOT_COM_CAN_TX_MSG_ID (0x7E1 /*| 0x80000000*/) /** \brief Configure number of bytes in the target->host CAN message. */ #define BOOT_COM_CAN_TX_MAX_DATA (8) /** \brief Configure CAN message ID host->target. */ -#define BOOT_COM_CAN_RX_MSG_ID (0x667) +#define BOOT_COM_CAN_RX_MSG_ID (0x667 /*| 0x80000000*/) /** \brief Configure number of bytes in the host->target CAN message. */ #define BOOT_COM_CAN_RX_MAX_DATA (8) /** \brief Select the desired CAN peripheral as a zero based index. */ diff --git a/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Prog/bin/demoprog_stm32f303.elf b/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Prog/bin/demoprog_stm32f303.elf index 155ffda1..51d267a4 100644 Binary files a/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Prog/bin/demoprog_stm32f303.elf and b/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Prog/bin/demoprog_stm32f303.elf differ diff --git a/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Prog/bin/demoprog_stm32f303.map b/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Prog/bin/demoprog_stm32f303.map index f0da9668..59b6e62e 100644 --- a/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Prog/bin/demoprog_stm32f303.map +++ b/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Prog/bin/demoprog_stm32f303.map @@ -6,23 +6,23 @@ EXEC_P, HAS_SYMS, D_PAGED start address 0x08002000 Program Header: -0x70000001 off 0x00003164 vaddr 0x08003164 paddr 0x08003164 align 2**2 +0x70000001 off 0x00003174 vaddr 0x08003174 paddr 0x08003174 align 2**2 filesz 0x00000008 memsz 0x00000008 flags r-- LOAD off 0x00000000 vaddr 0x08000000 paddr 0x08000000 align 2**16 - filesz 0x0000316c memsz 0x0000316c flags r-x - LOAD off 0x00010000 vaddr 0x20000000 paddr 0x0800316c align 2**16 + filesz 0x0000317c memsz 0x0000317c flags r-x + LOAD off 0x00010000 vaddr 0x20000000 paddr 0x0800317c align 2**16 filesz 0x0000009c memsz 0x0000010c flags rw- private flags = 5000400: [Version5 EABI] [hard-float ABI] Sections: Idx Name Size VMA LMA File off Algn - 0 .text 00001164 08002000 08002000 00002000 2**2 + 0 .text 00001174 08002000 08002000 00002000 2**2 CONTENTS, ALLOC, LOAD, READONLY, CODE - 1 .ARM.exidx 00000008 08003164 08003164 00003164 2**2 + 1 .ARM.exidx 00000008 08003174 08003174 00003174 2**2 CONTENTS, ALLOC, LOAD, READONLY, DATA - 2 .data 0000009c 20000000 0800316c 00010000 2**2 + 2 .data 0000009c 20000000 0800317c 00010000 2**2 CONTENTS, ALLOC, LOAD, DATA - 3 .bss 00000070 2000009c 08003208 0001009c 2**2 + 3 .bss 00000070 2000009c 08003218 0001009c 2**2 ALLOC 4 .stack_dummy 00000100 20000110 20000110 000100a0 2**3 CONTENTS, READONLY @@ -30,27 +30,27 @@ Idx Name Size VMA LMA File off Algn CONTENTS, READONLY 6 .comment 0000006e 00000000 00000000 000101d0 2**0 CONTENTS, READONLY - 7 .debug_line 000036a4 00000000 00000000 0001023e 2**0 + 7 .debug_line 000036b2 00000000 00000000 0001023e 2**0 CONTENTS, READONLY, DEBUGGING - 8 .debug_info 0000526b 00000000 00000000 000138e2 2**0 + 8 .debug_info 0000527b 00000000 00000000 000138f0 2**0 CONTENTS, READONLY, DEBUGGING - 9 .debug_abbrev 00001063 00000000 00000000 00018b4d 2**0 + 9 .debug_abbrev 00001072 00000000 00000000 00018b6b 2**0 CONTENTS, READONLY, DEBUGGING - 10 .debug_aranges 000005c0 00000000 00000000 00019bb0 2**3 + 10 .debug_aranges 000005c0 00000000 00000000 00019be0 2**3 CONTENTS, READONLY, DEBUGGING - 11 .debug_loc 0000259c 00000000 00000000 0001a170 2**0 + 11 .debug_loc 000025bb 00000000 00000000 0001a1a0 2**0 CONTENTS, READONLY, DEBUGGING - 12 .debug_ranges 00000500 00000000 00000000 0001c70c 2**0 + 12 .debug_ranges 00000500 00000000 00000000 0001c75b 2**0 CONTENTS, READONLY, DEBUGGING - 13 .debug_macro 00014724 00000000 00000000 0001cc0c 2**0 + 13 .debug_macro 00014724 00000000 00000000 0001cc5b 2**0 CONTENTS, READONLY, DEBUGGING - 14 .debug_str 00080630 00000000 00000000 00031330 2**0 + 14 .debug_str 0008063f 00000000 00000000 0003137f 2**0 CONTENTS, READONLY, DEBUGGING - 15 .debug_frame 00000bdc 00000000 00000000 000b1960 2**2 + 15 .debug_frame 00000bdc 00000000 00000000 000b19c0 2**2 CONTENTS, READONLY, DEBUGGING SYMBOL TABLE: 08002000 l d .text 00000000 .text -08003164 l d .ARM.exidx 00000000 .ARM.exidx +08003174 l d .ARM.exidx 00000000 .ARM.exidx 20000000 l d .data 00000000 .data 2000009c l d .bss 00000000 .bss 20000110 l d .stack_dummy 00000000 .stack_dummy @@ -72,7 +72,7 @@ SYMBOL TABLE: 080022a0 l .text 00000000 .fill_zero_bss 0800229c l .text 00000000 .loop_zero_bss 00000000 l df *ABS* 00000000 crtstuff.c -08003160 l O .text 00000000 __EH_FRAME_BEGIN__ +08003170 l O .text 00000000 __EH_FRAME_BEGIN__ 0800218c l F .text 00000000 __do_global_dtors_aux 2000009c l .bss 00000000 completed.8605 20000098 l O .data 00000000 __do_global_dtors_aux_fini_array_entry @@ -86,14 +86,14 @@ SYMBOL TABLE: 0800240c l F .text 000000f0 BootComCanInit 080024fc l F .text 00000024 UartReceiveByte 0800254c l F .text 00000094 BootComUartCheckActivationRequest -080025e0 l F .text 00000040 BootComCanCheckActivationRequest +080025e0 l F .text 00000050 BootComCanCheckActivationRequest 200000b8 l O .bss 00000004 xcpCtoRxStartTime.7946 200000bc l O .bss 00000041 xcpCtoReqPacket.7943 200000fd l O .bss 00000001 xcpCtoRxLength.7944 200000fe l O .bss 00000001 xcpCtoRxInProgress.7945 -08003138 l O .text 00000024 canTiming +08003148 l O .text 00000024 canTiming 00000000 l df *ABS* 00000000 main.c -0800262c l F .text 0000000c Init +0800263c l F .text 0000000c Init 00000000 l df *ABS* 00000000 led.c 20000100 l O .bss 00000004 timer_counter_last.7924 20000104 l O .bss 00000001 led_toggle_state.7923 @@ -107,7 +107,7 @@ SYMBOL TABLE: 00000000 l df *ABS* 00000000 stm32f30x_usart.c 00000000 l df *ABS* 00000000 stm32f30x_gpio.c 00000000 l df *ABS* 00000000 system_stm32f30x.c -08002fd0 l F .text 00000064 SetSysClock +08002fe0 l F .text 00000064 SetSysClock 00000000 l df *ABS* 00000000 exit.c 00000000 l df *ABS* 00000000 init.c 00000000 l df *ABS* 00000000 memset.c @@ -116,7 +116,7 @@ SYMBOL TABLE: 00000000 l df *ABS* 00000000 impure.c 20000034 l O .data 00000060 impure_data 00000000 l df *ABS* 00000000 crtstuff.c -08003160 l O .text 00000000 __FRAME_END__ +08003170 l O .text 00000000 __FRAME_END__ 00000000 l df *ABS* 00000000 20000098 l .data 00000000 __init_array_end 20000094 l .data 00000000 __preinit_array_end @@ -125,120 +125,120 @@ SYMBOL TABLE: 08002306 w F .text 00000002 RTC_Alarm_IRQHandler 20000110 g .stack_dummy 00000000 __HeapBase 080022b6 w F .text 00000002 DebugMon_Handler -08002fa0 g F .text 0000002e GPIO_PinAFConfig +08002fb0 g F .text 0000002e GPIO_PinAFConfig 00000000 g *ABS* 00000000 __HEAP_SIZE 20000000 g .data 00000000 __data_start__ 080022f2 w F .text 00000002 TIM1_CC_IRQHandler 080022ac w F .text 00000002 HardFault_Handler -08002888 g F .text 000000f4 CAN_FilterInit -08002738 g F .text 00000010 SysTick_Handler +08002898 g F .text 000000f4 CAN_FilterInit +08002748 g F .text 00000010 SysTick_Handler 080022be w F .text 00000002 PVD_IRQHandler 080022b8 w F .text 00000002 PendSV_Handler 080022aa w F .text 00000002 NMI_Handler -0800316c g .ARM.exidx 00000000 __exidx_end +0800317c g .ARM.exidx 00000000 __exidx_end 080022ce w F .text 00000002 EXTI3_IRQHandler -0800316c g .ARM.exidx 00000000 __etext -08002ef8 g F .text 0000000e USART_GetFlagStatus +0800317c g .ARM.exidx 00000000 __etext +08002f08 g F .text 0000000e USART_GetFlagStatus 080022c8 w F .text 00000002 EXTI0_IRQHandler 08002310 w F .text 00000002 FPU_IRQHandler 20000030 g O .data 00000004 SystemCoreClock 080022cc w F .text 00000002 EXTI2_TS_IRQHandler -08002ef0 g F .text 00000008 USART_ReceiveData +08002f00 g F .text 00000008 USART_ReceiveData 080022ee w F .text 00000002 TIM1_UP_TIM16_IRQHandler 080022b2 w F .text 00000002 UsageFault_Handler 080022e0 w F .text 00000002 ADC1_2_IRQHandler -08002f08 g F .text 0000008e GPIO_Init +08002f18 g F .text 0000008e GPIO_Init 20000110 g .stack_dummy 00000000 __HeapLimit 2000009c g .bss 00000000 __bss_start__ 080022fc w F .text 00000002 SPI1_IRQHandler -08002ed8 g F .text 00000016 USART_Cmd +08002ee8 g F .text 00000016 USART_Cmd 08002308 w F .text 00000002 TIM6_DAC_IRQHandler -08002dd8 g F .text 0000001c RCC_APB1PeriphClockCmd -08003164 g .text 00000000 __exidx_start -0800315c g O .text 00000004 _global_impure_ptr -080030c4 g F .text 0000004c __libc_init_array -08002dbc g F .text 0000001c RCC_AHBPeriphClockCmd +08002de8 g F .text 0000001c RCC_APB1PeriphClockCmd +08003174 g .text 00000000 __exidx_start +0800316c g O .text 00000004 _global_impure_ptr +080030d4 g F .text 0000004c __libc_init_array +08002dcc g F .text 0000001c RCC_AHBPeriphClockCmd 080022d8 w F .text 00000002 DMA1_Channel4_IRQHandler 080021e8 g F .text 00000000 _mainCRTStartup -0800274c g F .text 00000018 CAN_DeInit -08003120 g F .text 00000000 _init +0800275c g F .text 00000018 CAN_DeInit +08003130 g F .text 00000000 _init 0800252c g F .text 00000020 BootActivate 08002302 w F .text 00000002 USART3_IRQHandler 00000000 w *UND* 00000000 __libc_fini_array 080022de w F .text 00000002 DMA1_Channel7_IRQHandler 0800225c g F .text 00000038 Reset_Handler 080022e6 w F .text 00000002 CAN1_RX1_IRQHandler -0800264c g F .text 00000044 LedInit -08002f98 g F .text 00000004 GPIO_SetBits +0800265c g F .text 00000044 LedInit +08002fa8 g F .text 00000004 GPIO_SetBits 00000000 w *UND* 00000000 __sf_fake_stderr 00000000 w *UND* 00000000 __deregister_frame_info 20000110 g .stack_dummy 00000000 end 080022f8 w F .text 00000002 I2C1_EV_IRQHandler 2000009c g .data 00000000 __data_end__ -08002a60 g F .text 0000035c RCC_GetClocksFreq +08002a70 g F .text 0000035c RCC_GetClocksFreq 080022dc w F .text 00000002 DMA1_Channel6_IRQHandler -08002e10 g F .text 000000c8 USART_Init +08002e20 g F .text 000000c8 USART_Init 2000010c g .bss 00000000 __bss_end__ 00000100 g *ABS* 00000000 __STACK_SIZE 080022f6 w F .text 00000002 TIM3_IRQHandler 080022c6 w F .text 00000002 RCC_IRQHandler -0800299c g F .text 000000a6 CAN_Receive +080029ac g F .text 000000a6 CAN_Receive 00000000 w *UND* 00000000 __call_exitprocs -08002764 g F .text 00000122 CAN_Init +08002774 g F .text 00000122 CAN_Init 080022d2 w F .text 00000002 DMA1_Channel1_IRQHandler 080021e8 g F .text 00000000 _start -0800297c g F .text 00000020 CAN_StructInit +0800298c g F .text 00000020 CAN_StructInit 08002304 w F .text 00000002 EXTI15_10_IRQHandler 0800230c w F .text 00000002 COMP2_IRQHandler 00000000 w *UND* 00000000 software_init_hook -08002f9c g F .text 00000004 GPIO_ResetBits +08002fac g F .text 00000004 GPIO_ResetBits 0800230a w F .text 00000002 TIM7_IRQHandler 080022ea w F .text 00000002 EXTI9_5_IRQHandler 080022c0 w F .text 00000002 TAMPER_STAMP_IRQHandler 080022c2 w F .text 00000002 RTC_WKUP_IRQHandler 00000000 w *UND* 00000000 __sf_fake_stdin -08003110 g F .text 00000010 memset +08003120 g F .text 00000010 memset 080022ae w F .text 00000002 MemManage_Handler 08002000 g .text 0000018c __isr_vector -08002638 g F .text 00000014 main +08002648 g F .text 00000014 main 080022b4 w F .text 00000002 SVC_Handler 00000000 w *UND* 00000000 hardware_init_hook 20000110 g .stack_dummy 00000000 __end__ 080022da w F .text 00000002 DMA1_Channel5_IRQHandler -08002a44 g F .text 0000001a CAN_MessagePending +08002a54 g F .text 0000001a CAN_MessagePending 080022d0 w F .text 00000002 EXTI4_IRQHandler -080026dc g F .text 0000000c TimerSet +080026ec g F .text 0000000c TimerSet 080022e4 w F .text 00000002 USB_LP_CAN1_RX0_IRQHandler 08002520 g F .text 0000000c BootComInit -08003034 g F .text 00000068 SystemInit -0800312c g F .text 00000000 _fini +08003044 g F .text 00000068 SystemInit +0800313c g F .text 00000000 _fini 080022f0 w F .text 00000002 TIM1_TRG_COM_TIM17_IRQHandler 080022e2 w F .text 00000002 USB_HP_CAN1_TX_IRQHandler 00000000 w *UND* 00000000 atexit 080022d6 w F .text 00000002 DMA1_Channel3_IRQHandler 20003000 g .bss 00000000 __StackTop 080022bc w F .text 00000002 WWDG_IRQHandler -08002df4 g F .text 0000001c RCC_APB1PeriphResetCmd -08002690 g F .text 0000004c LedToggle +08002e04 g F .text 0000001c RCC_APB1PeriphResetCmd +080026a0 g F .text 0000004c LedToggle 080022f4 w F .text 00000002 TIM2_IRQHandler 20003000 g *ABS* 00000000 __stack 080022ca w F .text 00000002 EXTI1_IRQHandler 0800230e w F .text 00000002 COMP4_6_IRQHandler 20002f00 g *ABS* 00000100 __StackLimit 08002300 w F .text 00000002 USART2_IRQHandler -0800309c g F .text 00000028 exit +080030ac g F .text 00000028 exit 080022d4 w F .text 00000002 DMA1_Channel2_IRQHandler 00000000 w *UND* 00000000 __sf_fake_stdout -08002620 g F .text 0000000c BootComCheckActivationRequest +08002630 g F .text 0000000c BootComCheckActivationRequest 080022e8 w F .text 00000002 CAN1_SCE_IRQHandler 080022c4 w F .text 00000002 FLASH_IRQHandler -08002748 w F .text 00000002 _exit +08002758 w F .text 00000002 _exit 080022b0 w F .text 00000002 BusFault_Handler 080022fe w F .text 00000002 USART1_IRQHandler 080022fa w F .text 00000002 I2C1_ER_IRQHandler -0800272c g F .text 0000000c TimerGet +0800273c g F .text 0000000c TimerGet 00000000 w *UND* 00000000 _Jv_RegisterClasses -080026e8 g F .text 00000044 TimerInit +080026f8 g F .text 00000044 TimerInit 00000000 w *UND* 00000000 __register_frame_info 080022ec w F .text 00000002 TIM1_BRK_TIM15_IRQHandler diff --git a/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Prog/bin/demoprog_stm32f303.srec b/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Prog/bin/demoprog_stm32f303.srec index ed7bee41..a4dd82c2 100644 --- a/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Prog/bin/demoprog_stm32f303.srec +++ b/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Prog/bin/demoprog_stm32f303.srec @@ -2,7 +2,7 @@ S01E000062696E2F64656D6F70726F675F73746D3332663330332E737265632D S31508002000003000205D220008AB220008AD2200083F S31508002010AF220008B1220008B32200080000000021 S31508002020000000000000000000000000B5220008C3 -S31508002030B722000800000000B92200083927000866 +S31508002030B722000800000000B92200084927000856 S31508002040BD220008BF220008C1220008C3220008DA S31508002050C5220008C7220008C9220008CB220008AA S31508002060CD220008CF220008D1220008D32200087A @@ -25,23 +25,23 @@ S315080021600000000000000000000000000000000061 S315080021700000000000000000000000000000000051 S315080021800000000011230008EE11AA5510B5054CF1 S31508002190237833B9044B13B10448AFF30080012305 -S315080021A0237010BD9C00002000000000603100086C +S315080021A0237010BD9C00002000000000703100085C S315080021B0084B10B51BB108490848AFF3008008481A S315080021C0036803B910BD074B002BFBD0BDE81040D0 -S315080021D0184700BF00000000A0000020603100087A +S315080021D0184700BF00000000A0000020703100086A S315080021E09C00002000000000154B002B08BF134B75 S315080021F09D46A3F5803A00218B460F461348144A9C -S31508002200121A00F085FF0F4B002B00D098470E4B93 +S31508002200121A00F08DFF0F4B002B00D098470E4B8B S31508002210002B00D098470020002104000D000D482F -S31508002220002802D00C48AFF3008000F04BFF2000D6 -S31508002230290000F001FA00F031FF00BF0000080095 +S31508002220002802D00C48AFF3008000F053FF2000CE +S31508002230290000F009FA00F039FF00BF0000080085 S315080022400030002000000000000000009C00002074 S315080022500C010020000000000000000007498D4620 S315080022600749084A084B9A42BEBF51F8040B42F880 S31508002270040BF8E70548804705480047003000206A -S315080022806C310008000000209C0000203530000852 +S315080022807C310008000000209C0000204530000832 S31508002290E92100081F49204A002301E041F8043BD0 -S315080022A09142FBD300F0C8F9FEE7FEE7FEE7FEE73A +S315080022A09142FBD300F0D0F9FEE7FEE7FEE7FEE732 S315080022B0FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE7E8 S315080022C0FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE7D8 S315080022D0FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE7C8 @@ -54,239 +54,240 @@ S31508002330070606FB00064FF4FA4595FBF6F506FB7D S3150800234005F5B5F5FA4F0DD195FBF6F6B6B20E8042 S31508002350013EB6B2B6F5806F04D282F800E01F706F S315080023600120F0BD0134E4B2112CDAD90020F0BD09 -S315080023703831000870B588B001214FF4003000F0FC -S315080023802BFD01214FF4003000F018FD0722022131 -S315080023904FF0904000F004FE07220F214FF09040C6 -S315080023A000F0FEFD00248DF81E4001258DF81F5013 +S315080023704831000870B588B001214FF4003000F0EC +S3150800238033FD01214FF4003000F020FD0722022121 +S315080023904FF0904000F00CFE07220F214FF09040BE +S315080023A000F006FE00248DF81E4001258DF81F500A S315080023B002268DF81C600423069303238DF81D302E -S315080023C006A94FF0904000F09FFD8DF81C604FF471 -S315080023D00043069306A94FF0904000F095FD4FF490 +S315080023C006A94FF0904000F0A7FD8DF81C604FF469 +S315080023D00043069306A94FF0904000F09DFD4FF488 S315080023E06143009301940294039405940C23049387 -S315080023F0054C6946204600F00BFD2946204600F0AC -S315080024006BFD08B070BD00BF0044004070B58AB0CF -S3150800241001214FF4003000F0D1FC09220B214FF0C6 -S31508002420904000F0BDFD09220C214FF0904000F0CD -S31508002430B7FD4FF4C053089302238DF824300323C5 +S315080023F0054C6946204600F013FD2946204600F0A4 +S3150800240073FD08B070BD00BF0044004070B58AB0C7 +S3150800241001214FF4003000F0D9FC09220B214FF0BE +S31508002420904000F0C5FD09220C214FF0904000F0C5 +S31508002430BFFD4FF4C053089302238DF824300323BD S315080024408DF8253000248DF8264001258DF8275073 -S3150800245008A94FF0904000F057FD29464FF000704C -S3150800246000F0BAFC244E304600F070F905A800F0DA -S3150800247085FA6B460DEB05020DF102014FF4FA7071 +S3150800245008A94FF0904000F05FFD29464FF0007044 +S3150800246000F0C2FC244E304600F078F905A800F0CA +S315080024708DFA6B460DEB05020DF102014FF4FA7069 S31508002480FFF74CFF8DF81A408DF81B408DF81C405D S315080024908DF81D408DF81E408DF81F408DF81640AA S315080024A08DF817409DF80130013B8DF818309DF8DE S315080024B00030013B8DF81930BDF80230ADF8143004 -S315080024C005A9304600F04EF98DF80E408DF80F40FC +S315080024C005A9304600F056F98DF80E408DF80F40F4 S315080024D08DF81050ADF80440ADF80640ADF8084048 S315080024E0ADF80A40ADF80C408DF8115001A800F07F -S315080024F0CBF90AB070BD00BF0064004010B50446B1 -S315080025002021064800F0F8FC012805D1034800F010 -S31508002510EFFC2070012010BD002010BD00440040D3 +S315080024F0D3F90AB070BD00BF0064004010B50446A9 +S315080025002021064800F000FD012805D1034800F007 +S31508002510F7FC2070012010BD002010BD00440040CB S3150800252008B5FFF727FFFFF771FF08BDBFF34F8F09 S315080025300449CA6802F4E062034B1343CB60BFF355 S315080025404F8FFEE700ED00E00400FA0508B5204BC2 S315080025501B789BB91F48FFF7D1FF012836D11D4BC1 -S315080025601B78002B32D000F0E1F81B4B18600122D3 +S315080025601B78002B32D000F0E9F81B4B18600122CB S31508002570174B1A700022194B1A7008BD174B1B7897 S31508002580013314481844FFF7B9FF012814D1134A38 S3150800259013780133DBB213700E4A1278934215D1C1 S315080025A000220B4B1A700B4B5B78FF2B0ED1094B95 -S315080025B09B785BB9FFF7BAFF00F0B8F8064B1B68C3 +S315080025B09B785BB9FFF7BAFF00F0C0F8064B1B68BB S315080025C06433984202D90022014B1A7008BD00BF35 S315080025D0FE000020BC000020B8000020FD000020FE -S315080025E000B587B000210D4800F02CFA90B101AA79 -S315080025F000210A4800F0D2F940F26763019A9A422C -S3150800260008D19DF80F30FF2B04D19DF810300BB977 -S31508002610FFF78CFF07B05DF804FB00BF00640040BD -S3150800262008B5FFF793FFFFF7DBFF08BD08B500F015 -S315080026300DF800F059F808BD08B5FFF7F7FFFFF7E2 -S315080026406FFF00F025F8FFF7EBFFFAE730B583B028 -S3150800265001214FF4802000F0B1FB082500950123E5 -S315080026608DF8043000238DF8063003228DF80520F6 -S315080026708DF80730054C6946204600F045FC29468A -S31508002680204600F08BFC03B030BD00BF00040048B4 -S3150800269010B500F04BF80E4B1B68C31AB3F5FA7F5A -S315080026A014D304460B4B1B783BB90122094B1A700D -S315080026B00821094800F070FC06E00022054B1A7054 -S315080026C00821054800F06AFC014B1C6010BD00BFDC -S315080026D0000100200401002000040048014B186096 -S315080026E0704700BF0801002008B50C4B1B680C4A50 -S315080026F0A2FB03239B09013BB3F1807F09D2094A58 -S315080027005360F021084B83F82310002393600723B6 -S3150800271013600020FFF7E2FF08BD00BF300000206D -S31508002720D34D621010E000E000ED00E0014B1868A0 -S31508002730704700BF08010020024A1368013313607E -S31508002740704700BF08010020FEE700BF08B5012159 -S315080027504FF0007000F04EFB00214FF0007000F0C3 -S3150800276049FB08BD82B000230193036823F00203E6 -S315080027700360036843F00103036002E0019B013331 -S315080027800193436813F0010F04D1019A6FF07F4358 -S315080027909A42F3D1436813F0010F6FD08B79012B5E -S315080027A004D1036843F08003036003E0036823F061 -S315080027B080030360CB79012B04D1036843F04003FF -S315080027C0036003E0036823F0400303600B7A012BE0 -S315080027D004D1036843F02003036003E0036823F091 -S315080027E0200303604B7A012B04D1036843F01003DE -S315080027F0036003E0036823F0100303608B7A012B60 -S3150800280004D1036843F00803036003E0036823F078 -S3150800281008030360CB7A012B04D1036843F0040351 -S31508002820036003E0036823F0040303608A78CB7827 -S315080028301B0643EA82730A7943EA02434A7943EA62 -S3150800284002530A88013A1343C361036823F001035C -S3150800285003600023019302E0019B0133019343685F -S3150800286013F0010F04D0019A6FF07F439A42F3D117 -S31508002870436813F0010F03D0002002E0002000E0B7 -S31508002880012002B0704700BF70B4837A012202FAB1 -S3150800289003F3394AD2F8001241F00101C2F80012D6 -S315080028A0D2F81C12DC432140C2F81C12027BB2B9D2 -S315080028B0314AD2F80C122140C2F80C12817AC68825 -S315080028C0458845EA0645483142F83150857A868872 -S315080028D0018841EA0641483502EBC5025160027B90 -S315080028E0012A16D1244AD2F80C121943C2F80C123E -S315080028F0817A0688458845EA0645483142F83150C6 -S31508002900857A8688C18841EA0641483502EBC502C0 -S315080029105160C27A32B91849D1F804222240C1F866 -S31508002920042205E01449D1F804221A43C1F8042206 -S3150800293002892AB91049D1F814221440C1F8144260 -S315080029400289012A05D10C49D1F814221A43C1F883 -S315080029501422427B012A05D10749D1F81C221343C8 -S31508002960C1F81C32044AD2F8003223F00103C2F837 -S31508002970003270BC704700BF0064004000238371BA -S31508002980C371037243728372C3728370C370032365 -S3150800299003710223437101230380704710B401F1C8 -S315080029A01B031B01C35803F00403DBB2137233B9CC -S315080029B001F11B031B01C3585B0D136005E001F110 -S315080029C01B031B01C358DB08536001F11B031B01E2 -S315080029D0C418C35803F002035372636803F00F0365 -S315080029E0937263681B0AD37400EB0113D3F8B841DA -S315080029F0D472D3F8B841240A1473D3F8B841240C16 -S31508002A005473D3F8B841240E9473D3F8BC41D473E5 -S31508002A10D3F8BC41240A1474D3F8BC41240C54746A -S31508002A20D3F8BC311B0E937421B9C36843F0200355 -S31508002A30C36003E0036943F0200303615DF8044BB8 -S31508002A40704700BF19B9C06800F003007047012934 -S31508002A5003D1006900F0030070470020704700BFEB -S31508002A60F0B5A04B5B6803F00C03042B06D0082BCB -S31508002A7008D003BB9C4B036000241FE09A4B0360FD -S31508002A8000241BE0974B5C685A68C4F38344A31C74 -S31508002A9012F4803F03D1954C04FB03F409E0914AF4 -S31508002AA0D26A02F00F0201328F4CB4FBF2F404FB37 -S31508002AB003F4046002E08C4B03600024894D6B68C4 -S31508002AC0C3F30313DFF828E21EF80370FFB20268A7 -S31508002AD022FA07F343606968C1F302211EF8011060 -S31508002AE0C9B223FA01F181606E68C6F3C2261EF8E0 -S31508002AF00660F6B2F340C360ED6A2D0905F00F0CC7 -S31508002B00DFF8F0E13EF81CE01FFA8EFE15F0100F14 -S31508002B1006D0BEF1000F03D0B4FBFEF5056100E058 -S31508002B200261704DED6A6D0A05F00F0CDFF8C4E11D -S31508002B303EF81CE01FFA8EFE15F0100F06D0BEF107 -S31508002B40000F03D0B4FBFEF5456100E04261654D18 -S31508002B502D6B15F0100F02D1634D856100E082617F -S31508002B60604D2D6B15F0200F02D15F4DC56100E059 -S31508002B70C2615C4D2D6B15F0400F02D15A4D0562AE -S31508002B8000E00262574D2D6B15F4807F06D0944203 -S31508002B9004D1B74202D16500456200E04362514D57 -S31508002BA02D6B15F4805F06D0944204D1B74202D14A -S31508002BB06500856200E083624A4D2D6B15F4007F3F -S31508002BC006D0944204D1B74202D16500C56200E03E -S31508002BD0C362444D2D6B15F4806F06D0944204D120 -S31508002BE0B74202D16500C56400E0C3643D4D2D6B54 -S31508002BF015F4006F06D0944204D1B74202D165009D -S31508002C00056500E00365374D2D6B15F4005F06D0AA -S31508002C10944204D1B74202D16500456500E00365D8 -S31508002C20304D2D6B15F4004F06D0944204D1B742AF -S31508002C3002D16400846500E083652A4B1B6B13F0A0 -S31508002C40030F01D1816319E0264B1B6B03F00303C5 -S31508002C50012B01D1826311E0224B1B6B03F00303A6 -S31508002C60022B03D14FF40043836307E01D4B1B6B14 -S31508002C7003F00303032B01D11B4B8363194B1B6B17 -S31508002C8013F4403F01D1C1631CE0164B1B6B03F4E0 -S31508002C904033B3F5803F01D1C26313E0114B1B6B80 -S31508002CA003F44033B3F5003F03D14FF40043C36345 -S31508002CB008E00C4B1B6B03F44033B3F5403F01D1DE -S31508002CC0094BC363074B1B6B13F4402F01D10164F7 -S31508002CD026E0044B1B6B03F44023B3F5802F0BD17E -S31508002CE002641DE00010024000127A0000093D004F -S31508002CF020000020000000202E4B1B6B03F440230D -S31508002D00B3F5002F03D14FF40043036408E0294BC1 -S31508002D101B6B03F44023B3F5402F01D1264B036404 -S31508002D20244B1B6B13F4401F01D141641CE0214B5B -S31508002D301B6B03F44013B3F5801F01D1426413E003 -S31508002D401C4B1B6B03F44013B3F5001F03D14FF460 -S31508002D500043436408E0174B1B6B03F44013B3F5B9 -S31508002D60401F01D1144B4364124B1B6B13F4400FE5 -S31508002D7001D18164F0BD0F4B1B6B03F44003B3F51F -S31508002D80800F01D18264F0BD0A4B1B6B03F440032C -S31508002D90B3F5000F03D14FF400438364F0BD054B30 -S31508002DA01B6B03F44003B3F5400F01D1024B836458 -S31508002DB0F0BD00BF0010024000127A0021B1054B99 -S31508002DC05A69104358617047024A536923EA00005A -S31508002DD0506170470010024021B1054BDA69104373 -S31508002DE0D8617047024AD36923EA0000D061704768 -S31508002DF00010024021B1054B1A691043186170474B -S31508002E00024A136923EA0000106170470010024065 -S31508002E1030B599B004460D46036823F001030360F4 -S31508002E20436823F440528B6813434360036823F4D2 -S31508002E30B05222F00C024968EB6819432B690B4320 -S31508002E4013430360836823F440726B6913438360FA -S31508002E5001A8FFF705FE1C4B9C4201D10F9A0FE013 -S31508002E601A4B9C4201D1109A0AE0194B9C4201D197 -S31508002E70119A05E0174B9C4201D1129A00E0139A69 -S31508002E80236813F4004F06D052002968B2FBF1F309 -S31508002E9001FB132204E02968B2FBF1F301FB1322BC -S31508002EA02968B2EB510F00D30133226812F4004FA0 -S31508002EB006D0C3F3420223F00F031B041B0C134373 -S31508002EC09BB2A38119B030BD0038014000440040D0 -S31508002ED000480040004C004021B1036843F001035C -S31508002EE003607047036823F001030360704700BF5F -S31508002EF0808CC0F308007047C3690B4201D00120DB -S31508002F0070470020704700BF70B400233FE00122DD -S31508002F109A400C68A24339D10A79013AD2B2012AF9 -S31508002F201CD885685A000324944025EA0404846062 -S31508002F3085684C7904FA02F22A4382608488A5B22D -S31508002F409AB20124944025EA040484808588ADB2A7 -S31508002F508C7904FA02F292B22A43828004685A00F3 -S31508002F60032505FA02F624EA0604046006680C79C5 -S31508002F70944034430460C4689EB27600B54024EA9F -S31508002F800505CC7904FA02F22A43C26001330F2BF5 -S31508002F90BDD970BC704700BF816170470185704715 -S31508002FA030B401F007039B009A40C908083150F86D -S31508002FB021400F2505FA03F324EA030340F82130DC -S31508002FC050F821301A4340F8212030BC704700BF22 -S31508002FD01222164B1A60A3F580535A685A605A682B -S31508002FE05A605A6842F480625A605A6822F47C121F -S31508002FF05A605A6842F460125A601A6842F080723F -S315080030001A600B4B1B6813F0007FFAD0084B5A68FE -S3150800301022F003025A605A6842F002025A60044BD0 -S315080030205B6803F00C03082BF9D1704700200240B7 -S315080030300010024008B5154AD2F8883043F47003E8 -S31508003040C2F88830124B1A6842F001021A605968B1 -S31508003050104A0A405A601A6822F0847222F48032B2 -S315080030601A601A6822F480221A605A6822F4FE024C -S315080030705A60DA6A22F00F02DA62196B064A0A40C7 -S315080030801A6300229A60FFF7A3FF08BD00ED00E06F -S31508003090001002400CC07FF8CCFC00FF08B5074BB7 -S315080030A0044613B10021AFF30080054B1868836A04 -S315080030B003B198472046FFF747FB00BF0000000012 -S315080030C05C31000870B50E4B0E4CE41AA4100025AE -S315080030D01E46A54204D056F8253098470135F8E72C -S315080030E000F01EF8084C094BE41AA41000251E46E9 -S315080030F0A54204D056F8253098470135F8E770BD43 -S3150800310094000020940000209800002094000020DD -S3150800311002440346934202D003F8011BFAE77047BC -S31508003120F8B500BFF8BC08BC9E467047F8B500BFA6 -S31508003130F8BC08BC9E46704705020602060307034C -S315080031400803090309040A040B040C040C050D05FD -S315080031500E050F050F06100610071008340000208C -S30908003160000000005D -S30D0800316484F0FF7F0100000062 -S3150800316C010002000400060008000A000C0010000A -S3150800317C2000400080000001000000000000000054 -S3150800318C00000000010203040102030406070809F3 -S3150800319C0090D003000000000000000000000000B2 -S315080031AC0000000000000000000000000000000005 +S315080025E000B587B00021114800F034FAD8B101AA25 +S315080025F000210E4800F0DAF99DF80C3033B940F2A4 +S315080026006763019A9A4203D0002302E0002300E0A0 +S31508002610012343B19DF80F30FF2B04D19DF81030EC +S315080026200BB9FFF783FF07B05DF804FB00640040B1 +S3150800263008B5FFF78BFFFFF7D3FF08BD08B500F015 +S315080026400DF800F059F808BD08B5FFF7F7FFFFF7D2 +S3150800265067FF00F025F8FFF7EBFFFAE730B583B020 +S3150800266001214FF4802000F0B1FB082500950123D5 +S315080026708DF8043000238DF8063003228DF80520E6 +S315080026808DF80730054C6946204600F045FC29467A +S31508002690204600F08BFC03B030BD00BF00040048A4 +S315080026A010B500F04BF80E4B1B68C31AB3F5FA7F4A +S315080026B014D304460B4B1B783BB90122094B1A70FD +S315080026C00821094800F070FC06E00022054B1A7044 +S315080026D00821054800F06AFC014B1C6010BD00BFCC +S315080026E0000100200401002000040048014B186086 +S315080026F0704700BF0801002008B50C4B1B680C4A40 +S31508002700A2FB03239B09013BB3F1807F09D2094A47 +S315080027105360F021084B83F82310002393600723A6 +S3150800272013600020FFF7E2FF08BD00BF300000205D +S31508002730D34D621010E000E000ED00E0014B186890 +S31508002740704700BF08010020024A1368013313606E +S31508002750704700BF08010020FEE700BF08B5012149 +S315080027604FF0007000F04EFB00214FF0007000F0B3 +S3150800277049FB08BD82B000230193036823F00203D6 +S315080027800360036843F00103036002E0019B013321 +S315080027900193436813F0010F04D1019A6FF07F4348 +S315080027A09A42F3D1436813F0010F6FD08B79012B4E +S315080027B004D1036843F08003036003E0036823F051 +S315080027C080030360CB79012B04D1036843F04003EF +S315080027D0036003E0036823F0400303600B7A012BD0 +S315080027E004D1036843F02003036003E0036823F081 +S315080027F0200303604B7A012B04D1036843F01003CE +S31508002800036003E0036823F0100303608B7A012B4F +S3150800281004D1036843F00803036003E0036823F068 +S3150800282008030360CB7A012B04D1036843F0040341 +S31508002830036003E0036823F0040303608A78CB7817 +S315080028401B0643EA82730A7943EA02434A7943EA52 +S3150800285002530A88013A1343C361036823F001034C +S3150800286003600023019302E0019B0133019343684F +S3150800287013F0010F04D0019A6FF07F439A42F3D107 +S31508002880436813F0010F03D0002002E0002000E0A7 +S31508002890012002B0704700BF70B4837A012202FAA1 +S315080028A003F3394AD2F8001241F00101C2F80012C6 +S315080028B0D2F81C12DC432140C2F81C12027BB2B9C2 +S315080028C0314AD2F80C122140C2F80C12817AC68815 +S315080028D0458845EA0645483142F83150857A868862 +S315080028E0018841EA0641483502EBC5025160027B80 +S315080028F0012A16D1244AD2F80C121943C2F80C122E +S31508002900817A0688458845EA0645483142F83150B5 +S31508002910857A8688C18841EA0641483502EBC502B0 +S315080029205160C27A32B91849D1F804222240C1F856 +S31508002930042205E01449D1F804221A43C1F80422F6 +S3150800294002892AB91049D1F814221440C1F8144250 +S315080029500289012A05D10C49D1F814221A43C1F873 +S315080029601422427B012A05D10749D1F81C221343B8 +S31508002970C1F81C32044AD2F8003223F00103C2F827 +S31508002980003270BC704700BF0064004000238371AA +S31508002990C371037243728372C3728370C370032355 +S315080029A003710223437101230380704710B401F1B8 +S315080029B01B031B01C35803F00403DBB2137233B9BC +S315080029C001F11B031B01C3585B0D136005E001F100 +S315080029D01B031B01C358DB08536001F11B031B01D2 +S315080029E0C418C35803F002035372636803F00F0355 +S315080029F0937263681B0AD37400EB0113D3F8B841CA +S31508002A00D472D3F8B841240A1473D3F8B841240C05 +S31508002A105473D3F8B841240E9473D3F8BC41D473D5 +S31508002A20D3F8BC41240A1474D3F8BC41240C54745A +S31508002A30D3F8BC311B0E937421B9C36843F0200345 +S31508002A40C36003E0036943F0200303615DF8044BA8 +S31508002A50704700BF19B9C06800F003007047012924 +S31508002A6003D1006900F0030070470020704700BFDB +S31508002A70F0B5A04B5B6803F00C03042B06D0082BBB +S31508002A8008D003BB9C4B036000241FE09A4B0360ED +S31508002A9000241BE0974B5C685A68C4F38344A31C64 +S31508002AA012F4803F03D1954C04FB03F409E0914AE4 +S31508002AB0D26A02F00F0201328F4CB4FBF2F404FB27 +S31508002AC003F4046002E08C4B03600024894D6B68B4 +S31508002AD0C3F30313DFF828E21EF80370FFB2026897 +S31508002AE022FA07F343606968C1F302211EF8011050 +S31508002AF0C9B223FA01F181606E68C6F3C2261EF8D0 +S31508002B000660F6B2F340C360ED6A2D0905F00F0CB6 +S31508002B10DFF8F0E13EF81CE01FFA8EFE15F0100F04 +S31508002B2006D0BEF1000F03D0B4FBFEF5056100E048 +S31508002B300261704DED6A6D0A05F00F0CDFF8C4E10D +S31508002B403EF81CE01FFA8EFE15F0100F06D0BEF1F7 +S31508002B50000F03D0B4FBFEF5456100E04261654D08 +S31508002B602D6B15F0100F02D1634D856100E082616F +S31508002B70604D2D6B15F0200F02D15F4DC56100E049 +S31508002B80C2615C4D2D6B15F0400F02D15A4D05629E +S31508002B9000E00262574D2D6B15F4807F06D09442F3 +S31508002BA004D1B74202D16500456200E04362514D47 +S31508002BB02D6B15F4805F06D0944204D1B74202D13A +S31508002BC06500856200E083624A4D2D6B15F4007F2F +S31508002BD006D0944204D1B74202D16500C56200E02E +S31508002BE0C362444D2D6B15F4806F06D0944204D110 +S31508002BF0B74202D16500C56400E0C3643D4D2D6B44 +S31508002C0015F4006F06D0944204D1B74202D165008C +S31508002C10056500E00365374D2D6B15F4005F06D09A +S31508002C20944204D1B74202D16500456500E00365C8 +S31508002C30304D2D6B15F4004F06D0944204D1B7429F +S31508002C4002D16400846500E083652A4B1B6B13F090 +S31508002C50030F01D1816319E0264B1B6B03F00303B5 +S31508002C60012B01D1826311E0224B1B6B03F0030396 +S31508002C70022B03D14FF40043836307E01D4B1B6B04 +S31508002C8003F00303032B01D11B4B8363194B1B6B07 +S31508002C9013F4403F01D1C1631CE0164B1B6B03F4D0 +S31508002CA04033B3F5803F01D1C26313E0114B1B6B70 +S31508002CB003F44033B3F5003F03D14FF40043C36335 +S31508002CC008E00C4B1B6B03F44033B3F5403F01D1CE +S31508002CD0094BC363074B1B6B13F4402F01D10164E7 +S31508002CE026E0044B1B6B03F44023B3F5802F0BD16E +S31508002CF002641DE00010024000127A0000093D003F +S31508002D0020000020000000202E4B1B6B03F44023FC +S31508002D10B3F5002F03D14FF40043036408E0294BB1 +S31508002D201B6B03F44023B3F5402F01D1264B0364F4 +S31508002D30244B1B6B13F4401F01D141641CE0214B4B +S31508002D401B6B03F44013B3F5801F01D1426413E0F3 +S31508002D501C4B1B6B03F44013B3F5001F03D14FF450 +S31508002D600043436408E0174B1B6B03F44013B3F5A9 +S31508002D70401F01D1144B4364124B1B6B13F4400FD5 +S31508002D8001D18164F0BD0F4B1B6B03F44003B3F50F +S31508002D90800F01D18264F0BD0A4B1B6B03F440031C +S31508002DA0B3F5000F03D14FF400438364F0BD054B20 +S31508002DB01B6B03F44003B3F5400F01D1024B836448 +S31508002DC0F0BD00BF0010024000127A0021B1054B89 +S31508002DD05A69104358617047024A536923EA00004A +S31508002DE0506170470010024021B1054BDA69104363 +S31508002DF0D8617047024AD36923EA0000D061704758 +S31508002E000010024021B1054B1A691043186170473A +S31508002E10024A136923EA0000106170470010024055 +S31508002E2030B599B004460D46036823F001030360E4 +S31508002E30436823F440528B6813434360036823F4C2 +S31508002E40B05222F00C024968EB6819432B690B4310 +S31508002E5013430360836823F440726B6913438360EA +S31508002E6001A8FFF705FE1C4B9C4201D10F9A0FE003 +S31508002E701A4B9C4201D1109A0AE0194B9C4201D187 +S31508002E80119A05E0174B9C4201D1129A00E0139A59 +S31508002E90236813F4004F06D052002968B2FBF1F3F9 +S31508002EA001FB132204E02968B2FBF1F301FB1322AC +S31508002EB02968B2EB510F00D30133226812F4004F90 +S31508002EC006D0C3F3420223F00F031B041B0C134363 +S31508002ED09BB2A38119B030BD0038014000440040C0 +S31508002EE000480040004C004021B1036843F001034C +S31508002EF003607047036823F001030360704700BF4F +S31508002F00808CC0F308007047C3690B4201D00120CA +S31508002F1070470020704700BF70B400233FE00122CD +S31508002F209A400C68A24339D10A79013AD2B2012AE9 +S31508002F301CD885685A000324944025EA0404846052 +S31508002F4085684C7904FA02F22A4382608488A5B21D +S31508002F509AB20124944025EA040484808588ADB297 +S31508002F608C7904FA02F292B22A43828004685A00E3 +S31508002F70032505FA02F624EA0604046006680C79B5 +S31508002F80944034430460C4689EB27600B54024EA8F +S31508002F900505CC7904FA02F22A43C26001330F2BE5 +S31508002FA0BDD970BC704700BF816170470185704705 +S31508002FB030B401F007039B009A40C908083150F85D +S31508002FC021400F2505FA03F324EA030340F82130CC +S31508002FD050F821301A4340F8212030BC704700BF12 +S31508002FE01222164B1A60A3F580535A685A605A681B +S31508002FF05A605A6842F480625A605A6822F47C120F +S315080030005A605A6842F460125A601A6842F080722E +S315080030101A600B4B1B6813F0007FFAD0084B5A68EE +S3150800302022F003025A605A6842F002025A60044BC0 +S315080030305B6803F00C03082BF9D1704700200240A7 +S315080030400010024008B5154AD2F8883043F47003D8 +S31508003050C2F88830124B1A6842F001021A605968A1 +S31508003060104A0A405A601A6822F0847222F48032A2 +S315080030701A601A6822F480221A605A6822F4FE023C +S315080030805A60DA6A22F00F02DA62196B064A0A40B7 +S315080030901A6300229A60FFF7A3FF08BD00ED00E05F +S315080030A0001002400CC07FF8CCFC00FF08B5074BA7 +S315080030B0044613B10021AFF30080054B1868836AF4 +S315080030C003B198472046FFF747FB00BF0000000002 +S315080030D06C31000870B50E4B0E4CE41AA41000258E +S315080030E01E46A54204D056F8253098470135F8E71C +S315080030F000F01EF8084C094BE41AA41000251E46D9 +S31508003100A54204D056F8253098470135F8E770BD32 +S3150800311094000020940000209800002094000020CD +S3150800312002440346934202D003F8011BFAE77047AC +S31508003130F8B500BFF8BC08BC9E467047F8B500BF96 +S31508003140F8BC08BC9E46704705020602060307033C +S315080031500803090309040A040B040C040C050D05ED +S315080031600E050F050F06100610071008340000207C +S30908003170000000004D +S30D0800317474F0FF7F0100000062 +S3150800317C010002000400060008000A000C001000FA +S3150800318C2000400080000001000000000000000044 +S3150800319C00000000010203040102030406070809E3 +S315080031AC0090D003000000000000000000000000A2 S315080031BC00000000000000000000000000000000F5 S315080031CC00000000000000000000000000000000E5 S315080031DC00000000000000000000000000000000D5 S315080031EC00000000000000000000000000000000C5 -S311080031FC00000000B12100088D21000829 +S315080031FC00000000000000000000000000000000B5 +S3110800320C00000000B12100088D21000818 S70508002000D2 diff --git a/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Prog/boot.c b/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Prog/boot.c index abac6fb1..6d8dd9fc 100644 --- a/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Prog/boot.c +++ b/Target/Demo/ARMCM4_STM32F3_Nucleo_F303K8_GCC/Prog/boot.c @@ -399,13 +399,27 @@ static void BootComCanInit(void) static void BootComCanCheckActivationRequest(void) { CanRxMsg RxMessage; + unsigned char canIdMatched = 0; + /* check if a new message was received */ if (CAN_MessagePending(CAN1, CAN_FIFO0) > 0) { /* receive the message */ CAN_Receive(CAN1, CAN_FIFO0, &RxMessage); - if (RxMessage.StdId == BOOT_COM_CAN_RX_MSG_ID) + /* check if the message identifier matches the bootloader reception message */ + if ( (RxMessage.IDE == CAN_Id_Standard) && + (RxMessage.StdId == BOOT_COM_CAN_RX_MSG_ID) ) + { + canIdMatched = 1; + } + if ( (RxMessage.IDE == CAN_Id_Extended) && + ((RxMessage.ExtId | 0x80000000) == BOOT_COM_CAN_RX_MSG_ID) ) + { + canIdMatched = 1; + } + /* is the identifier a match to the bootloader reception message identifier? */ + if (canIdMatched == 1) { /* check if this was an XCP CONNECT command */ if ((RxMessage.Data[0] == 0xff) && (RxMessage.Data[1] == 0x00))