diff --git a/Drivers/MyTimer.c b/Drivers/MyTimer.c index 6a7af73..b9a2a48 100644 --- a/Drivers/MyTimer.c +++ b/Drivers/MyTimer.c @@ -20,6 +20,7 @@ void MyTimer_EncoderMode_Conf ( TIM_TypeDef * TIM ) { TIM->PSC = 0; // Réglage de la période du Timer TIM->ARR = 360*4; + RCC->APB1ENR |= RCC_APB1ENR_TIM4EN ; // CC1S= ‘01’ (TIMx_CCMR1 register, TI1FP1 mapped on TI1) TIM->CCMR1 &= ~TIM_CCMR1_CC1S; diff --git a/Keil_Commun/Listings/projet_chavirement.map b/Keil_Commun/Listings/projet_chavirement.map index c0648e4..1bac1e9 100644 --- a/Keil_Commun/Listings/projet_chavirement.map +++ b/Keil_Commun/Listings/projet_chavirement.map @@ -17,11 +17,13 @@ Section Cross References mytimer.o(i.TIM3_IRQHandler) refers to mytimer.o(.data) for PtrF mytimer.o(i.TIM4_IRQHandler) refers to mytimer.o(.data) for PtrF principal.o(i.main) refers to driver_gpio.o(i.MyGPIO_Activate) for MyGPIO_Activate + principal.o(i.main) refers to bordage.o(i.init_bordage) for init_bordage + principal.o(i.main) refers to bordage.o(i.init_codeur_incr) for init_codeur_incr principal.o(i.main) refers to chavirement.o(i.chavirement_init) for chavirement_init - principal.o(i.main) refers to chavirement.o(i.chavirement_handler) for chavirement_handler - principal.o(i.main) refers to principal.o(.data) for value + principal.o(i.main) refers to tourniquet.o(i.tourniquet_init) for tourniquet_init chavirement.o(i.chavirement_handler) refers to chavirement.o(i.lire) for lire chavirement.o(i.chavirement_handler) refers to bordage.o(i.Roulis_Handler) for Roulis_Handler + chavirement.o(i.chavirement_handler) refers to chavirement.o(.data) for localvalue chavirement.o(i.chavirement_init) refers to driver_spi.o(i.SPI_init_master) for SPI_init_master chavirement.o(i.chavirement_init) refers to chavirement.o(i.ecrire) for ecrire chavirement.o(i.chavirement_init) refers to chavirement.o(i.lire) for lire @@ -33,19 +35,37 @@ Section Cross References chavirement.o(i.lire) refers to driver_spi.o(i.SPI_send) for SPI_send chavirement.o(i.lire) refers to driver_spi.o(i.SPI_rcv) for SPI_rcv chavirement.o(i.lire) refers to driver_gpio.o(i.MyGPIO_Set) for MyGPIO_Set + bordage.o(i.IT_bordage_auto) refers to bordage.o(i.calcul_angle_voile) for calcul_angle_voile + bordage.o(i.IT_bordage_auto) refers to bordage.o(i.bordage) for bordage + bordage.o(i.IT_bordage_auto) refers to bordage.o(.data) for tempo_chavirement bordage.o(i.Roulis_Handler) refers to bordage.o(i.bordage) for bordage + bordage.o(i.Roulis_Handler) refers to bordage.o(.data) for tempo_chavirement bordage.o(i.bordage) refers to dflti.o(.text) for __aeabi_i2d bordage.o(i.bordage) refers to dadd.o(.text) for __aeabi_drsub bordage.o(i.bordage) refers to d2f.o(.text) for __aeabi_d2f bordage.o(i.bordage) refers to f2d.o(.text) for __aeabi_f2d bordage.o(i.bordage) refers to ddiv.o(.text) for __aeabi_ddiv - bordage.o(i.bordage) refers to mytimer.o(i.MyTimer_Base_Init) for MyTimer_Base_Init - bordage.o(i.bordage) refers to driver_gpio.o(i.MyGPIO_Init) for MyGPIO_Init - bordage.o(i.bordage) refers to mytimer.o(i.MyTimer_PWM) for MyTimer_PWM bordage.o(i.bordage) refers to ffixui.o(.text) for __aeabi_f2uiz bordage.o(i.bordage) refers to mytimer.o(i.Set_Duty_Cycle) for Set_Duty_Cycle + bordage.o(i.calcul_angle_voile) refers to dflti.o(.text) for __aeabi_i2d + bordage.o(i.calcul_angle_voile) refers to dmul.o(.text) for __aeabi_dmul + bordage.o(i.calcul_angle_voile) refers to ddiv.o(.text) for __aeabi_ddiv + bordage.o(i.calcul_angle_voile) refers to dfixi.o(.text) for __aeabi_d2iz + bordage.o(i.init_bordage) refers to mytimer.o(i.MyTimer_Base_Init) for MyTimer_Base_Init + bordage.o(i.init_bordage) refers to driver_gpio.o(i.MyGPIO_Init) for MyGPIO_Init + bordage.o(i.init_bordage) refers to mytimer.o(i.MyTimer_PWM) for MyTimer_PWM + bordage.o(i.init_codeur_incr) refers to driver_gpio.o(i.MyGPIO_Init) for MyGPIO_Init + bordage.o(i.init_codeur_incr) refers to bordage.o(i.init_exti_interrupt) for init_exti_interrupt + bordage.o(i.init_codeur_incr) refers to mytimer.o(i.MyTimer_EncoderMode_Conf) for MyTimer_EncoderMode_Conf + tourniquet.o(i.tourniquet_handler) refers to tourniquet.o(.data) for tourniquet_curseur + tourniquet.o(i.tourniquet_init) refers to mytimer.o(i.MyTimer_ActiveIT) for MyTimer_ActiveIT + tourniquet.o(i.tourniquet_init) refers to tourniquet.o(.data) for tourniquet_curseur + tourniquet.o(i.tourniquet_init) refers to tourniquet.o(i.tourniquet_handler) for tourniquet_handler + tourniquet.o(.data) refers to chavirement.o(i.chavirement_handler) for chavirement_handler + tourniquet.o(.data) refers to bordage.o(i.IT_bordage_auto) for IT_bordage_auto startup_stm32f10x_md.o(RESET) refers to startup_stm32f10x_md.o(STACK) for __initial_sp startup_stm32f10x_md.o(RESET) refers to startup_stm32f10x_md.o(.text) for Reset_Handler + startup_stm32f10x_md.o(RESET) refers to bordage.o(i.EXTI9_5_IRQHandler) for EXTI9_5_IRQHandler startup_stm32f10x_md.o(RESET) refers to mytimer.o(i.TIM1_UP_IRQHandler) for TIM1_UP_IRQHandler startup_stm32f10x_md.o(RESET) refers to mytimer.o(i.TIM2_IRQHandler) for TIM2_IRQHandler startup_stm32f10x_md.o(RESET) refers to mytimer.o(i.TIM3_IRQHandler) for TIM3_IRQHandler @@ -67,11 +87,15 @@ Section Cross References dadd.o(.text) refers to llshl.o(.text) for __aeabi_llsl dadd.o(.text) refers to llsshr.o(.text) for __aeabi_lasr dadd.o(.text) refers to depilogue.o(.text) for _double_epilogue + dmul.o(.text) refers (Special) to iusefp.o(.text) for __I$use$fp + dmul.o(.text) refers to depilogue.o(.text) for _double_epilogue ddiv.o(.text) refers (Special) to iusefp.o(.text) for __I$use$fp ddiv.o(.text) refers to depilogue.o(.text) for _double_round dflti.o(.text) refers (Special) to iusefp.o(.text) for __I$use$fp dflti.o(.text) refers to depilogue.o(.text) for _double_epilogue ffixui.o(.text) refers (Special) to iusefp.o(.text) for __I$use$fp + dfixi.o(.text) refers (Special) to iusefp.o(.text) for __I$use$fp + dfixi.o(.text) refers to llushr.o(.text) for __aeabi_llsr f2d.o(.text) refers (Special) to iusefp.o(.text) for __I$use$fp d2f.o(.text) refers (Special) to iusefp.o(.text) for __I$use$fp d2f.o(.text) refers to fepilogue.o(.text) for _float_round @@ -102,17 +126,19 @@ Removing Unused input sections from the image. Removing mytimer.o(.rev16_text), (4 bytes). Removing mytimer.o(.revsh_text), (4 bytes). Removing mytimer.o(.rrx_text), (6 bytes). - Removing mytimer.o(i.MyTimer_ActiveIT), (112 bytes). - Removing mytimer.o(i.MyTimer_EncoderMode_Conf), (124 bytes). Removing principal.o(.rev16_text), (4 bytes). Removing principal.o(.revsh_text), (4 bytes). Removing principal.o(.rrx_text), (6 bytes). + Removing principal.o(.data), (2 bytes). Removing chavirement.o(.rev16_text), (4 bytes). Removing chavirement.o(.revsh_text), (4 bytes). Removing chavirement.o(.rrx_text), (6 bytes). Removing bordage.o(.rev16_text), (4 bytes). Removing bordage.o(.revsh_text), (4 bytes). Removing bordage.o(.rrx_text), (6 bytes). + Removing tourniquet.o(.rev16_text), (4 bytes). + Removing tourniquet.o(.revsh_text), (4 bytes). + Removing tourniquet.o(.rrx_text), (6 bytes). Removing startup_stm32f10x_md.o(HEAP), (512 bytes). Removing system_stm32f10x.o(.rev16_text), (4 bytes). Removing system_stm32f10x.o(.revsh_text), (4 bytes). @@ -120,7 +146,7 @@ Removing Unused input sections from the image. Removing system_stm32f10x.o(i.SystemCoreClockUpdate), (164 bytes). Removing system_stm32f10x.o(.data), (20 bytes). -28 unused section(s) (total 1078 bytes) removed from the image. +30 unused section(s) (total 858 bytes) removed from the image. ============================================================================== @@ -130,43 +156,47 @@ Image Symbol Table Symbol Name Value Ov Type Size Object(Section) - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry5.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry10b.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry10a.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11b.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry9b.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry9a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8b.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7b.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12b.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12a.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8a.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry10a.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11a.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry10b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry5.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7a.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry9b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.o ABSOLUTE + ../clib/microlib/longlong.c 0x00000000 Number 0 llshl.o ABSOLUTE ../clib/microlib/longlong.c 0x00000000 Number 0 llushr.o ABSOLUTE ../clib/microlib/longlong.c 0x00000000 Number 0 llsshr.o ABSOLUTE - ../clib/microlib/longlong.c 0x00000000 Number 0 llshl.o ABSOLUTE ../clib/microlib/stubs.s 0x00000000 Number 0 iusefp.o ABSOLUTE ../fplib/microlib/d2f.c 0x00000000 Number 0 d2f.o ABSOLUTE ../fplib/microlib/f2d.c 0x00000000 Number 0 f2d.o ABSOLUTE ../fplib/microlib/fpadd.c 0x00000000 Number 0 dadd.o ABSOLUTE ../fplib/microlib/fpdiv.c 0x00000000 Number 0 ddiv.o ABSOLUTE - ../fplib/microlib/fpepilogue.c 0x00000000 Number 0 depilogue.o ABSOLUTE ../fplib/microlib/fpepilogue.c 0x00000000 Number 0 fepilogue.o ABSOLUTE + ../fplib/microlib/fpepilogue.c 0x00000000 Number 0 depilogue.o ABSOLUTE + ../fplib/microlib/fpfix.c 0x00000000 Number 0 dfixi.o ABSOLUTE ../fplib/microlib/fpfix.c 0x00000000 Number 0 ffixui.o ABSOLUTE ../fplib/microlib/fpflt.c 0x00000000 Number 0 dflti.o ABSOLUTE + ../fplib/microlib/fpmul.c 0x00000000 Number 0 dmul.o ABSOLUTE ..\Drivers\Driver_GPIO.c 0x00000000 Number 0 driver_gpio.o ABSOLUTE ..\Drivers\Driver_SPI.c 0x00000000 Number 0 driver_spi.o ABSOLUTE ..\Drivers\MyTimer.c 0x00000000 Number 0 mytimer.o ABSOLUTE ..\Sources\bordage.c 0x00000000 Number 0 bordage.o ABSOLUTE ..\Sources\chavirement.c 0x00000000 Number 0 chavirement.o ABSOLUTE + ..\Sources\tourniquet.c 0x00000000 Number 0 tourniquet.o ABSOLUTE ..\\Drivers\\Driver_GPIO.c 0x00000000 Number 0 driver_gpio.o ABSOLUTE ..\\Drivers\\Driver_SPI.c 0x00000000 Number 0 driver_spi.o ABSOLUTE ..\\Drivers\\MyTimer.c 0x00000000 Number 0 mytimer.o ABSOLUTE ..\\Sources\\bordage.c 0x00000000 Number 0 bordage.o ABSOLUTE ..\\Sources\\chavirement.c 0x00000000 Number 0 chavirement.o ABSOLUTE + ..\\Sources\\tourniquet.c 0x00000000 Number 0 tourniquet.o ABSOLUTE Local_Sources\\principal.c 0x00000000 Number 0 principal.o ABSOLUTE Local_Sources\principal.c 0x00000000 Number 0 principal.o ABSOLUTE RTE\Device\STM32F103RB\startup_stm32f10x_md.s 0x00000000 Number 0 startup_stm32f10x_md.o ABSOLUTE @@ -189,53 +219,66 @@ Image Symbol Table __lit__00000000 0x08000100 Data 4 entry2.o(.ARM.Collect$$$$00002712) .text 0x08000104 Section 36 startup_stm32f10x_md.o(.text) .text 0x08000128 Section 0 dadd.o(.text) - .text 0x08000276 Section 0 ddiv.o(.text) - .text 0x08000354 Section 0 dflti.o(.text) - .text 0x08000376 Section 0 ffixui.o(.text) - .text 0x0800039e Section 0 f2d.o(.text) - .text 0x080003c4 Section 0 d2f.o(.text) - .text 0x080003fc Section 0 llshl.o(.text) - .text 0x0800041a Section 0 llsshr.o(.text) - .text 0x0800043e Section 0 fepilogue.o(.text) - .text 0x0800043e Section 0 iusefp.o(.text) - .text 0x080004ac Section 0 depilogue.o(.text) - .text 0x08000568 Section 36 init.o(.text) - .text 0x0800058c Section 0 llushr.o(.text) - i.MyGPIO_Activate 0x080005ac Section 0 driver_gpio.o(i.MyGPIO_Activate) - i.MyGPIO_Init 0x080005c4 Section 0 driver_gpio.o(i.MyGPIO_Init) - i.MyGPIO_Reset 0x0800066a Section 0 driver_gpio.o(i.MyGPIO_Reset) - i.MyGPIO_Set 0x08000676 Section 0 driver_gpio.o(i.MyGPIO_Set) - i.MyTimer_Base_Init 0x08000680 Section 0 mytimer.o(i.MyTimer_Base_Init) - i.MyTimer_PWM 0x080006fc Section 0 mytimer.o(i.MyTimer_PWM) - i.Roulis_Handler 0x08000774 Section 0 bordage.o(i.Roulis_Handler) - i.SPI_activate_clock 0x08000780 Section 0 driver_spi.o(i.SPI_activate_clock) - i.SPI_init_master 0x080007bc Section 0 driver_spi.o(i.SPI_init_master) - i.SPI_rcv 0x08000884 Section 0 driver_spi.o(i.SPI_rcv) - i.SPI_send 0x080008a8 Section 0 driver_spi.o(i.SPI_send) - i.SetSysClock 0x080008c6 Section 0 system_stm32f10x.o(i.SetSysClock) - SetSysClock 0x080008c7 Thumb Code 8 system_stm32f10x.o(i.SetSysClock) - i.SetSysClockTo72 0x080008d0 Section 0 system_stm32f10x.o(i.SetSysClockTo72) - SetSysClockTo72 0x080008d1 Thumb Code 214 system_stm32f10x.o(i.SetSysClockTo72) - i.Set_Duty_Cycle 0x080009b0 Section 0 mytimer.o(i.Set_Duty_Cycle) - i.SystemInit 0x080009fc Section 0 system_stm32f10x.o(i.SystemInit) - i.TIM1_UP_IRQHandler 0x08000a5c Section 0 mytimer.o(i.TIM1_UP_IRQHandler) - i.TIM2_IRQHandler 0x08000a80 Section 0 mytimer.o(i.TIM2_IRQHandler) - i.TIM3_IRQHandler 0x08000aa4 Section 0 mytimer.o(i.TIM3_IRQHandler) - i.TIM4_IRQHandler 0x08000ac8 Section 0 mytimer.o(i.TIM4_IRQHandler) - i.__scatterload_copy 0x08000aec Section 14 handlers.o(i.__scatterload_copy) - i.__scatterload_null 0x08000afa Section 2 handlers.o(i.__scatterload_null) - i.__scatterload_zeroinit 0x08000afc Section 14 handlers.o(i.__scatterload_zeroinit) - i.bordage 0x08000b0c Section 0 bordage.o(i.bordage) - i.chavirement_handler 0x08000bb4 Section 0 chavirement.o(i.chavirement_handler) - i.chavirement_init 0x08000bd8 Section 0 chavirement.o(i.chavirement_init) - i.ecrire 0x08000bfc Section 0 chavirement.o(i.ecrire) - i.lire 0x08000c3c Section 0 chavirement.o(i.lire) - i.main 0x08000c80 Section 0 principal.o(i.main) + .text 0x08000276 Section 0 dmul.o(.text) + .text 0x0800035a Section 0 ddiv.o(.text) + .text 0x08000438 Section 0 dflti.o(.text) + .text 0x0800045a Section 0 ffixui.o(.text) + .text 0x08000482 Section 0 dfixi.o(.text) + .text 0x080004c0 Section 0 f2d.o(.text) + .text 0x080004e6 Section 0 d2f.o(.text) + .text 0x0800051e Section 0 llshl.o(.text) + .text 0x0800053c Section 0 llushr.o(.text) + .text 0x0800055c Section 0 llsshr.o(.text) + .text 0x08000580 Section 0 fepilogue.o(.text) + .text 0x08000580 Section 0 iusefp.o(.text) + .text 0x080005ee Section 0 depilogue.o(.text) + .text 0x080006a8 Section 36 init.o(.text) + i.EXTI9_5_IRQHandler 0x080006cc Section 0 bordage.o(i.EXTI9_5_IRQHandler) + i.IT_bordage_auto 0x080006e8 Section 0 bordage.o(i.IT_bordage_auto) + i.MyGPIO_Activate 0x08000724 Section 0 driver_gpio.o(i.MyGPIO_Activate) + i.MyGPIO_Init 0x0800073c Section 0 driver_gpio.o(i.MyGPIO_Init) + i.MyGPIO_Reset 0x080007e2 Section 0 driver_gpio.o(i.MyGPIO_Reset) + i.MyGPIO_Set 0x080007ee Section 0 driver_gpio.o(i.MyGPIO_Set) + i.MyTimer_ActiveIT 0x080007f8 Section 0 mytimer.o(i.MyTimer_ActiveIT) + i.MyTimer_Base_Init 0x08000868 Section 0 mytimer.o(i.MyTimer_Base_Init) + i.MyTimer_EncoderMode_Conf 0x080008e4 Section 0 mytimer.o(i.MyTimer_EncoderMode_Conf) + i.MyTimer_PWM 0x08000970 Section 0 mytimer.o(i.MyTimer_PWM) + i.Roulis_Handler 0x080009e8 Section 0 bordage.o(i.Roulis_Handler) + i.SPI_activate_clock 0x080009fc Section 0 driver_spi.o(i.SPI_activate_clock) + i.SPI_init_master 0x08000a38 Section 0 driver_spi.o(i.SPI_init_master) + i.SPI_rcv 0x08000b00 Section 0 driver_spi.o(i.SPI_rcv) + i.SPI_send 0x08000b24 Section 0 driver_spi.o(i.SPI_send) + i.SetSysClock 0x08000b42 Section 0 system_stm32f10x.o(i.SetSysClock) + SetSysClock 0x08000b43 Thumb Code 8 system_stm32f10x.o(i.SetSysClock) + i.SetSysClockTo72 0x08000b4c Section 0 system_stm32f10x.o(i.SetSysClockTo72) + SetSysClockTo72 0x08000b4d Thumb Code 214 system_stm32f10x.o(i.SetSysClockTo72) + i.Set_Duty_Cycle 0x08000c2c Section 0 mytimer.o(i.Set_Duty_Cycle) + i.SystemInit 0x08000c78 Section 0 system_stm32f10x.o(i.SystemInit) + i.TIM1_UP_IRQHandler 0x08000cd8 Section 0 mytimer.o(i.TIM1_UP_IRQHandler) + i.TIM2_IRQHandler 0x08000cfc Section 0 mytimer.o(i.TIM2_IRQHandler) + i.TIM3_IRQHandler 0x08000d20 Section 0 mytimer.o(i.TIM3_IRQHandler) + i.TIM4_IRQHandler 0x08000d44 Section 0 mytimer.o(i.TIM4_IRQHandler) + i.__scatterload_copy 0x08000d68 Section 14 handlers.o(i.__scatterload_copy) + i.__scatterload_null 0x08000d76 Section 2 handlers.o(i.__scatterload_null) + i.__scatterload_zeroinit 0x08000d78 Section 14 handlers.o(i.__scatterload_zeroinit) + i.bordage 0x08000d88 Section 0 bordage.o(i.bordage) + i.calcul_angle_voile 0x08000df0 Section 0 bordage.o(i.calcul_angle_voile) + i.chavirement_handler 0x08000e68 Section 0 chavirement.o(i.chavirement_handler) + i.chavirement_init 0x08000e98 Section 0 chavirement.o(i.chavirement_init) + i.ecrire 0x08000ebc Section 0 chavirement.o(i.ecrire) + i.init_bordage 0x08000efc Section 0 bordage.o(i.init_bordage) + i.init_codeur_incr 0x08000f40 Section 0 bordage.o(i.init_codeur_incr) + i.init_exti_interrupt 0x08000f90 Section 0 bordage.o(i.init_exti_interrupt) + i.lire 0x08001000 Section 0 chavirement.o(i.lire) + i.main 0x08001044 Section 0 principal.o(i.main) + i.tourniquet_handler 0x08001068 Section 0 tourniquet.o(i.tourniquet_handler) + i.tourniquet_init 0x080010bc Section 0 tourniquet.o(i.tourniquet_init) .data 0x20000000 Section 8 driver_spi.o(.data) .data 0x20000008 Section 4 mytimer.o(.data) - .data 0x2000000c Section 2 principal.o(.data) - .data 0x20000010 Section 4 chavirement.o(.data) - STACK 0x20000018 Section 1024 startup_stm32f10x_md.o(STACK) + .data 0x2000000c Section 8 chavirement.o(.data) + .data 0x20000014 Section 4 bordage.o(.data) + .data 0x20000018 Section 12 tourniquet.o(.data) + STACK 0x20000028 Section 1024 startup_stm32f10x_md.o(STACK) Global Symbols @@ -288,7 +331,6 @@ Image Symbol Table EXTI2_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) EXTI3_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) EXTI4_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) - EXTI9_5_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) FLASH_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) I2C1_ER_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) I2C1_EV_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) @@ -314,57 +356,76 @@ Image Symbol Table __aeabi_dadd 0x08000129 Thumb Code 322 dadd.o(.text) __aeabi_dsub 0x0800026b Thumb Code 6 dadd.o(.text) __aeabi_drsub 0x08000271 Thumb Code 6 dadd.o(.text) - __aeabi_ddiv 0x08000277 Thumb Code 222 ddiv.o(.text) - __aeabi_i2d 0x08000355 Thumb Code 34 dflti.o(.text) - __aeabi_f2uiz 0x08000377 Thumb Code 40 ffixui.o(.text) - __aeabi_f2d 0x0800039f Thumb Code 38 f2d.o(.text) - __aeabi_d2f 0x080003c5 Thumb Code 56 d2f.o(.text) - __aeabi_llsl 0x080003fd Thumb Code 30 llshl.o(.text) - _ll_shift_l 0x080003fd Thumb Code 0 llshl.o(.text) - __aeabi_lasr 0x0800041b Thumb Code 36 llsshr.o(.text) - _ll_sshift_r 0x0800041b Thumb Code 0 llsshr.o(.text) - __I$use$fp 0x0800043f Thumb Code 0 iusefp.o(.text) - _float_round 0x0800043f Thumb Code 18 fepilogue.o(.text) - _float_epilogue 0x08000451 Thumb Code 92 fepilogue.o(.text) - _double_round 0x080004ad Thumb Code 30 depilogue.o(.text) - _double_epilogue 0x080004cb Thumb Code 156 depilogue.o(.text) - __scatterload 0x08000569 Thumb Code 28 init.o(.text) - __scatterload_rt2 0x08000569 Thumb Code 0 init.o(.text) - __aeabi_llsr 0x0800058d Thumb Code 32 llushr.o(.text) - _ll_ushift_r 0x0800058d Thumb Code 0 llushr.o(.text) - MyGPIO_Activate 0x080005ad Thumb Code 18 driver_gpio.o(i.MyGPIO_Activate) - MyGPIO_Init 0x080005c5 Thumb Code 166 driver_gpio.o(i.MyGPIO_Init) - MyGPIO_Reset 0x0800066b Thumb Code 12 driver_gpio.o(i.MyGPIO_Reset) - MyGPIO_Set 0x08000677 Thumb Code 8 driver_gpio.o(i.MyGPIO_Set) - MyTimer_Base_Init 0x08000681 Thumb Code 106 mytimer.o(i.MyTimer_Base_Init) - MyTimer_PWM 0x080006fd Thumb Code 120 mytimer.o(i.MyTimer_PWM) - Roulis_Handler 0x08000775 Thumb Code 10 bordage.o(i.Roulis_Handler) - SPI_activate_clock 0x08000781 Thumb Code 54 driver_spi.o(i.SPI_activate_clock) - SPI_init_master 0x080007bd Thumb Code 190 driver_spi.o(i.SPI_init_master) - SPI_rcv 0x08000885 Thumb Code 36 driver_spi.o(i.SPI_rcv) - SPI_send 0x080008a9 Thumb Code 30 driver_spi.o(i.SPI_send) - Set_Duty_Cycle 0x080009b1 Thumb Code 76 mytimer.o(i.Set_Duty_Cycle) - SystemInit 0x080009fd Thumb Code 78 system_stm32f10x.o(i.SystemInit) - TIM1_UP_IRQHandler 0x08000a5d Thumb Code 28 mytimer.o(i.TIM1_UP_IRQHandler) - TIM2_IRQHandler 0x08000a81 Thumb Code 32 mytimer.o(i.TIM2_IRQHandler) - TIM3_IRQHandler 0x08000aa5 Thumb Code 28 mytimer.o(i.TIM3_IRQHandler) - TIM4_IRQHandler 0x08000ac9 Thumb Code 28 mytimer.o(i.TIM4_IRQHandler) - __scatterload_copy 0x08000aed Thumb Code 14 handlers.o(i.__scatterload_copy) - __scatterload_null 0x08000afb Thumb Code 2 handlers.o(i.__scatterload_null) - __scatterload_zeroinit 0x08000afd Thumb Code 14 handlers.o(i.__scatterload_zeroinit) - bordage 0x08000b0d Thumb Code 146 bordage.o(i.bordage) - chavirement_handler 0x08000bb5 Thumb Code 36 chavirement.o(i.chavirement_handler) - chavirement_init 0x08000bd9 Thumb Code 28 chavirement.o(i.chavirement_init) - ecrire 0x08000bfd Thumb Code 54 chavirement.o(i.ecrire) - lire 0x08000c3d Thumb Code 58 chavirement.o(i.lire) - main 0x08000c81 Thumb Code 30 principal.o(i.main) - Region$$Table$$Base 0x08000ca4 Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x08000cc4 Number 0 anon$$obj.o(Region$$Table) + __aeabi_dmul 0x08000277 Thumb Code 228 dmul.o(.text) + __aeabi_ddiv 0x0800035b Thumb Code 222 ddiv.o(.text) + __aeabi_i2d 0x08000439 Thumb Code 34 dflti.o(.text) + __aeabi_f2uiz 0x0800045b Thumb Code 40 ffixui.o(.text) + __aeabi_d2iz 0x08000483 Thumb Code 62 dfixi.o(.text) + __aeabi_f2d 0x080004c1 Thumb Code 38 f2d.o(.text) + __aeabi_d2f 0x080004e7 Thumb Code 56 d2f.o(.text) + __aeabi_llsl 0x0800051f Thumb Code 30 llshl.o(.text) + _ll_shift_l 0x0800051f Thumb Code 0 llshl.o(.text) + __aeabi_llsr 0x0800053d Thumb Code 32 llushr.o(.text) + _ll_ushift_r 0x0800053d Thumb Code 0 llushr.o(.text) + __aeabi_lasr 0x0800055d Thumb Code 36 llsshr.o(.text) + _ll_sshift_r 0x0800055d Thumb Code 0 llsshr.o(.text) + __I$use$fp 0x08000581 Thumb Code 0 iusefp.o(.text) + _float_round 0x08000581 Thumb Code 18 fepilogue.o(.text) + _float_epilogue 0x08000593 Thumb Code 92 fepilogue.o(.text) + _double_round 0x080005ef Thumb Code 30 depilogue.o(.text) + _double_epilogue 0x0800060d Thumb Code 156 depilogue.o(.text) + __scatterload 0x080006a9 Thumb Code 28 init.o(.text) + __scatterload_rt2 0x080006a9 Thumb Code 0 init.o(.text) + EXTI9_5_IRQHandler 0x080006cd Thumb Code 20 bordage.o(i.EXTI9_5_IRQHandler) + IT_bordage_auto 0x080006e9 Thumb Code 50 bordage.o(i.IT_bordage_auto) + MyGPIO_Activate 0x08000725 Thumb Code 18 driver_gpio.o(i.MyGPIO_Activate) + MyGPIO_Init 0x0800073d Thumb Code 166 driver_gpio.o(i.MyGPIO_Init) + MyGPIO_Reset 0x080007e3 Thumb Code 12 driver_gpio.o(i.MyGPIO_Reset) + MyGPIO_Set 0x080007ef Thumb Code 8 driver_gpio.o(i.MyGPIO_Set) + MyTimer_ActiveIT 0x080007f9 Thumb Code 88 mytimer.o(i.MyTimer_ActiveIT) + MyTimer_Base_Init 0x08000869 Thumb Code 106 mytimer.o(i.MyTimer_Base_Init) + MyTimer_EncoderMode_Conf 0x080008e5 Thumb Code 136 mytimer.o(i.MyTimer_EncoderMode_Conf) + MyTimer_PWM 0x08000971 Thumb Code 120 mytimer.o(i.MyTimer_PWM) + Roulis_Handler 0x080009e9 Thumb Code 16 bordage.o(i.Roulis_Handler) + SPI_activate_clock 0x080009fd Thumb Code 54 driver_spi.o(i.SPI_activate_clock) + SPI_init_master 0x08000a39 Thumb Code 190 driver_spi.o(i.SPI_init_master) + SPI_rcv 0x08000b01 Thumb Code 36 driver_spi.o(i.SPI_rcv) + SPI_send 0x08000b25 Thumb Code 30 driver_spi.o(i.SPI_send) + Set_Duty_Cycle 0x08000c2d Thumb Code 76 mytimer.o(i.Set_Duty_Cycle) + SystemInit 0x08000c79 Thumb Code 78 system_stm32f10x.o(i.SystemInit) + TIM1_UP_IRQHandler 0x08000cd9 Thumb Code 28 mytimer.o(i.TIM1_UP_IRQHandler) + TIM2_IRQHandler 0x08000cfd Thumb Code 32 mytimer.o(i.TIM2_IRQHandler) + TIM3_IRQHandler 0x08000d21 Thumb Code 28 mytimer.o(i.TIM3_IRQHandler) + TIM4_IRQHandler 0x08000d45 Thumb Code 28 mytimer.o(i.TIM4_IRQHandler) + __scatterload_copy 0x08000d69 Thumb Code 14 handlers.o(i.__scatterload_copy) + __scatterload_null 0x08000d77 Thumb Code 2 handlers.o(i.__scatterload_null) + __scatterload_zeroinit 0x08000d79 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) + bordage 0x08000d89 Thumb Code 88 bordage.o(i.bordage) + calcul_angle_voile 0x08000df1 Thumb Code 112 bordage.o(i.calcul_angle_voile) + chavirement_handler 0x08000e69 Thumb Code 40 chavirement.o(i.chavirement_handler) + chavirement_init 0x08000e99 Thumb Code 28 chavirement.o(i.chavirement_init) + ecrire 0x08000ebd Thumb Code 54 chavirement.o(i.ecrire) + init_bordage 0x08000efd Thumb Code 58 bordage.o(i.init_bordage) + init_codeur_incr 0x08000f41 Thumb Code 72 bordage.o(i.init_codeur_incr) + init_exti_interrupt 0x08000f91 Thumb Code 92 bordage.o(i.init_exti_interrupt) + lire 0x08001001 Thumb Code 58 chavirement.o(i.lire) + main 0x08001045 Thumb Code 34 principal.o(i.main) + tourniquet_handler 0x08001069 Thumb Code 66 tourniquet.o(i.tourniquet_handler) + tourniquet_init 0x080010bd Thumb Code 26 tourniquet.o(i.tourniquet_init) + Region$$Table$$Base 0x080010e8 Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x08001108 Number 0 anon$$obj.o(Region$$Table) sortieSPI 0x20000000 Data 8 driver_spi.o(.data) PtrF 0x20000008 Data 4 mytimer.o(.data) - value 0x2000000c Data 2 principal.o(.data) - device_id 0x20000010 Data 4 chavirement.o(.data) - __initial_sp 0x20000418 Data 0 startup_stm32f10x_md.o(STACK) + device_id 0x2000000c Data 4 chavirement.o(.data) + localvalue 0x20000010 Data 2 chavirement.o(.data) + lsblocal 0x20000012 Data 1 chavirement.o(.data) + msblocal 0x20000013 Data 1 chavirement.o(.data) + tempo_chavirement 0x20000014 Data 4 bordage.o(.data) + tourniquet_curseur 0x20000018 Data 1 tourniquet.o(.data) + maximum 0x20000019 Data 1 tourniquet.o(.data) + IT_TOURNIQUET_1 0x2000001c Data 4 tourniquet.o(.data) + IT_TOURNIQUET_2 0x20000020 Data 4 tourniquet.o(.data) + __initial_sp 0x20000428 Data 0 startup_stm32f10x_md.o(STACK) @@ -374,90 +435,101 @@ Memory Map of the image Image Entry point : 0x08000105 - Load Region LR_1 (Base: 0x08000000, Size: 0x00000cd8, Max: 0xffffffff, ABSOLUTE) + Load Region LR_1 (Base: 0x08000000, Size: 0x0000112c, Max: 0xffffffff, ABSOLUTE) - Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000cc4, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00001108, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x08000000 0x08000000 0x000000ec Data RO 323 RESET startup_stm32f10x_md.o - 0x080000ec 0x080000ec 0x00000000 Code RO 374 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) - 0x080000ec 0x080000ec 0x00000004 Code RO 389 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) - 0x080000f0 0x080000f0 0x00000004 Code RO 392 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 394 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 396 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) - 0x080000f4 0x080000f4 0x00000008 Code RO 397 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) - 0x080000fc 0x080000fc 0x00000004 Code RO 404 .ARM.Collect$$$$0000000E mc_w.l(entry12b.o) - 0x08000100 0x08000100 0x00000000 Code RO 399 .ARM.Collect$$$$0000000F mc_w.l(entry10a.o) - 0x08000100 0x08000100 0x00000000 Code RO 401 .ARM.Collect$$$$00000011 mc_w.l(entry11a.o) - 0x08000100 0x08000100 0x00000004 Code RO 390 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) - 0x08000104 0x08000104 0x00000024 Code RO 324 * .text startup_stm32f10x_md.o - 0x08000128 0x08000128 0x0000014e Code RO 377 .text mf_w.l(dadd.o) - 0x08000276 0x08000276 0x000000de Code RO 379 .text mf_w.l(ddiv.o) - 0x08000354 0x08000354 0x00000022 Code RO 381 .text mf_w.l(dflti.o) - 0x08000376 0x08000376 0x00000028 Code RO 383 .text mf_w.l(ffixui.o) - 0x0800039e 0x0800039e 0x00000026 Code RO 385 .text mf_w.l(f2d.o) - 0x080003c4 0x080003c4 0x00000038 Code RO 387 .text mf_w.l(d2f.o) - 0x080003fc 0x080003fc 0x0000001e Code RO 405 .text mc_w.l(llshl.o) - 0x0800041a 0x0800041a 0x00000024 Code RO 407 .text mc_w.l(llsshr.o) - 0x0800043e 0x0800043e 0x00000000 Code RO 409 .text mc_w.l(iusefp.o) - 0x0800043e 0x0800043e 0x0000006e Code RO 410 .text mf_w.l(fepilogue.o) - 0x080004ac 0x080004ac 0x000000ba Code RO 412 .text mf_w.l(depilogue.o) - 0x08000566 0x08000566 0x00000002 PAD - 0x08000568 0x08000568 0x00000024 Code RO 414 .text mc_w.l(init.o) - 0x0800058c 0x0800058c 0x00000020 Code RO 416 .text mc_w.l(llushr.o) - 0x080005ac 0x080005ac 0x00000018 Code RO 4 i.MyGPIO_Activate driver_gpio.o - 0x080005c4 0x080005c4 0x000000a6 Code RO 5 i.MyGPIO_Init driver_gpio.o - 0x0800066a 0x0800066a 0x0000000c Code RO 7 i.MyGPIO_Reset driver_gpio.o - 0x08000676 0x08000676 0x00000008 Code RO 8 i.MyGPIO_Set driver_gpio.o - 0x0800067e 0x0800067e 0x00000002 PAD - 0x08000680 0x08000680 0x0000007c Code RO 139 i.MyTimer_Base_Init mytimer.o - 0x080006fc 0x080006fc 0x00000078 Code RO 141 i.MyTimer_PWM mytimer.o - 0x08000774 0x08000774 0x0000000a Code RO 294 i.Roulis_Handler bordage.o - 0x0800077e 0x0800077e 0x00000002 PAD - 0x08000780 0x08000780 0x0000003c Code RO 90 i.SPI_activate_clock driver_spi.o - 0x080007bc 0x080007bc 0x000000c8 Code RO 91 i.SPI_init_master driver_spi.o - 0x08000884 0x08000884 0x00000024 Code RO 92 i.SPI_rcv driver_spi.o - 0x080008a8 0x080008a8 0x0000001e Code RO 93 i.SPI_send driver_spi.o - 0x080008c6 0x080008c6 0x00000008 Code RO 331 i.SetSysClock system_stm32f10x.o - 0x080008ce 0x080008ce 0x00000002 PAD - 0x080008d0 0x080008d0 0x000000e0 Code RO 332 i.SetSysClockTo72 system_stm32f10x.o - 0x080009b0 0x080009b0 0x0000004c Code RO 142 i.Set_Duty_Cycle mytimer.o - 0x080009fc 0x080009fc 0x00000060 Code RO 334 i.SystemInit system_stm32f10x.o - 0x08000a5c 0x08000a5c 0x00000024 Code RO 143 i.TIM1_UP_IRQHandler mytimer.o - 0x08000a80 0x08000a80 0x00000024 Code RO 144 i.TIM2_IRQHandler mytimer.o - 0x08000aa4 0x08000aa4 0x00000024 Code RO 145 i.TIM3_IRQHandler mytimer.o - 0x08000ac8 0x08000ac8 0x00000024 Code RO 146 i.TIM4_IRQHandler mytimer.o - 0x08000aec 0x08000aec 0x0000000e Code RO 420 i.__scatterload_copy mc_w.l(handlers.o) - 0x08000afa 0x08000afa 0x00000002 Code RO 421 i.__scatterload_null mc_w.l(handlers.o) - 0x08000afc 0x08000afc 0x0000000e Code RO 422 i.__scatterload_zeroinit mc_w.l(handlers.o) - 0x08000b0a 0x08000b0a 0x00000002 PAD - 0x08000b0c 0x08000b0c 0x000000a8 Code RO 295 i.bordage bordage.o - 0x08000bb4 0x08000bb4 0x00000024 Code RO 249 i.chavirement_handler chavirement.o - 0x08000bd8 0x08000bd8 0x00000024 Code RO 250 i.chavirement_init chavirement.o - 0x08000bfc 0x08000bfc 0x00000040 Code RO 251 i.ecrire chavirement.o - 0x08000c3c 0x08000c3c 0x00000044 Code RO 252 i.lire chavirement.o - 0x08000c80 0x08000c80 0x00000024 Code RO 216 i.main principal.o - 0x08000ca4 0x08000ca4 0x00000020 Data RO 418 Region$$Table anon$$obj.o + 0x08000000 0x08000000 0x000000ec Data RO 401 RESET startup_stm32f10x_md.o + 0x080000ec 0x080000ec 0x00000000 Code RO 452 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) + 0x080000ec 0x080000ec 0x00000004 Code RO 471 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) + 0x080000f0 0x080000f0 0x00000004 Code RO 474 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 476 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 478 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) + 0x080000f4 0x080000f4 0x00000008 Code RO 479 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) + 0x080000fc 0x080000fc 0x00000004 Code RO 486 .ARM.Collect$$$$0000000E mc_w.l(entry12b.o) + 0x08000100 0x08000100 0x00000000 Code RO 481 .ARM.Collect$$$$0000000F mc_w.l(entry10a.o) + 0x08000100 0x08000100 0x00000000 Code RO 483 .ARM.Collect$$$$00000011 mc_w.l(entry11a.o) + 0x08000100 0x08000100 0x00000004 Code RO 472 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) + 0x08000104 0x08000104 0x00000024 Code RO 402 * .text startup_stm32f10x_md.o + 0x08000128 0x08000128 0x0000014e Code RO 455 .text mf_w.l(dadd.o) + 0x08000276 0x08000276 0x000000e4 Code RO 457 .text mf_w.l(dmul.o) + 0x0800035a 0x0800035a 0x000000de Code RO 459 .text mf_w.l(ddiv.o) + 0x08000438 0x08000438 0x00000022 Code RO 461 .text mf_w.l(dflti.o) + 0x0800045a 0x0800045a 0x00000028 Code RO 463 .text mf_w.l(ffixui.o) + 0x08000482 0x08000482 0x0000003e Code RO 465 .text mf_w.l(dfixi.o) + 0x080004c0 0x080004c0 0x00000026 Code RO 467 .text mf_w.l(f2d.o) + 0x080004e6 0x080004e6 0x00000038 Code RO 469 .text mf_w.l(d2f.o) + 0x0800051e 0x0800051e 0x0000001e Code RO 487 .text mc_w.l(llshl.o) + 0x0800053c 0x0800053c 0x00000020 Code RO 489 .text mc_w.l(llushr.o) + 0x0800055c 0x0800055c 0x00000024 Code RO 491 .text mc_w.l(llsshr.o) + 0x08000580 0x08000580 0x00000000 Code RO 493 .text mc_w.l(iusefp.o) + 0x08000580 0x08000580 0x0000006e Code RO 494 .text mf_w.l(fepilogue.o) + 0x080005ee 0x080005ee 0x000000ba Code RO 496 .text mf_w.l(depilogue.o) + 0x080006a8 0x080006a8 0x00000024 Code RO 498 .text mc_w.l(init.o) + 0x080006cc 0x080006cc 0x0000001c Code RO 297 i.EXTI9_5_IRQHandler bordage.o + 0x080006e8 0x080006e8 0x0000003c Code RO 298 i.IT_bordage_auto bordage.o + 0x08000724 0x08000724 0x00000018 Code RO 4 i.MyGPIO_Activate driver_gpio.o + 0x0800073c 0x0800073c 0x000000a6 Code RO 5 i.MyGPIO_Init driver_gpio.o + 0x080007e2 0x080007e2 0x0000000c Code RO 7 i.MyGPIO_Reset driver_gpio.o + 0x080007ee 0x080007ee 0x00000008 Code RO 8 i.MyGPIO_Set driver_gpio.o + 0x080007f6 0x080007f6 0x00000002 PAD + 0x080007f8 0x080007f8 0x00000070 Code RO 138 i.MyTimer_ActiveIT mytimer.o + 0x08000868 0x08000868 0x0000007c Code RO 139 i.MyTimer_Base_Init mytimer.o + 0x080008e4 0x080008e4 0x0000008c Code RO 140 i.MyTimer_EncoderMode_Conf mytimer.o + 0x08000970 0x08000970 0x00000078 Code RO 141 i.MyTimer_PWM mytimer.o + 0x080009e8 0x080009e8 0x00000014 Code RO 299 i.Roulis_Handler bordage.o + 0x080009fc 0x080009fc 0x0000003c Code RO 90 i.SPI_activate_clock driver_spi.o + 0x08000a38 0x08000a38 0x000000c8 Code RO 91 i.SPI_init_master driver_spi.o + 0x08000b00 0x08000b00 0x00000024 Code RO 92 i.SPI_rcv driver_spi.o + 0x08000b24 0x08000b24 0x0000001e Code RO 93 i.SPI_send driver_spi.o + 0x08000b42 0x08000b42 0x00000008 Code RO 409 i.SetSysClock system_stm32f10x.o + 0x08000b4a 0x08000b4a 0x00000002 PAD + 0x08000b4c 0x08000b4c 0x000000e0 Code RO 410 i.SetSysClockTo72 system_stm32f10x.o + 0x08000c2c 0x08000c2c 0x0000004c Code RO 142 i.Set_Duty_Cycle mytimer.o + 0x08000c78 0x08000c78 0x00000060 Code RO 412 i.SystemInit system_stm32f10x.o + 0x08000cd8 0x08000cd8 0x00000024 Code RO 143 i.TIM1_UP_IRQHandler mytimer.o + 0x08000cfc 0x08000cfc 0x00000024 Code RO 144 i.TIM2_IRQHandler mytimer.o + 0x08000d20 0x08000d20 0x00000024 Code RO 145 i.TIM3_IRQHandler mytimer.o + 0x08000d44 0x08000d44 0x00000024 Code RO 146 i.TIM4_IRQHandler mytimer.o + 0x08000d68 0x08000d68 0x0000000e Code RO 502 i.__scatterload_copy mc_w.l(handlers.o) + 0x08000d76 0x08000d76 0x00000002 Code RO 503 i.__scatterload_null mc_w.l(handlers.o) + 0x08000d78 0x08000d78 0x0000000e Code RO 504 i.__scatterload_zeroinit mc_w.l(handlers.o) + 0x08000d86 0x08000d86 0x00000002 PAD + 0x08000d88 0x08000d88 0x00000068 Code RO 300 i.bordage bordage.o + 0x08000df0 0x08000df0 0x00000078 Code RO 301 i.calcul_angle_voile bordage.o + 0x08000e68 0x08000e68 0x00000030 Code RO 252 i.chavirement_handler chavirement.o + 0x08000e98 0x08000e98 0x00000024 Code RO 253 i.chavirement_init chavirement.o + 0x08000ebc 0x08000ebc 0x00000040 Code RO 254 i.ecrire chavirement.o + 0x08000efc 0x08000efc 0x00000044 Code RO 302 i.init_bordage bordage.o + 0x08000f40 0x08000f40 0x00000050 Code RO 303 i.init_codeur_incr bordage.o + 0x08000f90 0x08000f90 0x00000070 Code RO 304 i.init_exti_interrupt bordage.o + 0x08001000 0x08001000 0x00000044 Code RO 255 i.lire chavirement.o + 0x08001044 0x08001044 0x00000022 Code RO 216 i.main principal.o + 0x08001066 0x08001066 0x00000002 PAD + 0x08001068 0x08001068 0x00000054 Code RO 369 i.tourniquet_handler tourniquet.o + 0x080010bc 0x080010bc 0x0000002c Code RO 370 i.tourniquet_init tourniquet.o + 0x080010e8 0x080010e8 0x00000020 Data RO 500 Region$$Table anon$$obj.o - Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000cc4, Size: 0x00000014, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08001108, Size: 0x00000024, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 0x08000cc4 0x00000008 Data RW 94 .data driver_spi.o - 0x20000008 0x08000ccc 0x00000004 Data RW 147 .data mytimer.o - 0x2000000c 0x08000cd0 0x00000002 Data RW 217 .data principal.o - 0x2000000e 0x08000cd2 0x00000002 PAD - 0x20000010 0x08000cd4 0x00000004 Data RW 253 .data chavirement.o + 0x20000000 0x08001108 0x00000008 Data RW 94 .data driver_spi.o + 0x20000008 0x08001110 0x00000004 Data RW 147 .data mytimer.o + 0x2000000c 0x08001114 0x00000008 Data RW 256 .data chavirement.o + 0x20000014 0x0800111c 0x00000004 Data RW 305 .data bordage.o + 0x20000018 0x08001120 0x0000000c Data RW 371 .data tourniquet.o - Execution Region ER_ZI (Exec base: 0x20000014, Load base: 0x08000cd8, Size: 0x00000404, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_ZI (Exec base: 0x20000024, Load base: 0x0800112c, Size: 0x00000404, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000014 0x08000cd8 0x00000004 PAD - 0x20000018 - 0x00000400 Zero RW 321 STACK startup_stm32f10x_md.o + 0x20000024 0x0800112c 0x00000004 PAD + 0x20000028 - 0x00000400 Zero RW 399 STACK startup_stm32f10x_md.o ============================================================================== @@ -467,19 +539,20 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name - 178 22 0 0 0 1183 bordage.o - 204 28 0 4 0 2513 chavirement.o + 592 84 0 4 0 4555 bordage.o + 216 36 0 8 0 2666 chavirement.o 210 6 0 0 0 209488 driver_gpio.o 326 16 0 8 0 2884 driver_spi.o - 464 46 0 4 0 4877 mytimer.o - 36 6 0 2 0 743 principal.o + 716 74 0 4 0 6131 mytimer.o + 34 0 0 0 0 499 principal.o 36 8 236 0 1024 852 startup_stm32f10x_md.o 328 28 0 0 0 2149 system_stm32f10x.o + 128 36 0 12 0 1804 tourniquet.o ---------------------------------------------------------------------- - 1788 160 268 20 1028 224689 Object Totals + 2592 288 268 36 1028 231028 Object Totals 0 0 32 0 0 0 (incl. Generated) - 6 0 0 2 4 0 (incl. Padding) + 6 0 0 0 4 0 (incl. Padding) ---------------------------------------------------------------------- @@ -504,24 +577,26 @@ Image component sizes 334 0 0 0 0 148 dadd.o 222 0 0 0 0 100 ddiv.o 186 0 0 0 0 176 depilogue.o + 62 0 0 0 0 80 dfixi.o 34 0 0 0 0 76 dflti.o + 228 0 0 0 0 96 dmul.o 38 0 0 0 0 68 f2d.o 110 0 0 0 0 168 fepilogue.o 40 0 0 0 0 68 ffixui.o ---------------------------------------------------------------------- - 1212 16 0 0 0 1164 Library Totals - 4 0 0 0 0 0 (incl. Padding) + 1500 16 0 0 0 1340 Library Totals + 2 0 0 0 0 0 (incl. Padding) ---------------------------------------------------------------------- Code (inc. data) RO Data RW Data ZI Data Debug Library Name 188 16 0 0 0 272 mc_w.l - 1020 0 0 0 0 892 mf_w.l + 1310 0 0 0 0 1068 mf_w.l ---------------------------------------------------------------------- - 1212 16 0 0 0 1164 Library Totals + 1500 16 0 0 0 1340 Library Totals ---------------------------------------------------------------------- @@ -530,15 +605,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 3000 176 268 20 1028 224341 Grand Totals - 3000 176 268 20 1028 224341 ELF Image Totals - 3000 176 268 20 0 0 ROM Totals + 4092 304 268 36 1028 230232 Grand Totals + 4092 304 268 36 1028 230232 ELF Image Totals + 4092 304 268 36 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 3268 ( 3.19kB) - Total RW Size (RW Data + ZI Data) 1048 ( 1.02kB) - Total ROM Size (Code + RO Data + RW Data) 3288 ( 3.21kB) + Total RO Size (Code + RO Data) 4360 ( 4.26kB) + Total RW Size (RW Data + ZI Data) 1064 ( 1.04kB) + Total ROM Size (Code + RO Data + RW Data) 4396 ( 4.29kB) ============================================================================== diff --git a/Keil_Commun/Local_Sources/principal.c b/Keil_Commun/Local_Sources/principal.c index ae40e5f..e0499a0 100644 --- a/Keil_Commun/Local_Sources/principal.c +++ b/Keil_Commun/Local_Sources/principal.c @@ -8,6 +8,8 @@ #include "bordage.h" +#include "tourniquet.h" + uint16_t value = 0; int main(void) { @@ -16,16 +18,10 @@ int main(void) { MyGPIO_Activate(1); MyGPIO_Activate(2); //on init le système de chavirement + init_bordage(); + init_codeur_incr(); + chavirement_init(); - - while (1) { - //on lance le contrôle du chavirement - /*while( i < 1000000 ) { - i++; - } - i = 0;*/ - - value = chavirement_handler(); - } - + tourniquet_init(); + while(1) {} } diff --git a/Keil_Commun/Objects/bordage.crf b/Keil_Commun/Objects/bordage.crf index 3f1aa1d..e46a340 100644 Binary files a/Keil_Commun/Objects/bordage.crf and b/Keil_Commun/Objects/bordage.crf differ diff --git a/Keil_Commun/Objects/bordage.d b/Keil_Commun/Objects/bordage.d index 74dea6f..eedc1a8 100644 --- a/Keil_Commun/Objects/bordage.d +++ b/Keil_Commun/Objects/bordage.d @@ -9,4 +9,5 @@ .\objects\bordage.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h .\objects\bordage.o: C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h .\objects\bordage.o: ..\Drivers\MyTimer.h +.\objects\bordage.o: ..\Drivers\MyADC.h .\objects\bordage.o: ..\Sources\bordage.h diff --git a/Keil_Commun/Objects/bordage.o b/Keil_Commun/Objects/bordage.o index 5eeacad..5970ecf 100644 Binary files a/Keil_Commun/Objects/bordage.o and b/Keil_Commun/Objects/bordage.o differ diff --git a/Keil_Commun/Objects/chavirement.crf b/Keil_Commun/Objects/chavirement.crf index 1022828..12dcbd7 100644 Binary files a/Keil_Commun/Objects/chavirement.crf and b/Keil_Commun/Objects/chavirement.crf differ diff --git a/Keil_Commun/Objects/chavirement.o b/Keil_Commun/Objects/chavirement.o index 5142991..0a720a9 100644 Binary files a/Keil_Commun/Objects/chavirement.o and b/Keil_Commun/Objects/chavirement.o differ diff --git a/Keil_Commun/Objects/driver_gpio.crf b/Keil_Commun/Objects/driver_gpio.crf index c68a6b9..094c885 100644 Binary files a/Keil_Commun/Objects/driver_gpio.crf and b/Keil_Commun/Objects/driver_gpio.crf differ diff --git a/Keil_Commun/Objects/driver_gpio.o b/Keil_Commun/Objects/driver_gpio.o index 693b8ae..911841c 100644 Binary files a/Keil_Commun/Objects/driver_gpio.o and b/Keil_Commun/Objects/driver_gpio.o differ diff --git a/Keil_Commun/Objects/driver_spi.crf b/Keil_Commun/Objects/driver_spi.crf index 6c97495..4ea225c 100644 Binary files a/Keil_Commun/Objects/driver_spi.crf and b/Keil_Commun/Objects/driver_spi.crf differ diff --git a/Keil_Commun/Objects/driver_spi.o b/Keil_Commun/Objects/driver_spi.o index 5cfa400..1eea0ec 100644 Binary files a/Keil_Commun/Objects/driver_spi.o and b/Keil_Commun/Objects/driver_spi.o differ diff --git a/Keil_Commun/Objects/mytimer.crf b/Keil_Commun/Objects/mytimer.crf index 4b6d1b7..f5a1a6f 100644 Binary files a/Keil_Commun/Objects/mytimer.crf and b/Keil_Commun/Objects/mytimer.crf differ diff --git a/Keil_Commun/Objects/mytimer.o b/Keil_Commun/Objects/mytimer.o index 1857849..fb77d8c 100644 Binary files a/Keil_Commun/Objects/mytimer.o and b/Keil_Commun/Objects/mytimer.o differ diff --git a/Keil_Commun/Objects/principal.crf b/Keil_Commun/Objects/principal.crf index 983920a..6655f08 100644 Binary files a/Keil_Commun/Objects/principal.crf and b/Keil_Commun/Objects/principal.crf differ diff --git a/Keil_Commun/Objects/principal.d b/Keil_Commun/Objects/principal.d index e2abb09..e65ef09 100644 --- a/Keil_Commun/Objects/principal.d +++ b/Keil_Commun/Objects/principal.d @@ -10,3 +10,4 @@ .\objects\principal.o: C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h .\objects\principal.o: ..\Drivers\Driver_GPIO.h .\objects\principal.o: ..\Sources\bordage.h +.\objects\principal.o: ..\Sources\tourniquet.h diff --git a/Keil_Commun/Objects/principal.o b/Keil_Commun/Objects/principal.o index b55d643..4edd126 100644 Binary files a/Keil_Commun/Objects/principal.o and b/Keil_Commun/Objects/principal.o differ diff --git a/Keil_Commun/Objects/projet_chavirement.axf b/Keil_Commun/Objects/projet_chavirement.axf index 5b932b0..3ee5653 100644 Binary files a/Keil_Commun/Objects/projet_chavirement.axf and b/Keil_Commun/Objects/projet_chavirement.axf differ diff --git a/Keil_Commun/Objects/projet_chavirement.build_log.htm b/Keil_Commun/Objects/projet_chavirement.build_log.htm index cb16c07..0706880 100644 --- a/Keil_Commun/Objects/projet_chavirement.build_log.htm +++ b/Keil_Commun/Objects/projet_chavirement.build_log.htm @@ -22,12 +22,40 @@ Dialog DLL: TARMSTM.DLL V1.66.0.0

Project:

C:\Users\chauz\Documents_non_drive\INSA\4A\S7\projet_voilier\projet_voilier\Keil_Commun\projet_chavirement.uvprojx -Project File Date: 11/05/2021 +Project File Date: 11/15/2021

Output:

*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin' -Build target 'CarteSTM' -".\Objects\projet_chavirement.axf" - 0 Error(s), 0 Warning(s). +Rebuild target 'CarteSTM' +compiling MyTimer.c... +compiling principal.c... +..\Sources\tourniquet.h(6): warning: #1295-D: Deprecated declaration tourniquet_init - give arg types + void tourniquet_init() ; +..\Sources\tourniquet.h(7): warning: #1295-D: Deprecated declaration tourniquet_handler - give arg types + void tourniquet_handler() ; +..\Sources\tourniquet.h(9): warning: #1-D: last line of file ends without a newline + #endif +Local_Sources\principal.c(16): warning: #177-D: variable "i" was declared but never referenced + int i = 0; +Local_Sources\principal.c: 4 warnings, 0 errors +compiling tourniquet.c... +..\Sources\tourniquet.c(35): warning: #1-D: last line of file ends without a newline + } +..\Sources\tourniquet.c: 1 warning, 0 errors +compiling Driver_SPI.c... +..\Drivers\Driver_SPI.c(80): warning: #550-D: variable "a" was set but never used + int a; +..\Drivers\Driver_SPI.c(101): warning: #177-D: variable "a" was declared but never referenced + int a; +..\Drivers\Driver_SPI.c: 2 warnings, 0 errors +compiling chavirement.c... +compiling bordage.c... +compiling Driver_GPIO.c... +assembling startup_stm32f10x_md.s... +compiling system_stm32f10x.c... +linking... +Program Size: Code=4092 RO-data=268 RW-data=36 ZI-data=1028 +".\Objects\projet_chavirement.axf" - 0 Error(s), 7 Warning(s).

Software Packages used:

@@ -55,10 +83,10 @@ Package Vendor: Keil * Component: Keil::Device:Startup:1.0.0 Include file: RTE_Driver\Config\RTE_Device.h + Source file: Device\Source\ARM\STM32F1xx_OPT.s Source file: Device\Source\ARM\startup_stm32f10x_md.s Source file: Device\Source\system_stm32f10x.c - Source file: Device\Source\ARM\STM32F1xx_OPT.s -Build Time Elapsed: 00:00:00 +Build Time Elapsed: 00:00:01 diff --git a/Keil_Commun/Objects/projet_chavirement.htm b/Keil_Commun/Objects/projet_chavirement.htm index c47a41a..06afd29 100644 --- a/Keil_Commun/Objects/projet_chavirement.htm +++ b/Keil_Commun/Objects/projet_chavirement.htm @@ -3,11 +3,11 @@ Static Call Graph - [.\Objects\projet_chavirement.axf]

Static Call Graph for image .\Objects\projet_chavirement.axf

-

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Mon Nov 15 10:07:44 2021 +

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Mon Nov 15 12:21:34 2021

-

Maximum Stack Usage = 168 bytes + Unknown(Cycles, Untraceable Function Pointers)

+

Maximum Stack Usage = 152 bytes + Unknown(Cycles, Untraceable Function Pointers)

Call chain for Maximum Stack Depth:

-main ⇒ chavirement_handler ⇒ Roulis_Handler ⇒ bordage ⇒ __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round +chavirement_handler ⇒ Roulis_Handler ⇒ bordage ⇒ __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round

Mutually Recursive functions @@ -44,13 +44,14 @@ Function Pointers
  • EXTI2_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • EXTI3_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • EXTI4_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET) -
  • EXTI9_5_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET) +
  • EXTI9_5_IRQHandler from bordage.o(i.EXTI9_5_IRQHandler) referenced from startup_stm32f10x_md.o(RESET)
  • FLASH_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • HardFault_Handler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • I2C1_ER_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • I2C1_EV_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • I2C2_ER_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • I2C2_EV_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET) +
  • IT_bordage_auto from bordage.o(i.IT_bordage_auto) referenced from tourniquet.o(.data)
  • MemManage_Handler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • NMI_Handler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • PVD_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET) @@ -58,7 +59,7 @@ Function Pointers
  • RCC_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • RTCAlarm_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • RTC_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET) -
  • Reset_Handler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET) +
  • Reset_Handler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • SPI1_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • SPI2_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • SVC_Handler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET) @@ -81,7 +82,9 @@ Function Pointers
  • UsageFault_Handler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • WWDG_IRQHandler from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
  • __main from entry.o(.ARM.Collect$$$$00000000) referenced from startup_stm32f10x_md.o(.text) +
  • chavirement_handler from chavirement.o(i.chavirement_handler) referenced from tourniquet.o(.data)
  • main from principal.o(i.main) referenced from entry9a.o(.ARM.Collect$$$$0000000B) +
  • tourniquet_handler from tourniquet.o(i.tourniquet_handler) referenced from tourniquet.o(i.tourniquet_init)

    @@ -90,29 +93,29 @@ Global Symbols

    __main (Thumb, 0 bytes, Stack size unknown bytes, entry.o(.ARM.Collect$$$$00000000))
    [Address Reference Count : 1]

    • startup_stm32f10x_md.o(.text)
    -

    _main_stk (Thumb, 0 bytes, Stack size unknown bytes, entry2.o(.ARM.Collect$$$$00000001)) +

    _main_stk (Thumb, 0 bytes, Stack size unknown bytes, entry2.o(.ARM.Collect$$$$00000001)) -

    _main_scatterload (Thumb, 0 bytes, Stack size unknown bytes, entry5.o(.ARM.Collect$$$$00000004)) -

    [Calls]

    • >>   __scatterload +

      _main_scatterload (Thumb, 0 bytes, Stack size unknown bytes, entry5.o(.ARM.Collect$$$$00000004)) +

      [Calls]

      • >>   __scatterload
      -

      __main_after_scatterload (Thumb, 0 bytes, Stack size unknown bytes, entry5.o(.ARM.Collect$$$$00000004)) -

      [Called By]

      • >>   __scatterload +

        __main_after_scatterload (Thumb, 0 bytes, Stack size unknown bytes, entry5.o(.ARM.Collect$$$$00000004)) +

        [Called By]

        • >>   __scatterload
        -

        _main_clock (Thumb, 0 bytes, Stack size unknown bytes, entry7b.o(.ARM.Collect$$$$00000008)) +

        _main_clock (Thumb, 0 bytes, Stack size unknown bytes, entry7b.o(.ARM.Collect$$$$00000008)) -

        _main_cpp_init (Thumb, 0 bytes, Stack size unknown bytes, entry8b.o(.ARM.Collect$$$$0000000A)) +

        _main_cpp_init (Thumb, 0 bytes, Stack size unknown bytes, entry8b.o(.ARM.Collect$$$$0000000A)) -

        _main_init (Thumb, 0 bytes, Stack size unknown bytes, entry9a.o(.ARM.Collect$$$$0000000B)) +

        _main_init (Thumb, 0 bytes, Stack size unknown bytes, entry9a.o(.ARM.Collect$$$$0000000B)) -

        __rt_lib_shutdown_fini (Thumb, 0 bytes, Stack size unknown bytes, entry12b.o(.ARM.Collect$$$$0000000E)) +

        __rt_lib_shutdown_fini (Thumb, 0 bytes, Stack size unknown bytes, entry12b.o(.ARM.Collect$$$$0000000E)) -

        __rt_final_cpp (Thumb, 0 bytes, Stack size unknown bytes, entry10a.o(.ARM.Collect$$$$0000000F)) +

        __rt_final_cpp (Thumb, 0 bytes, Stack size unknown bytes, entry10a.o(.ARM.Collect$$$$0000000F)) -

        __rt_final_exit (Thumb, 0 bytes, Stack size unknown bytes, entry11a.o(.ARM.Collect$$$$00000011)) +

        __rt_final_exit (Thumb, 0 bytes, Stack size unknown bytes, entry11a.o(.ARM.Collect$$$$00000011)) -

        Reset_Handler (Thumb, 8 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text)) +

        Reset_Handler (Thumb, 8 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))

        NMI_Handler (Thumb, 2 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))

        [Calls]

        • >>   NMI_Handler @@ -229,9 +232,6 @@ Global Symbols

          EXTI4_IRQHandler (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
          [Address Reference Count : 1]

          • startup_stm32f10x_md.o(RESET)
          -

          EXTI9_5_IRQHandler (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text)) -
          [Address Reference Count : 1]

          • startup_stm32f10x_md.o(RESET) -

          FLASH_IRQHandler (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
          [Address Reference Count : 1]

          • startup_stm32f10x_md.o(RESET)
          @@ -298,191 +298,233 @@ Global Symbols

          WWDG_IRQHandler (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
          [Address Reference Count : 1]

          • startup_stm32f10x_md.o(RESET)
          -

          __aeabi_dadd (Thumb, 322 bytes, Stack size 48 bytes, dadd.o(.text)) +

          __aeabi_dadd (Thumb, 322 bytes, Stack size 48 bytes, dadd.o(.text))

          [Stack]

          • Max Depth = 88
          • Call Chain = __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round
          -
          [Calls]
          • >>   __aeabi_lasr -
          • >>   __aeabi_llsl -
          • >>   _double_round -
          • >>   _double_epilogue +
            [Calls]
            • >>   __aeabi_lasr +
            • >>   __aeabi_llsl +
            • >>   _double_round +
            • >>   _double_epilogue
            -
            [Called By]
            • >>   __aeabi_dsub -
            • >>   __aeabi_drsub -
            • >>   bordage +
              [Called By]
              • >>   __aeabi_dsub +
              • >>   __aeabi_drsub +
              • >>   bordage
              -

              __aeabi_dsub (Thumb, 6 bytes, Stack size 0 bytes, dadd.o(.text), UNUSED) -

              [Calls]

              • >>   __aeabi_dadd +

                __aeabi_dsub (Thumb, 6 bytes, Stack size 0 bytes, dadd.o(.text), UNUSED) +

                [Calls]

                • >>   __aeabi_dadd
                -

                __aeabi_drsub (Thumb, 6 bytes, Stack size 0 bytes, dadd.o(.text)) +

                __aeabi_drsub (Thumb, 6 bytes, Stack size 0 bytes, dadd.o(.text))

                [Stack]

                • Max Depth = 88
                • Call Chain = __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round
                -
                [Calls]
                • >>   __aeabi_dadd +
                  [Calls]
                  • >>   __aeabi_dadd
                  -
                  [Called By]
                  • >>   bordage +
                    [Called By]
                    • >>   bordage
                    -

                    __aeabi_ddiv (Thumb, 222 bytes, Stack size 32 bytes, ddiv.o(.text)) +

                    __aeabi_dmul (Thumb, 228 bytes, Stack size 48 bytes, dmul.o(.text)) +

                    [Stack]

                    • Max Depth = 88
                    • Call Chain = __aeabi_dmul ⇒ _double_epilogue ⇒ _double_round +
                    +
                    [Calls]
                    • >>   _double_epilogue +
                    +
                    [Called By]
                    • >>   calcul_angle_voile +
                    + +

                    __aeabi_ddiv (Thumb, 222 bytes, Stack size 32 bytes, ddiv.o(.text))

                    [Stack]

                    • Max Depth = 40
                    • Call Chain = __aeabi_ddiv ⇒ _double_round
                    -
                    [Calls]
                    • >>   _double_round +
                      [Calls]
                      • >>   _double_round
                      -
                      [Called By]
                      • >>   bordage +
                        [Called By]
                        • >>   calcul_angle_voile +
                        • >>   bordage
                        -

                        __aeabi_i2d (Thumb, 34 bytes, Stack size 16 bytes, dflti.o(.text)) +

                        __aeabi_i2d (Thumb, 34 bytes, Stack size 16 bytes, dflti.o(.text))

                        [Stack]

                        • Max Depth = 56
                        • Call Chain = __aeabi_i2d ⇒ _double_epilogue ⇒ _double_round
                        -
                        [Calls]
                        • >>   _double_epilogue +
                          [Calls]
                          • >>   _double_epilogue
                          -
                          [Called By]
                          • >>   bordage +
                            [Called By]
                            • >>   calcul_angle_voile +
                            • >>   bordage
                            -

                            __aeabi_f2uiz (Thumb, 40 bytes, Stack size 0 bytes, ffixui.o(.text)) -

                            [Called By]

                            • >>   bordage +

                              __aeabi_f2uiz (Thumb, 40 bytes, Stack size 0 bytes, ffixui.o(.text)) +

                              [Called By]

                              • >>   bordage
                              -

                              __aeabi_f2d (Thumb, 38 bytes, Stack size 0 bytes, f2d.o(.text)) -

                              [Called By]

                              • >>   bordage +

                                __aeabi_d2iz (Thumb, 62 bytes, Stack size 16 bytes, dfixi.o(.text)) +

                                [Stack]

                                • Max Depth = 16
                                • Call Chain = __aeabi_d2iz +
                                +
                                [Calls]
                                • >>   __aeabi_llsr +
                                +
                                [Called By]
                                • >>   calcul_angle_voile
                                -

                                __aeabi_d2f (Thumb, 56 bytes, Stack size 8 bytes, d2f.o(.text)) +

                                __aeabi_f2d (Thumb, 38 bytes, Stack size 0 bytes, f2d.o(.text)) +

                                [Called By]

                                • >>   bordage +
                                + +

                                __aeabi_d2f (Thumb, 56 bytes, Stack size 8 bytes, d2f.o(.text))

                                [Stack]

                                • Max Depth = 8
                                • Call Chain = __aeabi_d2f
                                -
                                [Calls]
                                • >>   _float_round +
                                  [Calls]
                                  • >>   _float_round
                                  -
                                  [Called By]
                                  • >>   bordage +
                                    [Called By]
                                    • >>   bordage
                                    -

                                    __aeabi_llsl (Thumb, 30 bytes, Stack size 0 bytes, llshl.o(.text)) -

                                    [Called By]

                                    • >>   _double_epilogue -
                                    • >>   __aeabi_dadd +

                                      __aeabi_llsl (Thumb, 30 bytes, Stack size 0 bytes, llshl.o(.text)) +

                                      [Called By]

                                      • >>   _double_epilogue +
                                      • >>   __aeabi_dadd
                                      -

                                      _ll_shift_l (Thumb, 0 bytes, Stack size 0 bytes, llshl.o(.text), UNUSED) +

                                      _ll_shift_l (Thumb, 0 bytes, Stack size 0 bytes, llshl.o(.text), UNUSED) -

                                      __aeabi_lasr (Thumb, 36 bytes, Stack size 0 bytes, llsshr.o(.text)) -

                                      [Called By]

                                      • >>   __aeabi_dadd +

                                        __aeabi_llsr (Thumb, 32 bytes, Stack size 0 bytes, llushr.o(.text)) +

                                        [Called By]

                                        • >>   _double_epilogue +
                                        • >>   __aeabi_d2iz
                                        -

                                        _ll_sshift_r (Thumb, 0 bytes, Stack size 0 bytes, llsshr.o(.text), UNUSED) +

                                        _ll_ushift_r (Thumb, 0 bytes, Stack size 0 bytes, llushr.o(.text), UNUSED) -

                                        __I$use$fp (Thumb, 0 bytes, Stack size 0 bytes, iusefp.o(.text), UNUSED) - -

                                        _float_round (Thumb, 18 bytes, Stack size 0 bytes, fepilogue.o(.text)) -

                                        [Called By]

                                        • >>   __aeabi_d2f +

                                          __aeabi_lasr (Thumb, 36 bytes, Stack size 0 bytes, llsshr.o(.text)) +

                                          [Called By]

                                          • >>   __aeabi_dadd
                                          -

                                          _float_epilogue (Thumb, 92 bytes, Stack size 4 bytes, fepilogue.o(.text), UNUSED) +

                                          _ll_sshift_r (Thumb, 0 bytes, Stack size 0 bytes, llsshr.o(.text), UNUSED) -

                                          _double_round (Thumb, 30 bytes, Stack size 8 bytes, depilogue.o(.text)) +

                                          __I$use$fp (Thumb, 0 bytes, Stack size 0 bytes, iusefp.o(.text), UNUSED) + +

                                          _float_round (Thumb, 18 bytes, Stack size 0 bytes, fepilogue.o(.text)) +

                                          [Called By]

                                          • >>   __aeabi_d2f +
                                          + +

                                          _float_epilogue (Thumb, 92 bytes, Stack size 4 bytes, fepilogue.o(.text), UNUSED) + +

                                          _double_round (Thumb, 30 bytes, Stack size 8 bytes, depilogue.o(.text))

                                          [Stack]

                                          • Max Depth = 8
                                          • Call Chain = _double_round
                                          -
                                          [Called By]
                                          • >>   _double_epilogue -
                                          • >>   __aeabi_ddiv -
                                          • >>   __aeabi_dadd +
                                            [Called By]
                                            • >>   _double_epilogue +
                                            • >>   __aeabi_ddiv +
                                            • >>   __aeabi_dadd
                                            -

                                            _double_epilogue (Thumb, 156 bytes, Stack size 32 bytes, depilogue.o(.text)) +

                                            _double_epilogue (Thumb, 156 bytes, Stack size 32 bytes, depilogue.o(.text))

                                            [Stack]

                                            • Max Depth = 40
                                            • Call Chain = _double_epilogue ⇒ _double_round
                                            -
                                            [Calls]
                                            • >>   __aeabi_llsr -
                                            • >>   __aeabi_llsl -
                                            • >>   _double_round +
                                              [Calls]
                                              • >>   __aeabi_llsr +
                                              • >>   __aeabi_llsl +
                                              • >>   _double_round
                                              -
                                              [Called By]
                                              • >>   __aeabi_i2d -
                                              • >>   __aeabi_dadd +
                                                [Called By]
                                                • >>   __aeabi_i2d +
                                                • >>   __aeabi_dmul +
                                                • >>   __aeabi_dadd
                                                -

                                                __scatterload (Thumb, 28 bytes, Stack size 0 bytes, init.o(.text)) -

                                                [Calls]

                                                • >>   __main_after_scatterload +

                                                  __scatterload (Thumb, 28 bytes, Stack size 0 bytes, init.o(.text)) +

                                                  [Calls]

                                                  • >>   __main_after_scatterload
                                                  -
                                                  [Called By]
                                                  • >>   _main_scatterload +
                                                    [Called By]
                                                    • >>   _main_scatterload
                                                    -

                                                    __scatterload_rt2 (Thumb, 0 bytes, Stack size 0 bytes, init.o(.text), UNUSED) +

                                                    __scatterload_rt2 (Thumb, 0 bytes, Stack size 0 bytes, init.o(.text), UNUSED) -

                                                    __aeabi_llsr (Thumb, 32 bytes, Stack size 0 bytes, llushr.o(.text)) -

                                                    [Called By]

                                                    • >>   _double_epilogue +

                                                      EXTI9_5_IRQHandler (Thumb, 20 bytes, Stack size 0 bytes, bordage.o(i.EXTI9_5_IRQHandler)) +
                                                      [Address Reference Count : 1]

                                                      • startup_stm32f10x_md.o(RESET)
                                                      - -

                                                      _ll_ushift_r (Thumb, 0 bytes, Stack size 0 bytes, llushr.o(.text), UNUSED) - -

                                                      MyGPIO_Activate (Thumb, 18 bytes, Stack size 0 bytes, driver_gpio.o(i.MyGPIO_Activate)) +

                                                      IT_bordage_auto (Thumb, 50 bytes, Stack size 16 bytes, bordage.o(i.IT_bordage_auto)) +

                                                      [Stack]

                                                      • Max Depth = 144
                                                      • Call Chain = IT_bordage_auto ⇒ bordage ⇒ __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round +
                                                      +
                                                      [Calls]
                                                      • >>   calcul_angle_voile +
                                                      • >>   bordage +
                                                      +
                                                      [Address Reference Count : 1]
                                                      • tourniquet.o(.data) +
                                                      +

                                                      MyGPIO_Activate (Thumb, 18 bytes, Stack size 0 bytes, driver_gpio.o(i.MyGPIO_Activate))

                                                      [Called By]

                                                      • >>   main
                                                      -

                                                      MyGPIO_Init (Thumb, 166 bytes, Stack size 4 bytes, driver_gpio.o(i.MyGPIO_Init)) +

                                                      MyGPIO_Init (Thumb, 166 bytes, Stack size 4 bytes, driver_gpio.o(i.MyGPIO_Init))

                                                      [Stack]

                                                      • Max Depth = 4
                                                      • Call Chain = MyGPIO_Init
                                                      -
                                                      [Calls]
                                                      • >>   MyGPIO_Set +
                                                        [Calls]
                                                        • >>   MyGPIO_Set
                                                        -
                                                        [Called By]
                                                        • >>   bordage -
                                                        • >>   SPI_init_master +
                                                          [Called By]
                                                          • >>   init_codeur_incr +
                                                          • >>   init_bordage +
                                                          • >>   SPI_init_master
                                                          -

                                                          MyGPIO_Reset (Thumb, 12 bytes, Stack size 0 bytes, driver_gpio.o(i.MyGPIO_Reset)) -

                                                          [Called By]

                                                          • >>   lire -
                                                          • >>   ecrire +

                                                            MyGPIO_Reset (Thumb, 12 bytes, Stack size 0 bytes, driver_gpio.o(i.MyGPIO_Reset)) +

                                                            [Called By]

                                                            • >>   lire +
                                                            • >>   ecrire
                                                            -

                                                            MyGPIO_Set (Thumb, 8 bytes, Stack size 0 bytes, driver_gpio.o(i.MyGPIO_Set)) -

                                                            [Called By]

                                                            • >>   lire -
                                                            • >>   ecrire -
                                                            • >>   SPI_init_master -
                                                            • >>   MyGPIO_Init +

                                                              MyGPIO_Set (Thumb, 8 bytes, Stack size 0 bytes, driver_gpio.o(i.MyGPIO_Set)) +

                                                              [Called By]

                                                              • >>   lire +
                                                              • >>   ecrire +
                                                              • >>   SPI_init_master +
                                                              • >>   MyGPIO_Init
                                                              -

                                                              MyTimer_Base_Init (Thumb, 106 bytes, Stack size 0 bytes, mytimer.o(i.MyTimer_Base_Init)) -

                                                              [Called By]

                                                              • >>   bordage +

                                                                MyTimer_ActiveIT (Thumb, 88 bytes, Stack size 12 bytes, mytimer.o(i.MyTimer_ActiveIT)) +

                                                                [Stack]

                                                                • Max Depth = 12
                                                                • Call Chain = MyTimer_ActiveIT +
                                                                +
                                                                [Called By]
                                                                • >>   tourniquet_init
                                                                -

                                                                MyTimer_PWM (Thumb, 120 bytes, Stack size 0 bytes, mytimer.o(i.MyTimer_PWM)) -

                                                                [Called By]

                                                                • >>   bordage +

                                                                  MyTimer_Base_Init (Thumb, 106 bytes, Stack size 0 bytes, mytimer.o(i.MyTimer_Base_Init)) +

                                                                  [Called By]

                                                                  • >>   init_bordage
                                                                  -

                                                                  Roulis_Handler (Thumb, 10 bytes, Stack size 8 bytes, bordage.o(i.Roulis_Handler)) -

                                                                  [Stack]

                                                                  • Max Depth = 152
                                                                  • Call Chain = Roulis_Handler ⇒ bordage ⇒ __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round -
                                                                  -
                                                                  [Calls]
                                                                  • >>   bordage -
                                                                  -
                                                                  [Called By]
                                                                  • >>   chavirement_handler +

                                                                    MyTimer_EncoderMode_Conf (Thumb, 136 bytes, Stack size 0 bytes, mytimer.o(i.MyTimer_EncoderMode_Conf)) +

                                                                    [Called By]

                                                                    • >>   init_codeur_incr
                                                                    -

                                                                    SPI_activate_clock (Thumb, 54 bytes, Stack size 0 bytes, driver_spi.o(i.SPI_activate_clock)) -

                                                                    [Called By]

                                                                    • >>   SPI_init_master +

                                                                      MyTimer_PWM (Thumb, 120 bytes, Stack size 0 bytes, mytimer.o(i.MyTimer_PWM)) +

                                                                      [Called By]

                                                                      • >>   init_bordage
                                                                      -

                                                                      SPI_init_master (Thumb, 190 bytes, Stack size 8 bytes, driver_spi.o(i.SPI_init_master)) +

                                                                      Roulis_Handler (Thumb, 16 bytes, Stack size 8 bytes, bordage.o(i.Roulis_Handler)) +

                                                                      [Stack]

                                                                      • Max Depth = 136
                                                                      • Call Chain = Roulis_Handler ⇒ bordage ⇒ __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round +
                                                                      +
                                                                      [Calls]
                                                                      • >>   bordage +
                                                                      +
                                                                      [Called By]
                                                                      • >>   chavirement_handler +
                                                                      + +

                                                                      SPI_activate_clock (Thumb, 54 bytes, Stack size 0 bytes, driver_spi.o(i.SPI_activate_clock)) +

                                                                      [Called By]

                                                                      • >>   SPI_init_master +
                                                                      + +

                                                                      SPI_init_master (Thumb, 190 bytes, Stack size 8 bytes, driver_spi.o(i.SPI_init_master))

                                                                      [Stack]

                                                                      • Max Depth = 12
                                                                      • Call Chain = SPI_init_master ⇒ MyGPIO_Init
                                                                      -
                                                                      [Calls]
                                                                      • >>   SPI_activate_clock -
                                                                      • >>   MyGPIO_Set -
                                                                      • >>   MyGPIO_Init +
                                                                        [Calls]
                                                                        • >>   SPI_activate_clock +
                                                                        • >>   MyGPIO_Set +
                                                                        • >>   MyGPIO_Init
                                                                        -
                                                                        [Called By]
                                                                        • >>   chavirement_init +
                                                                          [Called By]
                                                                          • >>   chavirement_init
                                                                          -

                                                                          SPI_rcv (Thumb, 36 bytes, Stack size 0 bytes, driver_spi.o(i.SPI_rcv)) -

                                                                          [Called By]

                                                                          • >>   lire +

                                                                            SPI_rcv (Thumb, 36 bytes, Stack size 0 bytes, driver_spi.o(i.SPI_rcv)) +

                                                                            [Called By]

                                                                            • >>   lire
                                                                            -

                                                                            SPI_send (Thumb, 30 bytes, Stack size 0 bytes, driver_spi.o(i.SPI_send)) -

                                                                            [Called By]

                                                                            • >>   lire -
                                                                            • >>   ecrire +

                                                                              SPI_send (Thumb, 30 bytes, Stack size 0 bytes, driver_spi.o(i.SPI_send)) +

                                                                              [Called By]

                                                                              • >>   lire +
                                                                              • >>   ecrire
                                                                              -

                                                                              Set_Duty_Cycle (Thumb, 76 bytes, Stack size 8 bytes, mytimer.o(i.Set_Duty_Cycle)) +

                                                                              Set_Duty_Cycle (Thumb, 76 bytes, Stack size 8 bytes, mytimer.o(i.Set_Duty_Cycle))

                                                                              [Stack]

                                                                              • Max Depth = 8
                                                                              • Call Chain = Set_Duty_Cycle
                                                                              -
                                                                              [Called By]
                                                                              • >>   bordage +
                                                                                [Called By]
                                                                                • >>   bordage

                                                                                SystemInit (Thumb, 78 bytes, Stack size 8 bytes, system_stm32f10x.o(i.SystemInit))

                                                                                [Stack]

                                                                                • Max Depth = 28
                                                                                • Call Chain = SystemInit ⇒ SetSysClock ⇒ SetSysClockTo72
                                                                                -
                                                                                [Calls]
                                                                                • >>   SetSysClock +
                                                                                  [Calls]
                                                                                  • >>   SetSysClock

                                                                                  [Address Reference Count : 1]
                                                                                  • startup_stm32f10x_md.o(.text)
                                                                                  @@ -506,95 +548,142 @@ Global Symbols

                                                                                [Address Reference Count : 1]
                                                                                • startup_stm32f10x_md.o(RESET)
                                                                                -

                                                                                __scatterload_copy (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_copy), UNUSED) +

                                                                                __scatterload_copy (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_copy), UNUSED) -

                                                                                __scatterload_null (Thumb, 2 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_null), UNUSED) +

                                                                                __scatterload_null (Thumb, 2 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_null), UNUSED) -

                                                                                __scatterload_zeroinit (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_zeroinit), UNUSED) +

                                                                                __scatterload_zeroinit (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_zeroinit), UNUSED) -

                                                                                bordage (Thumb, 146 bytes, Stack size 56 bytes, bordage.o(i.bordage)) -

                                                                                [Stack]

                                                                                • Max Depth = 144
                                                                                • Call Chain = bordage ⇒ __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round +

                                                                                  bordage (Thumb, 88 bytes, Stack size 40 bytes, bordage.o(i.bordage)) +

                                                                                  [Stack]

                                                                                  • Max Depth = 128
                                                                                  • Call Chain = bordage ⇒ __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round
                                                                                  -
                                                                                  [Calls]
                                                                                  • >>   __aeabi_i2d -
                                                                                  • >>   __aeabi_f2uiz -
                                                                                  • >>   __aeabi_f2d -
                                                                                  • >>   __aeabi_drsub -
                                                                                  • >>   __aeabi_ddiv -
                                                                                  • >>   __aeabi_dadd -
                                                                                  • >>   __aeabi_d2f -
                                                                                  • >>   Set_Duty_Cycle -
                                                                                  • >>   MyTimer_PWM -
                                                                                  • >>   MyTimer_Base_Init -
                                                                                  • >>   MyGPIO_Init +
                                                                                    [Calls]
                                                                                    • >>   __aeabi_i2d +
                                                                                    • >>   __aeabi_f2uiz +
                                                                                    • >>   __aeabi_f2d +
                                                                                    • >>   __aeabi_drsub +
                                                                                    • >>   __aeabi_ddiv +
                                                                                    • >>   __aeabi_dadd +
                                                                                    • >>   __aeabi_d2f +
                                                                                    • >>   Set_Duty_Cycle
                                                                                    -
                                                                                    [Called By]
                                                                                    • >>   Roulis_Handler +
                                                                                      [Called By]
                                                                                      • >>   IT_bordage_auto +
                                                                                      • >>   Roulis_Handler
                                                                                      -

                                                                                      chavirement_handler (Thumb, 36 bytes, Stack size 16 bytes, chavirement.o(i.chavirement_handler)) -

                                                                                      [Stack]

                                                                                      • Max Depth = 168
                                                                                      • Call Chain = chavirement_handler ⇒ Roulis_Handler ⇒ bordage ⇒ __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round +

                                                                                        calcul_angle_voile (Thumb, 112 bytes, Stack size 32 bytes, bordage.o(i.calcul_angle_voile)) +

                                                                                        [Stack]

                                                                                        • Max Depth = 120
                                                                                        • Call Chain = calcul_angle_voile ⇒ __aeabi_dmul ⇒ _double_epilogue ⇒ _double_round
                                                                                        -
                                                                                        [Calls]
                                                                                        • >>   Roulis_Handler -
                                                                                        • >>   lire +
                                                                                          [Calls]
                                                                                          • >>   __aeabi_i2d +
                                                                                          • >>   __aeabi_dmul +
                                                                                          • >>   __aeabi_ddiv +
                                                                                          • >>   __aeabi_d2iz
                                                                                          -
                                                                                          [Called By]
                                                                                          • >>   main +
                                                                                            [Called By]
                                                                                            • >>   IT_bordage_auto
                                                                                            -

                                                                                            chavirement_init (Thumb, 28 bytes, Stack size 8 bytes, chavirement.o(i.chavirement_init)) +

                                                                                            chavirement_handler (Thumb, 40 bytes, Stack size 16 bytes, chavirement.o(i.chavirement_handler)) +

                                                                                            [Stack]

                                                                                            • Max Depth = 152
                                                                                            • Call Chain = chavirement_handler ⇒ Roulis_Handler ⇒ bordage ⇒ __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round +
                                                                                            +
                                                                                            [Calls]
                                                                                            • >>   Roulis_Handler +
                                                                                            • >>   lire +
                                                                                            +
                                                                                            [Address Reference Count : 1]
                                                                                            • tourniquet.o(.data) +
                                                                                            +

                                                                                            chavirement_init (Thumb, 28 bytes, Stack size 8 bytes, chavirement.o(i.chavirement_init))

                                                                                            [Stack]

                                                                                            • Max Depth = 24
                                                                                            • Call Chain = chavirement_init ⇒ lire
                                                                                            -
                                                                                            [Calls]
                                                                                            • >>   lire -
                                                                                            • >>   ecrire -
                                                                                            • >>   SPI_init_master +
                                                                                              [Calls]
                                                                                              • >>   lire +
                                                                                              • >>   ecrire +
                                                                                              • >>   SPI_init_master

                                                                                              [Called By]
                                                                                              • >>   main
                                                                                              -

                                                                                              ecrire (Thumb, 54 bytes, Stack size 16 bytes, chavirement.o(i.ecrire)) +

                                                                                              ecrire (Thumb, 54 bytes, Stack size 16 bytes, chavirement.o(i.ecrire))

                                                                                              [Stack]

                                                                                              • Max Depth = 16
                                                                                              • Call Chain = ecrire
                                                                                              -
                                                                                              [Calls]
                                                                                              • >>   SPI_send -
                                                                                              • >>   MyGPIO_Set -
                                                                                              • >>   MyGPIO_Reset +
                                                                                                [Calls]
                                                                                                • >>   SPI_send +
                                                                                                • >>   MyGPIO_Set +
                                                                                                • >>   MyGPIO_Reset
                                                                                                -
                                                                                                [Called By]
                                                                                                • >>   chavirement_init +
                                                                                                  [Called By]
                                                                                                  • >>   chavirement_init
                                                                                                  -

                                                                                                  lire (Thumb, 58 bytes, Stack size 16 bytes, chavirement.o(i.lire)) +

                                                                                                  init_bordage (Thumb, 58 bytes, Stack size 24 bytes, bordage.o(i.init_bordage)) +

                                                                                                  [Stack]

                                                                                                  • Max Depth = 28
                                                                                                  • Call Chain = init_bordage ⇒ MyGPIO_Init +
                                                                                                  +
                                                                                                  [Calls]
                                                                                                  • >>   MyTimer_PWM +
                                                                                                  • >>   MyTimer_Base_Init +
                                                                                                  • >>   MyGPIO_Init +
                                                                                                  +
                                                                                                  [Called By]
                                                                                                  • >>   main +
                                                                                                  + +

                                                                                                  init_codeur_incr (Thumb, 72 bytes, Stack size 16 bytes, bordage.o(i.init_codeur_incr)) +

                                                                                                  [Stack]

                                                                                                  • Max Depth = 20
                                                                                                  • Call Chain = init_codeur_incr ⇒ MyGPIO_Init +
                                                                                                  +
                                                                                                  [Calls]
                                                                                                  • >>   init_exti_interrupt +
                                                                                                  • >>   MyTimer_EncoderMode_Conf +
                                                                                                  • >>   MyGPIO_Init +
                                                                                                  +
                                                                                                  [Called By]
                                                                                                  • >>   main +
                                                                                                  + +

                                                                                                  init_exti_interrupt (Thumb, 92 bytes, Stack size 0 bytes, bordage.o(i.init_exti_interrupt)) +

                                                                                                  [Called By]

                                                                                                  • >>   init_codeur_incr +
                                                                                                  + +

                                                                                                  lire (Thumb, 58 bytes, Stack size 16 bytes, chavirement.o(i.lire))

                                                                                                  [Stack]

                                                                                                  • Max Depth = 16
                                                                                                  • Call Chain = lire
                                                                                                  -
                                                                                                  [Calls]
                                                                                                  • >>   SPI_send -
                                                                                                  • >>   SPI_rcv -
                                                                                                  • >>   MyGPIO_Set -
                                                                                                  • >>   MyGPIO_Reset +
                                                                                                    [Calls]
                                                                                                    • >>   SPI_send +
                                                                                                    • >>   SPI_rcv +
                                                                                                    • >>   MyGPIO_Set +
                                                                                                    • >>   MyGPIO_Reset
                                                                                                    -
                                                                                                    [Called By]
                                                                                                    • >>   chavirement_init -
                                                                                                    • >>   chavirement_handler +
                                                                                                      [Called By]
                                                                                                      • >>   chavirement_handler +
                                                                                                      • >>   chavirement_init
                                                                                                      -

                                                                                                      main (Thumb, 30 bytes, Stack size 0 bytes, principal.o(i.main)) -

                                                                                                      [Stack]

                                                                                                      • Max Depth = 168
                                                                                                      • Call Chain = main ⇒ chavirement_handler ⇒ Roulis_Handler ⇒ bordage ⇒ __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round +

                                                                                                        main (Thumb, 34 bytes, Stack size 0 bytes, principal.o(i.main)) +

                                                                                                        [Stack]

                                                                                                        • Max Depth = 28
                                                                                                        • Call Chain = main ⇒ init_bordage ⇒ MyGPIO_Init
                                                                                                        -
                                                                                                        [Calls]
                                                                                                        • >>   chavirement_init -
                                                                                                        • >>   chavirement_handler -
                                                                                                        • >>   MyGPIO_Activate +
                                                                                                          [Calls]
                                                                                                          • >>   tourniquet_init +
                                                                                                          • >>   init_codeur_incr +
                                                                                                          • >>   init_bordage +
                                                                                                          • >>   chavirement_init +
                                                                                                          • >>   MyGPIO_Activate

                                                                                                          [Address Reference Count : 1]
                                                                                                          • entry9a.o(.ARM.Collect$$$$0000000B) -

                                                                                                          +

                                                                                                        +

                                                                                                        tourniquet_handler (Thumb, 66 bytes, Stack size 8 bytes, tourniquet.o(i.tourniquet_handler)) +

                                                                                                        [Stack]

                                                                                                        • Max Depth = 8
                                                                                                        • Call Chain = tourniquet_handler +
                                                                                                        +
                                                                                                        [Address Reference Count : 1]
                                                                                                        • tourniquet.o(i.tourniquet_init) +
                                                                                                        +

                                                                                                        tourniquet_init (Thumb, 26 bytes, Stack size 8 bytes, tourniquet.o(i.tourniquet_init)) +

                                                                                                        [Stack]

                                                                                                        • Max Depth = 20
                                                                                                        • Call Chain = tourniquet_init ⇒ MyTimer_ActiveIT +
                                                                                                        +
                                                                                                        [Calls]
                                                                                                        • >>   MyTimer_ActiveIT +
                                                                                                        +
                                                                                                        [Called By]
                                                                                                        • >>   main +
                                                                                                        +

                                                                                                        Local Symbols

                                                                                                        -

                                                                                                        SetSysClock (Thumb, 8 bytes, Stack size 8 bytes, system_stm32f10x.o(i.SetSysClock)) +

                                                                                                        SetSysClock (Thumb, 8 bytes, Stack size 8 bytes, system_stm32f10x.o(i.SetSysClock))

                                                                                                        [Stack]

                                                                                                        • Max Depth = 20
                                                                                                        • Call Chain = SetSysClock ⇒ SetSysClockTo72
                                                                                                        -
                                                                                                        [Calls]
                                                                                                        • >>   SetSysClockTo72 +
                                                                                                          [Calls]
                                                                                                          • >>   SetSysClockTo72

                                                                                                          [Called By]
                                                                                                          • >>   SystemInit
                                                                                                          -

                                                                                                          SetSysClockTo72 (Thumb, 214 bytes, Stack size 12 bytes, system_stm32f10x.o(i.SetSysClockTo72)) +

                                                                                                          SetSysClockTo72 (Thumb, 214 bytes, Stack size 12 bytes, system_stm32f10x.o(i.SetSysClockTo72))

                                                                                                          [Stack]

                                                                                                          • Max Depth = 12
                                                                                                          • Call Chain = SetSysClockTo72
                                                                                                          -
                                                                                                          [Called By]
                                                                                                          • >>   SetSysClock +
                                                                                                            [Called By]
                                                                                                            • >>   SetSysClock

                                                                                                            diff --git a/Keil_Commun/Objects/projet_chavirement.lnp b/Keil_Commun/Objects/projet_chavirement.lnp index 4d2eb25..2d3c825 100644 --- a/Keil_Commun/Objects/projet_chavirement.lnp +++ b/Keil_Commun/Objects/projet_chavirement.lnp @@ -5,6 +5,7 @@ ".\objects\principal.o" ".\objects\chavirement.o" ".\objects\bordage.o" +".\objects\tourniquet.o" ".\objects\startup_stm32f10x_md.o" ".\objects\system_stm32f10x.o" --library_type=microlib --ro-base 0x08000000 --entry 0x08000000 --rw-base 0x20000000 --entry Reset_Handler --first __Vectors --strict --summary_stderr --info summarysizes --map --load_addr_map_info --xref --callgraph --symbols diff --git a/Keil_Commun/Objects/projet_chavirement_CarteSTM.dep b/Keil_Commun/Objects/projet_chavirement_CarteSTM.dep index 40abd59..30edd91 100644 --- a/Keil_Commun/Objects/projet_chavirement_CarteSTM.dep +++ b/Keil_Commun/Objects/projet_chavirement_CarteSTM.dep @@ -3,7 +3,7 @@ CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC F (..\Drivers\Driver_GPIO.c)(0x615B16FD)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\driver_gpio.o --omf_browse .\objects\driver_gpio.crf --depend .\objects\driver_gpio.d) I (..\Drivers\Driver_GPIO.h)(0x6155C0E0) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58259ADC) -I (.\RTE\_CarteSTM\RTE_Components.h)(0x61852267) +I (.\RTE\_CarteSTM\RTE_Components.h)(0x6192261F) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F3392) I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F3392) @@ -11,10 +11,10 @@ I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cms I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F3392) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58259ADC) F (..\Drivers\Driver_GPIO.h)(0x6155C0E0)() -F (..\Drivers\Driver_SPI.c)(0x6192235F)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\driver_spi.o --omf_browse .\objects\driver_spi.crf --depend .\objects\driver_spi.d) -I (..\Drivers\Driver_SPI.h)(0x616FFEDD) +F (..\Drivers\Driver_SPI.c)(0x6192261F)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\driver_spi.o --omf_browse .\objects\driver_spi.crf --depend .\objects\driver_spi.d) +I (..\Drivers\Driver_SPI.h)(0x6192261F) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58259ADC) -I (.\RTE\_CarteSTM\RTE_Components.h)(0x61852267) +I (.\RTE\_CarteSTM\RTE_Components.h)(0x6192261F) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F3392) I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F3392) @@ -22,22 +22,22 @@ I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cms I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F3392) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58259ADC) I (..\Drivers\Driver_GPIO.h)(0x6155C0E0) -F (..\Drivers\Driver_SPI.h)(0x616FFEDD)() -F (..\Drivers\MyTimer.c)(0x618531E2)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\mytimer.o --omf_browse .\objects\mytimer.crf --depend .\objects\mytimer.d) -I (..\Drivers\MyTimer.h)(0x61852D2E) +F (..\Drivers\Driver_SPI.h)(0x6192261F)() +F (..\Drivers\MyTimer.c)(0x61924238)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\mytimer.o --omf_browse .\objects\mytimer.crf --depend .\objects\mytimer.d) +I (..\Drivers\MyTimer.h)(0x6192261F) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58259ADC) -I (.\RTE\_CarteSTM\RTE_Components.h)(0x61852267) +I (.\RTE\_CarteSTM\RTE_Components.h)(0x6192261F) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F3392) I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F3392) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E836932) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F3392) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58259ADC) -F (..\Drivers\MyTimer.h)(0x61852D2E)() -F (.\Local_Sources\principal.c)(0x6192217B)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\principal.o --omf_browse .\objects\principal.crf --depend .\objects\principal.d) -I (..\Sources\chavirement.h)(0x61853E09) +F (..\Drivers\MyTimer.h)(0x6192261F)() +F (.\Local_Sources\principal.c)(0x61923E13)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\principal.o --omf_browse .\objects\principal.crf --depend .\objects\principal.d) +I (..\Sources\chavirement.h)(0x61923250) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58259ADC) -I (.\RTE\_CarteSTM\RTE_Components.h)(0x61852267) +I (.\RTE\_CarteSTM\RTE_Components.h)(0x6192261F) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F3392) I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F3392) @@ -45,11 +45,12 @@ I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cms I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F3392) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58259ADC) I (..\Drivers\Driver_GPIO.h)(0x6155C0E0) -I (..\Sources\bordage.h)(0x618526E6) -F (..\Sources\chavirement.c)(0x619222E1)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\chavirement.o --omf_browse .\objects\chavirement.crf --depend .\objects\chavirement.d) -I (..\Sources\chavirement.h)(0x61853E09) +I (..\Sources\bordage.h)(0x6192277A) +I (..\Sources\tourniquet.h)(0x6192261F) +F (..\Sources\chavirement.c)(0x61923EFE)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\chavirement.o --omf_browse .\objects\chavirement.crf --depend .\objects\chavirement.d) +I (..\Sources\chavirement.h)(0x61923250) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58259ADC) -I (.\RTE\_CarteSTM\RTE_Components.h)(0x61852267) +I (.\RTE\_CarteSTM\RTE_Components.h)(0x6192261F) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F3392) I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F3392) @@ -57,27 +58,41 @@ I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cms I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F3392) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58259ADC) I (..\Drivers\Driver_GPIO.h)(0x6155C0E0) -I (..\Drivers\Driver_SPI.h)(0x616FFEDD) -I (..\Sources\bordage.h)(0x618526E6) -F (..\Sources\chavirement.h)(0x61853E09)() -F (..\Sources\bordage.c)(0x61852EE4)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\bordage.o --omf_browse .\objects\bordage.crf --depend .\objects\bordage.d) +I (..\Drivers\Driver_SPI.h)(0x6192261F) +I (..\Sources\bordage.h)(0x6192277A) +F (..\Sources\chavirement.h)(0x61923250)() +F (..\Sources\bordage.c)(0x61923F69)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\bordage.o --omf_browse .\objects\bordage.crf --depend .\objects\bordage.d) I (..\Drivers\Driver_GPIO.h)(0x6155C0E0) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58259ADC) -I (.\RTE\_CarteSTM\RTE_Components.h)(0x61852267) +I (.\RTE\_CarteSTM\RTE_Components.h)(0x6192261F) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F3392) I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F3392) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E836932) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F3392) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58259ADC) -I (..\Drivers\MyTimer.h)(0x61852D2E) -I (..\Sources\bordage.h)(0x618526E6) -F (..\Sources\bordage.h)(0x618526E6)() -F (RTE\Device\STM32F103RB\RTE_Device.h)(0x61852267)() -F (RTE\Device\STM32F103RB\startup_stm32f10x_md.s)(0x61897141)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 533" --pd "_RTE_ SETA 1" --pd "STM32F10X_MD SETA 1" --pd "_RTE_ SETA 1" --list .\listings\startup_stm32f10x_md.lst --xref -o .\objects\startup_stm32f10x_md.o --depend .\objects\startup_stm32f10x_md.d) -F (RTE\Device\STM32F103RB\system_stm32f10x.c)(0x61852267)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\system_stm32f10x.o --omf_browse .\objects\system_stm32f10x.crf --depend .\objects\system_stm32f10x.d) +I (..\Drivers\MyTimer.h)(0x6192261F) +I (..\Drivers\MyADC.h)(0x618523FE) +I (..\Sources\bordage.h)(0x6192277A) +F (..\Sources\bordage.h)(0x6192277A)() +F (..\Sources\tourniquet.c)(0x61922A2A)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\tourniquet.o --omf_browse .\objects\tourniquet.crf --depend .\objects\tourniquet.d) +I (..\Sources\chavirement.h)(0x61923250) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58259ADC) -I (.\RTE\_CarteSTM\RTE_Components.h)(0x61852267) +I (.\RTE\_CarteSTM\RTE_Components.h)(0x6192261F) +I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F3392) +I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) +I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F3392) +I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E836932) +I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F3392) +I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58259ADC) +I (..\Sources\bordage.h)(0x6192277A) +I (..\Drivers\MyTimer.h)(0x6192261F) +F (..\Sources\tourniquet.h)(0x6192261F)() +F (RTE\Device\STM32F103RB\RTE_Device.h)(0x6192261F)() +F (RTE\Device\STM32F103RB\startup_stm32f10x_md.s)(0x61923060)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 533" --pd "_RTE_ SETA 1" --pd "STM32F10X_MD SETA 1" --pd "_RTE_ SETA 1" --list .\listings\startup_stm32f10x_md.lst --xref -o .\objects\startup_stm32f10x_md.o --depend .\objects\startup_stm32f10x_md.d) +F (RTE\Device\STM32F103RB\system_stm32f10x.c)(0x6192261F)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\system_stm32f10x.o --omf_browse .\objects\system_stm32f10x.crf --depend .\objects\system_stm32f10x.d) +I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58259ADC) +I (.\RTE\_CarteSTM\RTE_Components.h)(0x6192261F) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F3392) I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F3392) diff --git a/Keil_Commun/Objects/system_stm32f10x.crf b/Keil_Commun/Objects/system_stm32f10x.crf index 85a4e63..eb6f07b 100644 Binary files a/Keil_Commun/Objects/system_stm32f10x.crf and b/Keil_Commun/Objects/system_stm32f10x.crf differ diff --git a/Keil_Commun/Objects/system_stm32f10x.o b/Keil_Commun/Objects/system_stm32f10x.o index abc2c6a..6b78000 100644 Binary files a/Keil_Commun/Objects/system_stm32f10x.o and b/Keil_Commun/Objects/system_stm32f10x.o differ diff --git a/Keil_Commun/Objects/tourniquet.crf b/Keil_Commun/Objects/tourniquet.crf new file mode 100644 index 0000000..af02971 Binary files /dev/null and b/Keil_Commun/Objects/tourniquet.crf differ diff --git a/Keil_Commun/Objects/tourniquet.d b/Keil_Commun/Objects/tourniquet.d new file mode 100644 index 0000000..099ea63 --- /dev/null +++ b/Keil_Commun/Objects/tourniquet.d @@ -0,0 +1,12 @@ +.\objects\tourniquet.o: ..\Sources\tourniquet.c +.\objects\tourniquet.o: ..\Sources\chavirement.h +.\objects\tourniquet.o: C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h +.\objects\tourniquet.o: .\RTE\_CarteSTM\RTE_Components.h +.\objects\tourniquet.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h +.\objects\tourniquet.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h +.\objects\tourniquet.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h +.\objects\tourniquet.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h +.\objects\tourniquet.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h +.\objects\tourniquet.o: C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h +.\objects\tourniquet.o: ..\Sources\bordage.h +.\objects\tourniquet.o: ..\Drivers\MyTimer.h diff --git a/Keil_Commun/Objects/tourniquet.o b/Keil_Commun/Objects/tourniquet.o new file mode 100644 index 0000000..113d14c Binary files /dev/null and b/Keil_Commun/Objects/tourniquet.o differ diff --git a/Keil_Commun/projet_chavirement.uvguix.chauz b/Keil_Commun/projet_chavirement.uvguix.chauz index c19316f..ad778e5 100644 --- a/Keil_Commun/projet_chavirement.uvguix.chauz +++ b/Keil_Commun/projet_chavirement.uvguix.chauz @@ -25,7 +25,7 @@ 204 Performance Analyzer - 712 139 139 340 + 952 139 139 100 @@ -46,7 +46,7 @@ 1936 Watch 1 - 200 133 133 + 200 195 133 1937 @@ -93,8 +93,8 @@ 2 3 - -32000 - -32000 + -1 + -1 -1 @@ -110,8 +110,8 @@ 0 - 1736 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000C0000000A0000000100000071433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C4B65696C5F436F6D6D756E5C4C6F63616C5F536F75726365735C7072696E636970616C2E63000000000B7072696E636970616C2E6300000000C5D4F200FFFFFFFF60433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C447269766572735C4472697665725F5350492E68000000000C4472697665725F5350492E6800000000FFDC7800FFFFFFFF5A433A5C55736572735C636861757A5C417070446174615C4C6F63616C5C41726D5C5061636B735C4B65696C5C53544D3332463178785F4446505C322E332E305C4465766963655C496E636C7564655C73746D3332663130782E68000000000B73746D3332663130782E6800000000BECEA100FFFFFFFF61433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C536F75726365735C636861766972656D656E742E63000000000D636861766972656D656E742E6300000000F0A0A100FFFFFFFF61433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C536F75726365735C636861766972656D656E742E68000000000D636861766972656D656E742E6800000000BCA8E100FFFFFFFF61433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C447269766572735C4472697665725F4750494F2E63000000000D4472697665725F4750494F2E63000000009CC1B600FFFFFFFF5D433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C447269766572735C4D7954696D65722E6800000000094D7954696D65722E6800000000A5C2D700FFFFFFFF5D433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C447269766572735C4D7954696D65722E6300000000094D7954696D65722E6300000000B3A6BE00FFFFFFFF60433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C447269766572735C4472697665725F5350492E63000000000C4472697665725F5350492E6300000000F6FA7D00FFFFFFFF85433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C4B65696C5F436F6D6D756E5C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000B3A6BE00FFFFFFFF61433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C496E636C756465735C746F75726E69717565742E63000000000C746F75726E69717565742E6300000000EAD6A300FFFFFFFF61433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C496E636C756465735C746F75726E69717565742E68000000000C746F75726E69717565742E6800000000F6FA7D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000002F010000660000000006000046020000 + 1172 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000800000004000000010000005D433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C536F75726365735C626F72646167652E630000000009626F72646167652E6300000000C5D4F200FFFFFFFF60433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C536F75726365735C746F75726E69717565742E63000000000C746F75726E69717565742E6300000000FFDC7800FFFFFFFF61433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C536F75726365735C636861766972656D656E742E63000000000D636861766972656D656E742E6300000000BECEA100FFFFFFFF61433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C536F75726365735C636861766972656D656E742E68000000000D636861766972656D656E742E6800000000F0A0A100FFFFFFFF71433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C4B65696C5F436F6D6D756E5C4C6F63616C5F536F75726365735C7072696E636970616C2E63000000000B7072696E636970616C2E6300000000BCA8E100FFFFFFFF85433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C4B65696C5F436F6D6D756E5C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E73000000009CC1B600FFFFFFFF25433A5C4B65696C5F76355C41524D5C41524D43435C696E636C7564655C737464696E742E680000000008737464696E742E6800000000F7B88600FFFFFFFF5D433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C447269766572735C4D7954696D65722E6300000000094D7954696D65722E6300000000D9ADC200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000002F010000660000000006000046020000 @@ -1806,7 +1806,7 @@ File 2796 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A4D794750494F5F536574960000000000000013000A4D794750494F5F536574094F75745F5070756C6C0B5350495F4352315F5350450374786504435048410463706F6C06656E61626C65077370695F6372310373706905677265656E0D54494D5F434345525F434331451054494D5F43434D52315F4F43314D5F301054494D5F43434D52315F4F43324D5F300B68616E646C655F54494D320A68616E646C655F54494D0A49525148616E646C65720349525104493243320954494D325F4952516E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A4D794750494F5F536574960000000000000013000A4D794750494F5F536574094F75745F5070756C6C0B5350495F4352315F5350450374786504435048410463706F6C06656E61626C65077370695F6372310373706905677265656E0D54494D5F434345525F434331451054494D5F43434D52315F4F43314D5F301054494D5F43434D52315F4F43324D5F300B68616E646C655F54494D320A68616E646C655F54494D0A49525148616E646C65720349525104493243320954494D325F4952516E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020000001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 991 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500100000008436172746553544D960000000000000002000A53696D756C6174696F6E08436172746553544D00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500100000008436172746553544D960000000000000002000A53696D756C6174696F6E08436172746553544D00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3511,7 +3511,7 @@ 2 16 - 000000001C0000006F02000038000000 + 010000001C0000007002000038000000 16 @@ -3547,7 +3547,7 @@ File 2796 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A4D794750494F5F536574960000000000000013000A4D794750494F5F536574094F75745F5070756C6C0B5350495F4352315F5350450374786504435048410463706F6C06656E61626C65077370695F6372310373706905677265656E0D54494D5F434345525F434331451054494D5F43434D52315F4F43314D5F301054494D5F43434D52315F4F43324D5F300B68616E646C655F54494D320A68616E646C655F54494D0A49525148616E646C65720349525104493243320954494D325F4952516E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A4D794750494F5F536574960000000000000013000A4D794750494F5F536574094F75745F5070756C6C0B5350495F4352315F5350450374786504435048410463706F6C06656E61626C65077370695F6372310373706905677265656E0D54494D5F434345525F434331451054494D5F43434D52315F4F43314D5F301054494D5F43434D52315F4F43324D5F300B68616E646C655F54494D320A68616E646C655F54494D0A49525148616E646C65720349525104493243320954494D325F4952516E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3563,7 +3563,7 @@ Build 955 - 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3579,7 +3579,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3603,84 +3603,48 @@ 0 100 - 10 + 4 - .\Local_Sources\principal.c + ..\Sources\bordage.c 0 - 7 - 20 + 95 + 107 1 0 - ..\Drivers\Driver_SPI.h + ..\Sources\tourniquet.c 0 - 1 - 15 - 1 - - 0 - - - C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h - 20 - 7457 - 7481 + 8 + 18 1 0 ..\Sources\chavirement.c - 1 - 1 - 56 + 16 + 38 + 60 1 0 ..\Sources\chavirement.h - 10 - 1 - 10 - 1 - - 0 - - - ..\Drivers\Driver_GPIO.c 0 1 - 34 + 9 1 0 - ..\Drivers\MyTimer.h + .\Local_Sources\principal.c 0 - 4 - 11 - 1 - - 0 - - - ..\Drivers\MyTimer.c - 0 - 102 - 103 - 1 - - 0 - - - ..\Drivers\Driver_SPI.c - 18 - 34 - 50 + 1 + 26 1 0 @@ -3695,20 +3659,20 @@ 0 - C:\Users\chauz\Documents_non_drive\INSA\4A\S7\projet_voilier\projet_voilier\Includes\tourniquet.c - 1 - 1 - 25 - 0 + C:\Keil_v5\ARM\ARMCC\include\stdint.h + 0 + 54 + 62 + 1 0 - C:\Users\chauz\Documents_non_drive\INSA\4A\S7\projet_voilier\projet_voilier\Includes\tourniquet.h - 0 - 1 - 7 - 0 + ..\Drivers\MyTimer.c + 2 + 7 + 25 + 1 0 diff --git a/Keil_Commun/projet_chavirement.uvoptx b/Keil_Commun/projet_chavirement.uvoptx index b1bbff8..62ccd4a 100644 --- a/Keil_Commun/projet_chavirement.uvoptx +++ b/Keil_Commun/projet_chavirement.uvoptx @@ -290,7 +290,7 @@ 0 DLGTARM - (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=578,129,999,534,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=676,113,1003,474,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0) + (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=578,129,999,534,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(133=150,126,744,820,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=676,113,1003,474,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0) 0 @@ -318,37 +318,42 @@ 0 1 - SPI1->SR + localvalue,0x0A 1 1 - value + device_id 2 1 - lsb + tempo_chavirement,0x0A 3 1 - msb + lsblocal,0x0A 4 1 - address + msblocal,0x10 5 1 - SPI1->DR + angle 6 1 - device_id + angle_servo + + + 7 + 1 + angle_girouette @@ -557,6 +562,30 @@ 0 0 + + 3 + 12 + 1 + 0 + 0 + 0 + ..\Sources\tourniquet.c + tourniquet.c + 0 + 0 + + + 3 + 13 + 5 + 0 + 0 + 0 + ..\Sources\tourniquet.h + tourniquet.h + 0 + 0 + diff --git a/Keil_Commun/projet_chavirement.uvprojx b/Keil_Commun/projet_chavirement.uvprojx index 4dfdc8d..a837257 100644 --- a/Keil_Commun/projet_chavirement.uvprojx +++ b/Keil_Commun/projet_chavirement.uvprojx @@ -448,6 +448,16 @@ 5 ..\Sources\bordage.h + + tourniquet.c + 1 + ..\Sources\tourniquet.c + + + tourniquet.h + 5 + ..\Sources\tourniquet.h + @@ -900,6 +910,16 @@ 5 ..\Sources\bordage.h + + tourniquet.c + 1 + ..\Sources\tourniquet.c + + + tourniquet.h + 5 + ..\Sources\tourniquet.h + diff --git a/Keil_Elise_Yuwei/Local_Sources/bordage/drivers.uvguix.chauz b/Keil_Elise_Yuwei/Local_Sources/bordage/drivers.uvguix.chauz index 5cbb61e..faedfe2 100644 --- a/Keil_Elise_Yuwei/Local_Sources/bordage/drivers.uvguix.chauz +++ b/Keil_Elise_Yuwei/Local_Sources/bordage/drivers.uvguix.chauz @@ -93,8 +93,8 @@ 2 3 - -1 - -1 + -32000 + -32000 -1 @@ -110,8 +110,8 @@ 0 - 331 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000001000000000000000100000084433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C4B65696C5F456C6973655F59757765695C4C6F63616C5F536F75726365735C626F72646167655C496E636C7564655C626F72646167652E630000000009626F72646167652E6300000000C5D4F200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000C4000000660000000006000008020000 + 493 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000002000000010000000100000084433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C4B65696C5F456C6973655F59757765695C4C6F63616C5F536F75726365735C626F72646167655C496E636C7564655C626F72646167652E630000000009626F72646167652E6300000000C5D4F200FFFFFFFF85433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C4B65696C5F456C6973655F59757765695C4C6F63616C5F536F75726365735C626F72646167655C536F757263655C7072696E636970616C2E63000000000B7072696E636970616C2E6300000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000001B01000066000000000600007C020000 @@ -150,7 +150,7 @@ 0 16 - 0300000066000000BD000000D8010000 + 0300000066000000140100004C020000 16 @@ -170,7 +170,7 @@ 0 16 - 0300000066000000BD000000D8010000 + 0300000066000000140100004C020000 16 @@ -450,7 +450,7 @@ 0 16 - 0300000066000000BD000000D8010000 + 0300000066000000140100004C020000 16 @@ -470,7 +470,7 @@ 0 16 - 0300000066000000BD000000D8010000 + 0300000066000000140100004C020000 16 @@ -490,7 +490,7 @@ 0 16 - 0000000009020000000600000E030000 + 000000007D020000000600000E030000 16 @@ -530,7 +530,7 @@ 0 16 - 030000000C020000FD0500004A020000 + 0300000080020000FD05000069030000 16 @@ -1150,7 +1150,7 @@ 0 16 - 0300000066000000BD00000083020000 + 0300000066000000BD000000D8010000 16 @@ -1170,7 +1170,7 @@ 0 16 - 030000000C020000FD0500004A020000 + 0300000080020000FD05000069030000 16 @@ -1190,7 +1190,7 @@ 0 16 - 030000000C020000FD0500004A020000 + 0300000080020000FD05000069030000 16 @@ -1250,7 +1250,7 @@ 0 16 - 030000000C020000FD0500004A020000 + 0300000080020000FD05000069030000 16 @@ -1270,7 +1270,7 @@ 0 16 - 030000000C020000FD0500004A020000 + 0300000080020000FD05000069030000 16 @@ -1799,14 +1799,14 @@ 3312 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFC4000000BD00000070040000C1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000C40000006600000070040000D4000000C40000004F00000070040000BD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000B00300006600000070040000BC010000B00300004F00000070040000A501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFC00000004F000000C4000000F1010000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000C0000000B3020000000000004F000000C0000000F10100000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000091010000700400009501000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB0900000180008000000000000000000000AC010000700400002E0200000000000095010000700400001702000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF38020000950100003C0200001702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000F101000000060000F501000001000000010000100400000001000000B8FDFFFF6C000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000000000000B7020000000600002503000000000000F5010000000600000E0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFC4000000BD00000070040000C1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000C40000006600000070040000D4000000C40000004F00000070040000BD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000B00300006600000070040000BC010000B00300004F00000070040000A501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF170100004F0000001B010000650200000100000002000010040000000100000042FFFFFF37050000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000C000000008020000000000004F00000017010000650200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000091010000700400009501000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB0900000180008000000000000000000000AC010000700400002E0200000000000095010000700400001702000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF38020000950100003C0200001702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000006502000000060000690200000100000001000010040000000100000063FEFFFF17010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000000C02000000060000250300000000000069020000000600000E0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2761 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000003747865960000000000000011000374786504435048410463706F6C06656E61626C65077370695F6372310373706905677265656E0D54494D5F434345525F434331451054494D5F43434D52315F4F43314D5F301054494D5F43434D52315F4F43324D5F300B68616E646C655F54494D320A68616E646C655F54494D0A49525148616E646C65720349525104493243320954494D325F4952516E0C6770696F5F747970656465660000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2796 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000000004000000000000000000000000000000000100000001000000018022E100000000000005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000000460000000000000000000000000000000001000000010000000180FE880000000000004500000000000000000000000000000000010000000100000001800B810000000000001300000000000000000000000000000000010000000100000001800C810000000000001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A4D794750494F5F536574960000000000000013000A4D794750494F5F536574094F75745F5070756C6C0B5350495F4352315F5350450374786504435048410463706F6C06656E61626C65077370695F6372310373706905677265656E0D54494D5F434345525F434331451054494D5F43434D52315F4F43314D5F301054494D5F43434D52315F4F43324D5F300B68616E646C655F54494D320A68616E646C655F54494D0A49525148616E646C65720349525104493243320954494D325F4952516E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -1862,12 +1862,21 @@ 0 100 - 0 + 1 .\Include\bordage.c - 24 + 31 + 84 + 17 + 1 + + 0 + + + .\Source\principal.c + 0 1 - 8 + 11 1 0 diff --git a/Sources/bordage.c b/Sources/bordage.c index 0a87d6c..2599496 100644 --- a/Sources/bordage.c +++ b/Sources/bordage.c @@ -1,5 +1,6 @@ #include "Driver_GPIO.h" #include "MyTimer.h" +#include "MyADC.h" #include "stm32f10x.h" #include "bordage.h" @@ -10,22 +11,33 @@ #define GPIO_PIN_PWM (1) /*************************/ +/********** Codeur Incrémental **********/ +#define TIMER_CI (TIM4) +#define GPIO_GIROUETTE (GPIOB) +#define GIROUETTE_PHA (6) //PB6 +#define GIROUETTE_PHB (7) //PB7 +#define GIROUETTE_INDEX (5) //PB5 +/****************************************/ -#define TIMER_CI (TIM2) // Timer codeur incrémental -#define GIROUETTE_PHA (PA1) -#define GIROUETTE_PHB (PA4) -#define GIROUETTE_INDEX (PB0) -#define SERVO_VOILE_PWM (PA4) +int tempo_chavirement = 0; +void IT_bordage_auto ( void) { -int bordage ( int angle ) { - // l'angle se comprends entre 0 et 90 + int angle_girouette; + + if (tempo_chavirement > 0){ + tempo_chavirement--; + return; + } + + angle_girouette = TIMER_CI->CNT/4; + bordage(calcul_angle_voile(angle_girouette)); +} + +void init_bordage ( void ) +{ MyGPIO_Struct_TypeDef GPIO_Struct; - float angle_servo = 90.0 - angle; - - float duty_cycle = angle_servo/18.0 + 5.0; // convertit l'angle en rapport cyclique pour la commande du servo moteur - // Configuration du timer avec une période de 20ms MyTimer_Struct_TypeDef TIM; TIM.Timer = TIMER_PWM; @@ -39,17 +51,71 @@ int bordage ( int angle ) { GPIO_Struct.GPIO_Conf = AltOut_Ppull; MyGPIO_Init(&GPIO_Struct); - // Génération de la PWM MyTimer_PWM (TIMER_PWM, CANAL_PWM); + +} + +int bordage ( int angle ) { + + float angle_servo = 90.0 - angle; + + float duty_cycle = angle_servo/18.0 + 5.0; // convertit l'angle en rapport cyclique pour la commande du servo moteur + + // Génération de la PWM Set_Duty_Cycle(TIMER_PWM, CANAL_PWM, duty_cycle); return 0; } +void init_codeur_incr ( void ) { + // Configuration GPIOS + MyGPIO_Struct_TypeDef GPIO_Struct; + GPIO_Struct.GPIO = GPIO_GIROUETTE; + GPIO_Struct.GPIO_Pin = GIROUETTE_PHA; + GPIO_Struct.GPIO_Conf = In_Floating; + MyGPIO_Init(&GPIO_Struct); + + GPIO_Struct.GPIO_Pin = GIROUETTE_PHB; + GPIO_Struct.GPIO_Conf = In_Floating; + MyGPIO_Init(&GPIO_Struct); + + GPIO_Struct.GPIO_Pin = GIROUETTE_INDEX; + GPIO_Struct.GPIO_Conf = In_Floating; + MyGPIO_Init(&GPIO_Struct); + + init_exti_interrupt(); + MyTimer_EncoderMode_Conf(TIMER_CI); + +} +void init_exti_interrupt ( void ) { + RCC->APB2ENR |= RCC_APB2ENR_IOPBEN; + RCC->APB2ENR |= RCC_APB2ENR_AFIOEN; + AFIO->EXTICR[1] |= AFIO_EXTICR2_EXTI5_PB; + EXTI->RTSR |= EXTI_RTSR_TR5; // Rising trigger enabled + EXTI->IMR |= EXTI_IMR_MR5; // Interrupt request from Line 5 is not masked + NVIC->IP[23] |= (1 << 4); // Fixe la priorité de l'interruption dans le NVIC + NVIC->ISER[0] |= (1 << 23); // Autorise la prise en compte de l'interruption dans le NVIC +} - +void EXTI9_5_IRQHandler ( void ) { + EXTI->PR |= EXTI_PR_PR5; // Clear the pending bit + TIMER_CI->CNT = 0; +} void Roulis_Handler ( void ) { + tempo_chavirement = 50; // 50 appels à 40ms = 2000 ms = 2 sec. bordage(0); } + +int calcul_angle_voile ( int angle ) { + if (angle <= 45 || angle >= 360 - 45){ + return 0; + } + else if ( angle > 45 && angle <= 180) { + return (angle - 45) * 90.0/135.0; + } + else { + return (315 - angle) * 90.0/135.0; + } +} diff --git a/Sources/bordage.h b/Sources/bordage.h index 57edbc3..020ff2b 100644 --- a/Sources/bordage.h +++ b/Sources/bordage.h @@ -2,11 +2,23 @@ #define BORDAGE_H #include "stm32f10x.h" +void IT_bordage_auto ( void); + +/* +************************************************************************************************* +* @brief Fonction d'initialisation +* @param -> +* @Note -> +************************************************************************************************* +*/ +void init_bordage ( void ); + + /* ************************************************************************************************* * @brief * @param -> int angle : angle que l'on veut donner à la voile (entre 0 et 90°) -* @Note -> +* @Note -> appeler la fonction d'initialisation avant ************************************************************************************************* */ int bordage ( int angle ); @@ -16,11 +28,18 @@ int bordage ( int angle ); /* ************************************************************************************************* -* @brief Handler a appeler lorsque l'angle de roulis est supérieur à 30° +* @brief Handler a appeler lorsque l'angle de roulis est supérieur à 40° * @param -> -* @Note -> +* @Note -> appeler la fonction d'initialisation avant ************************************************************************************************* */ void Roulis_Handler ( void ); + +void init_codeur_incr ( void ); + +void init_exti_interrupt ( void ); + +int calcul_angle_voile ( int angle ); + #endif diff --git a/Sources/chavirement.c b/Sources/chavirement.c index 7374e72..5fac329 100644 --- a/Sources/chavirement.c +++ b/Sources/chavirement.c @@ -7,8 +7,11 @@ #include "bordage.h" int device_id = 0; +int16_t localvalue = 0; +uint8_t lsblocal = 0; +uint8_t msblocal = 0; -char lire(char address) { +uint8_t lire(char address) { //lit les données à l'adresse address // couche protocolaire : bit MSB à 1 pour mode R //on laisse MB par défaut à 0 @@ -43,14 +46,19 @@ void chavirement_init(void){ } -uint16_t chavirement_handler(void) { - uint8_t lsb = lire(0x36); +void chavirement_handler(void) { uint8_t msb = lire(0x37); - int16_t value = (int16_t) ((msb << 8) + lsb); + uint8_t lsb = lire(0x36); + int16_t value = 0; + //value |= (msb << 8); + value |= lsb; + localvalue = value; + lsblocal = lsb; + //msblocal = msb; - if (value > 221) { + if (value < 185) { //appel fonction Roulis_Handler(); } - return value; + } diff --git a/Sources/chavirement.h b/Sources/chavirement.h index 5b56ea2..c6954db 100644 --- a/Sources/chavirement.h +++ b/Sources/chavirement.h @@ -5,9 +5,9 @@ void chavirement_init(void); -uint16_t chavirement_handler(void); +void chavirement_handler(void); -char lire(char) ; +uint8_t lire(char) ; void ecrire(char, char) ; diff --git a/Includes/tourniquet.c b/Sources/tourniquet.c similarity index 51% rename from Includes/tourniquet.c rename to Sources/tourniquet.c index fd8bcc7..8ccbf84 100644 --- a/Includes/tourniquet.c +++ b/Sources/tourniquet.c @@ -1,14 +1,17 @@ +#ifndef CHAVIREMENT_H +#include "chavirement.h" +#endif + + +#include "bordage.h" + +#include "MyTimer.h" + char tourniquet_curseur ; char maximum ; -void (* IT_TOURNIQUET_1) (void) = chavirement_handler(); -void (* IT_TOURNIQUET_2) (void) = 0x0; - - -void tourniquet_init() { - tourniquet_curseur = 1; - maximum = 2 -} +void (* IT_TOURNIQUET_1) (void) = chavirement_handler; +void (* IT_TOURNIQUET_2) (void) = IT_bordage_auto; void tourniquet_handler() { @@ -22,4 +25,11 @@ void tourniquet_handler() { if(tourniquet_curseur > maximum) { tourniquet_curseur = 1; } +} + +void tourniquet_init() { + tourniquet_curseur = 1; + maximum = 2; + // Mise en place d'une interruption tourniquet + MyTimer_ActiveIT(TIM3, 1, tourniquet_handler); } \ No newline at end of file diff --git a/Includes/tourniquet.h b/Sources/tourniquet.h similarity index 100% rename from Includes/tourniquet.h rename to Sources/tourniquet.h