diff --git a/spino_code/Debug/output.map b/spino_code/Debug/output.map index ad9953d44fa9dfaa312962ea109c6b548aa6fa11..9ab4c1767f377e00a165148c98c9d3e5a52ae744 100644 --- a/spino_code/Debug/output.map +++ b/spino_code/Debug/output.map @@ -3132,6 +3132,8 @@ Discarded input sections .bss 0x00000000 0x0 src/radio.o .text.send_packet 0x00000000 0x34 src/radio.o + .text.si44_getcts + 0x00000000 0x7c src/radio.o .debug_macro 0x00000000 0x8c8 src/radio.o .debug_macro 0x00000000 0x56 src/radio.o .debug_macro 0x00000000 0x22 src/radio.o @@ -3495,7 +3497,7 @@ LOAD d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15 0x08000000 g_pfnVectors 0x08000130 . = ALIGN (0x4) -.text 0x08000130 0x1d34 +.text 0x08000130 0x1cc8 0x08000130 . = ALIGN (0x4) *(.text) .text 0x08000130 0x6c d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crtbegin.o @@ -3609,214 +3611,211 @@ LOAD d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15 0x080013dc writeTIPLL .text.initSPI 0x08001488 0xe4 src/periph.o 0x08001488 initSPI - .text.si44_getcts - 0x0800156c 0x7c src/radio.o - 0x0800156c si44_getcts .text.si44_spisend - 0x080015e8 0x58 src/radio.o - 0x080015e8 si44_spisend + 0x0800156c 0x58 src/radio.o + 0x0800156c si44_spisend .text.si44_spiread - 0x08001640 0x78 src/radio.o - 0x08001640 si44_spiread + 0x080015c4 0x78 src/radio.o + 0x080015c4 si44_spiread .text.set_property - 0x080016b8 0x3e src/radio.o - 0x080016b8 set_property - *fill* 0x080016f6 0x2 + 0x0800163c 0x3e src/radio.o + 0x0800163c set_property + *fill* 0x0800167a 0x2 .text.initSiTimer - 0x080016f8 0x4c src/radio.o - 0x080016f8 initSiTimer + 0x0800167c 0x4c src/radio.o + 0x0800167c initSiTimer .text.tim1Wait - 0x08001744 0x38 src/radio.o - 0x08001744 tim1Wait - .text.spi_CS 0x0800177c 0x34 src/radio.o - 0x0800177c spi_CS + 0x080016c8 0x38 src/radio.o + 0x080016c8 tim1Wait + .text.spi_CS 0x08001700 0x34 src/radio.o + 0x08001700 spi_CS .text.initSi446x - 0x080017b0 0x2e0 src/radio.o - 0x080017b0 initSi446x + 0x08001734 0x2f0 src/radio.o + 0x08001734 initSi446x .text.check_part_info - 0x08001a90 0xa4 src/radio.o - 0x08001a90 check_part_info + 0x08001a24 0xa4 src/radio.o + 0x08001a24 check_part_info .text.SystemInit - 0x08001b34 0x68 src/system_stm32f10x.o - 0x08001b34 SystemInit + 0x08001ac8 0x68 src/system_stm32f10x.o + 0x08001ac8 SystemInit .text.SystemCoreClockUpdate - 0x08001b9c 0xe0 src/system_stm32f10x.o - 0x08001b9c SystemCoreClockUpdate + 0x08001b30 0xe0 src/system_stm32f10x.o + 0x08001b30 SystemCoreClockUpdate .text.SetSysClock - 0x08001c7c 0xc src/system_stm32f10x.o + 0x08001c10 0xc src/system_stm32f10x.o .text.Reset_Handler - 0x08001c88 0x50 startup/startup_stm32.o - 0x08001c88 Reset_Handler + 0x08001c1c 0x50 startup/startup_stm32.o + 0x08001c1c Reset_Handler .text.Default_Handler - 0x08001cd8 0x2 startup/startup_stm32.o - 0x08001cd8 EXTI2_IRQHandler - 0x08001cd8 TIM8_TRG_COM_IRQHandler - 0x08001cd8 TIM8_CC_IRQHandler - 0x08001cd8 DebugMon_Handler - 0x08001cd8 TIM1_CC_IRQHandler - 0x08001cd8 HardFault_Handler - 0x08001cd8 TIM6_IRQHandler - 0x08001cd8 SysTick_Handler - 0x08001cd8 PVD_IRQHandler - 0x08001cd8 SDIO_IRQHandler - 0x08001cd8 PendSV_Handler - 0x08001cd8 NMI_Handler - 0x08001cd8 EXTI3_IRQHandler - 0x08001cd8 USB_HP_CAN_TX_IRQHandler - 0x08001cd8 EXTI0_IRQHandler - 0x08001cd8 I2C2_EV_IRQHandler - 0x08001cd8 UsageFault_Handler - 0x08001cd8 ADC1_2_IRQHandler - 0x08001cd8 SPI1_IRQHandler - 0x08001cd8 CAN_SCE_IRQHandler - 0x08001cd8 TAMPER_IRQHandler - 0x08001cd8 TIM8_UP_IRQHandler - 0x08001cd8 DMA2_Channel2_IRQHandler - 0x08001cd8 DMA1_Channel4_IRQHandler - 0x08001cd8 USART3_IRQHandler - 0x08001cd8 RTC_IRQHandler - 0x08001cd8 DMA1_Channel7_IRQHandler - 0x08001cd8 UART5_IRQHandler - 0x08001cd8 ADC3_IRQHandler - 0x08001cd8 TIM4_IRQHandler - 0x08001cd8 CAN_RX1_IRQHandler - 0x08001cd8 DMA2_Channel1_IRQHandler - 0x08001cd8 I2C1_EV_IRQHandler - 0x08001cd8 DMA1_Channel6_IRQHandler - 0x08001cd8 UART4_IRQHandler - 0x08001cd8 TIM3_IRQHandler - 0x08001cd8 RCC_IRQHandler - 0x08001cd8 TIM1_TRG_COM_IRQHandler - 0x08001cd8 DMA1_Channel1_IRQHandler - 0x08001cd8 Default_Handler - 0x08001cd8 EXTI15_10_IRQHandler - 0x08001cd8 TIM7_IRQHandler - 0x08001cd8 TIM5_IRQHandler - 0x08001cd8 EXTI9_5_IRQHandler - 0x08001cd8 SPI2_IRQHandler - 0x08001cd8 USB_LP_CAN_RX0_IRQHandler - 0x08001cd8 MemManage_Handler - 0x08001cd8 SVC_Handler - 0x08001cd8 DMA1_Channel5_IRQHandler - 0x08001cd8 EXTI4_IRQHandler - 0x08001cd8 DMA1_Channel3_IRQHandler - 0x08001cd8 FSMC_IRQHandler - 0x08001cd8 TIM1_UP_IRQHandler - 0x08001cd8 WWDG_IRQHandler - 0x08001cd8 TIM2_IRQHandler - 0x08001cd8 TIM1_BRK_IRQHandler - 0x08001cd8 EXTI1_IRQHandler - 0x08001cd8 RTCAlarm_IRQHandler - 0x08001cd8 DMA2_Channel4_5_IRQHandler - 0x08001cd8 USART2_IRQHandler - 0x08001cd8 I2C2_ER_IRQHandler - 0x08001cd8 DMA1_Channel2_IRQHandler - 0x08001cd8 TIM8_BRK_IRQHandler - 0x08001cd8 FLASH_IRQHandler - 0x08001cd8 BusFault_Handler - 0x08001cd8 USART1_IRQHandler - 0x08001cd8 SPI3_IRQHandler - 0x08001cd8 I2C1_ER_IRQHandler - 0x08001cd8 DMA2_Channel3_IRQHandler - *fill* 0x08001cda 0x2 + 0x08001c6c 0x2 startup/startup_stm32.o + 0x08001c6c EXTI2_IRQHandler + 0x08001c6c TIM8_TRG_COM_IRQHandler + 0x08001c6c TIM8_CC_IRQHandler + 0x08001c6c DebugMon_Handler + 0x08001c6c TIM1_CC_IRQHandler + 0x08001c6c HardFault_Handler + 0x08001c6c TIM6_IRQHandler + 0x08001c6c SysTick_Handler + 0x08001c6c PVD_IRQHandler + 0x08001c6c SDIO_IRQHandler + 0x08001c6c PendSV_Handler + 0x08001c6c NMI_Handler + 0x08001c6c EXTI3_IRQHandler + 0x08001c6c USB_HP_CAN_TX_IRQHandler + 0x08001c6c EXTI0_IRQHandler + 0x08001c6c I2C2_EV_IRQHandler + 0x08001c6c UsageFault_Handler + 0x08001c6c ADC1_2_IRQHandler + 0x08001c6c SPI1_IRQHandler + 0x08001c6c CAN_SCE_IRQHandler + 0x08001c6c TAMPER_IRQHandler + 0x08001c6c TIM8_UP_IRQHandler + 0x08001c6c DMA2_Channel2_IRQHandler + 0x08001c6c DMA1_Channel4_IRQHandler + 0x08001c6c USART3_IRQHandler + 0x08001c6c RTC_IRQHandler + 0x08001c6c DMA1_Channel7_IRQHandler + 0x08001c6c UART5_IRQHandler + 0x08001c6c ADC3_IRQHandler + 0x08001c6c TIM4_IRQHandler + 0x08001c6c CAN_RX1_IRQHandler + 0x08001c6c DMA2_Channel1_IRQHandler + 0x08001c6c I2C1_EV_IRQHandler + 0x08001c6c DMA1_Channel6_IRQHandler + 0x08001c6c UART4_IRQHandler + 0x08001c6c TIM3_IRQHandler + 0x08001c6c RCC_IRQHandler + 0x08001c6c TIM1_TRG_COM_IRQHandler + 0x08001c6c DMA1_Channel1_IRQHandler + 0x08001c6c Default_Handler + 0x08001c6c EXTI15_10_IRQHandler + 0x08001c6c TIM7_IRQHandler + 0x08001c6c TIM5_IRQHandler + 0x08001c6c EXTI9_5_IRQHandler + 0x08001c6c SPI2_IRQHandler + 0x08001c6c USB_LP_CAN_RX0_IRQHandler + 0x08001c6c MemManage_Handler + 0x08001c6c SVC_Handler + 0x08001c6c DMA1_Channel5_IRQHandler + 0x08001c6c EXTI4_IRQHandler + 0x08001c6c DMA1_Channel3_IRQHandler + 0x08001c6c FSMC_IRQHandler + 0x08001c6c TIM1_UP_IRQHandler + 0x08001c6c WWDG_IRQHandler + 0x08001c6c TIM2_IRQHandler + 0x08001c6c TIM1_BRK_IRQHandler + 0x08001c6c EXTI1_IRQHandler + 0x08001c6c RTCAlarm_IRQHandler + 0x08001c6c DMA2_Channel4_5_IRQHandler + 0x08001c6c USART2_IRQHandler + 0x08001c6c I2C2_ER_IRQHandler + 0x08001c6c DMA1_Channel2_IRQHandler + 0x08001c6c TIM8_BRK_IRQHandler + 0x08001c6c FLASH_IRQHandler + 0x08001c6c BusFault_Handler + 0x08001c6c USART1_IRQHandler + 0x08001c6c SPI3_IRQHandler + 0x08001c6c I2C1_ER_IRQHandler + 0x08001c6c DMA2_Channel3_IRQHandler + *fill* 0x08001c6e 0x2 .text.__libc_init_array - 0x08001cdc 0x50 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-init.o) - 0x08001cdc __libc_init_array + 0x08001c70 0x50 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-init.o) + 0x08001c70 __libc_init_array .text.startup.register_fini - 0x08001d2c 0x14 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-__call_atexit.o) - .text.atexit 0x08001d40 0xc d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-atexit.o) - 0x08001d40 atexit + 0x08001cc0 0x14 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-__call_atexit.o) + .text.atexit 0x08001cd4 0xc d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-atexit.o) + 0x08001cd4 atexit .text.__libc_fini_array - 0x08001d4c 0x34 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-fini.o) - 0x08001d4c __libc_fini_array + 0x08001ce0 0x34 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-fini.o) + 0x08001ce0 __libc_fini_array .text.__retarget_lock_acquire_recursive - 0x08001d80 0x4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-lock.o) - 0x08001d80 __retarget_lock_acquire_recursive + 0x08001d14 0x4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-lock.o) + 0x08001d14 __retarget_lock_acquire_recursive .text.__retarget_lock_release_recursive - 0x08001d84 0x4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-lock.o) - 0x08001d84 __retarget_lock_release_recursive + 0x08001d18 0x4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-lock.o) + 0x08001d18 __retarget_lock_release_recursive .text.__register_exitproc - 0x08001d88 0xc4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-__atexit.o) - 0x08001d88 __register_exitproc + 0x08001d1c 0xc4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-__atexit.o) + 0x08001d1c __register_exitproc *(.glue_7) - .glue_7 0x08001e4c 0x0 linker stubs + .glue_7 0x08001de0 0x0 linker stubs *(.glue_7t) - .glue_7t 0x08001e4c 0x0 linker stubs + .glue_7t 0x08001de0 0x0 linker stubs *(.eh_frame) - .eh_frame 0x08001e4c 0x0 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crtbegin.o + .eh_frame 0x08001de0 0x0 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crtbegin.o *(.init) - .init 0x08001e4c 0x4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crti.o - 0x08001e4c _init - .init 0x08001e50 0x8 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crtn.o + .init 0x08001de0 0x4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crti.o + 0x08001de0 _init + .init 0x08001de4 0x8 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crtn.o *(.fini) - .fini 0x08001e58 0x4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crti.o - 0x08001e58 _fini - .fini 0x08001e5c 0x8 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crtn.o - 0x08001e64 . = ALIGN (0x4) - 0x08001e64 _etext = . + .fini 0x08001dec 0x4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crti.o + 0x08001dec _fini + .fini 0x08001df0 0x8 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crtn.o + 0x08001df8 . = ALIGN (0x4) + 0x08001df8 _etext = . -.vfp11_veneer 0x08001e64 0x0 - .vfp11_veneer 0x08001e64 0x0 linker stubs +.vfp11_veneer 0x08001df8 0x0 + .vfp11_veneer 0x08001df8 0x0 linker stubs -.v4_bx 0x08001e64 0x0 - .v4_bx 0x08001e64 0x0 linker stubs +.v4_bx 0x08001df8 0x0 + .v4_bx 0x08001df8 0x0 linker stubs -.iplt 0x08001e64 0x0 - .iplt 0x08001e64 0x0 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crtbegin.o +.iplt 0x08001df8 0x0 + .iplt 0x08001df8 0x0 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crtbegin.o -.rodata 0x08001e64 0x4 - 0x08001e64 . = ALIGN (0x4) +.rodata 0x08001df8 0x4 + 0x08001df8 . = ALIGN (0x4) *(.rodata) *(.rodata*) .rodata._global_impure_ptr - 0x08001e64 0x4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-impure.o) - 0x08001e64 _global_impure_ptr - 0x08001e68 . = ALIGN (0x4) + 0x08001df8 0x4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-impure.o) + 0x08001df8 _global_impure_ptr + 0x08001dfc . = ALIGN (0x4) -.rel.dyn 0x08001e68 0x0 - .rel.iplt 0x08001e68 0x0 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crtbegin.o +.rel.dyn 0x08001dfc 0x0 + .rel.iplt 0x08001dfc 0x0 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crtbegin.o -.ARM.extab 0x08001e68 0x0 - 0x08001e68 . = ALIGN (0x4) +.ARM.extab 0x08001dfc 0x0 + 0x08001dfc . = ALIGN (0x4) *(.ARM.extab* .gnu.linkonce.armextab.*) - 0x08001e68 . = ALIGN (0x4) + 0x08001dfc . = ALIGN (0x4) -.ARM 0x08001e68 0x0 - 0x08001e68 . = ALIGN (0x4) - 0x08001e68 __exidx_start = . +.ARM 0x08001dfc 0x0 + 0x08001dfc . = ALIGN (0x4) + 0x08001dfc __exidx_start = . *(.ARM.exidx*) - 0x08001e68 __exidx_end = . - 0x08001e68 . = ALIGN (0x4) + 0x08001dfc __exidx_end = . + 0x08001dfc . = ALIGN (0x4) -.preinit_array 0x08001e68 0x0 - 0x08001e68 . = ALIGN (0x4) - 0x08001e68 PROVIDE (__preinit_array_start, .) +.preinit_array 0x08001dfc 0x0 + 0x08001dfc . = ALIGN (0x4) + 0x08001dfc PROVIDE (__preinit_array_start, .) *(.preinit_array*) - 0x08001e68 PROVIDE (__preinit_array_end, .) - 0x08001e68 . = ALIGN (0x4) + 0x08001dfc PROVIDE (__preinit_array_end, .) + 0x08001dfc . = ALIGN (0x4) -.init_array 0x08001e68 0x8 - 0x08001e68 . = ALIGN (0x4) - 0x08001e68 PROVIDE (__init_array_start, .) +.init_array 0x08001dfc 0x8 + 0x08001dfc . = ALIGN (0x4) + 0x08001dfc PROVIDE (__init_array_start, .) *(SORT(.init_array.*)) .init_array.00000 - 0x08001e68 0x4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-__call_atexit.o) + 0x08001dfc 0x4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/../../../../arm-none-eabi/lib/thumb/v7-m\libc.a(lib_a-__call_atexit.o) *(.init_array*) - .init_array 0x08001e6c 0x4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crtbegin.o - 0x08001e70 PROVIDE (__init_array_end, .) - 0x08001e70 . = ALIGN (0x4) + .init_array 0x08001e00 0x4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crtbegin.o + 0x08001e04 PROVIDE (__init_array_end, .) + 0x08001e04 . = ALIGN (0x4) -.fini_array 0x08001e70 0x4 - 0x08001e70 . = ALIGN (0x4) - 0x08001e70 PROVIDE (__fini_array_start, .) +.fini_array 0x08001e04 0x4 + 0x08001e04 . = ALIGN (0x4) + 0x08001e04 PROVIDE (__fini_array_start, .) *(SORT(.fini_array.*)) *(.fini_array*) - .fini_array 0x08001e70 0x4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crtbegin.o - 0x08001e74 PROVIDE (__fini_array_end, .) - 0x08001e74 . = ALIGN (0x4) - 0x08001e74 _sidata = LOADADDR (.data) + .fini_array 0x08001e04 0x4 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crtbegin.o + 0x08001e08 PROVIDE (__fini_array_end, .) + 0x08001e08 . = ALIGN (0x4) + 0x08001e08 _sidata = LOADADDR (.data) -.data 0x20000000 0x454 load address 0x08001e74 +.data 0x20000000 0x454 load address 0x08001e08 0x20000000 . = ALIGN (0x4) 0x20000000 _sdata = . *(.data) @@ -3833,14 +3832,14 @@ LOAD d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15 0x20000454 . = ALIGN (0x4) 0x20000454 _edata = . -.jcr 0x20000454 0x0 load address 0x080022c8 +.jcr 0x20000454 0x0 load address 0x0800225c .jcr 0x20000454 0x0 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crtbegin.o -.igot.plt 0x20000454 0x0 load address 0x080022c8 +.igot.plt 0x20000454 0x0 load address 0x0800225c .igot.plt 0x20000454 0x0 d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15.0.201708311556/tools/compiler/bin/../lib/gcc/arm-none-eabi/6.3.1/thumb/v7-m/crtbegin.o 0x20000454 . = ALIGN (0x4) -.bss 0x20000454 0x140 load address 0x080022c8 +.bss 0x20000454 0x140 load address 0x0800225c 0x20000454 _sbss = . 0x20000454 __bss_start__ = _sbss *(.bss) @@ -3865,7 +3864,7 @@ LOAD d:/ac6/systemworkbench/plugins/fr.ac6.mcu.externaltools.arm-none.win32_1.15 0x20000594 __bss_end__ = _ebss ._user_heap_stack - 0x20000594 0x404 load address 0x080022c8 + 0x20000594 0x404 load address 0x0800225c 0x20000598 . = ALIGN (0x8) *fill* 0x20000594 0x4 0x20000598 PROVIDE (end, .) @@ -4029,7 +4028,7 @@ OUTPUT(spino_code.elf elf32-littlearm) .debug_macro 0x00002a47 0x1a8 src/radio.o .debug_macro 0x00002bef 0x188 src/system_stm32f10x.o -.debug_line 0x00000000 0x5829 +.debug_line 0x00000000 0x582a .debug_line 0x00000000 0x6a3 StdPeriph_Driver/src/stm32f10x_dma.o .debug_line 0x000006a3 0x73a StdPeriph_Driver/src/stm32f10x_gpio.o .debug_line 0x00000ddd 0x83d StdPeriph_Driver/src/stm32f10x_i2c.o @@ -4040,9 +4039,9 @@ OUTPUT(spino_code.elf elf32-littlearm) .debug_line 0x00003a0d 0x386 src/datafifo.o .debug_line 0x00003d93 0x624 src/main.o .debug_line 0x000043b7 0x6aa src/periph.o - .debug_line 0x00004a61 0x7a8 src/radio.o - .debug_line 0x00005209 0x5a4 src/system_stm32f10x.o - .debug_line 0x000057ad 0x7c startup/startup_stm32.o + .debug_line 0x00004a61 0x7a9 src/radio.o + .debug_line 0x0000520a 0x5a4 src/system_stm32f10x.o + .debug_line 0x000057ae 0x7c startup/startup_stm32.o .debug_str 0x00000000 0x50354 .debug_str 0x00000000 0x4cfcd StdPeriph_Driver/src/stm32f10x_dma.o diff --git a/spino_code/Debug/spino_code.bin b/spino_code/Debug/spino_code.bin index 1f8370955c0db448a837946ce3992e13d6a2399c..01e6fb043d5f46f97fc498b538279d7184a222f9 100644 Binary files a/spino_code/Debug/spino_code.bin and b/spino_code/Debug/spino_code.bin differ diff --git a/spino_code/Debug/spino_code.elf b/spino_code/Debug/spino_code.elf index 2a364a516899546b23d4ef441a2953b42250f847..ce99b28e367df5e6275bfefcb6c76537b7d0b224 100644 Binary files a/spino_code/Debug/spino_code.elf and b/spino_code/Debug/spino_code.elf differ diff --git a/spino_code/src/radio.c b/spino_code/src/radio.c index 995567daec53e28734976711e615ba1badad1cc0..2e1456c1ead77a34254b759c4e29675a02a7751a 100644 --- a/spino_code/src/radio.c +++ b/spino_code/src/radio.c @@ -103,6 +103,8 @@ void spi_CS(uint8_t enable) { void initSi446x() { initSiTimer(); + GPIO_ResetBits(GPIOB, SI_SHDN); + tim1Wait(60000); GPIO_SetBits(GPIOB, SI_SHDN); tim1Wait(60000); GPIO_ResetBits(GPIOB, SI_SHDN); @@ -216,10 +218,11 @@ void check_part_info() { si44_spisend(PART_INFO); spi_CS(0); - spi_CS(1); - while(si44_getcts() != 0xFF); - spi_CS(0); -// while(!GPIO_ReadInputDataBit(GPIOA, SI_CTS)); +// spi_CS(1); +// while(si44_getcts() != 0xFF); +// spi_CS(0); + tim1Wait(1000); + while(!GPIO_ReadInputDataBit(GPIOA, SI_CTS)); uint8_t part_info[9]; spi_CS(1);