diff --git a/Application/principal.c b/Application/principal.c index 26de2c0..45041b3 100644 --- a/Application/principal.c +++ b/Application/principal.c @@ -5,6 +5,7 @@ #include "Girouette.h" #include "Servo.h" #include "MyUart.h" +#include "Plateau.h" #include "I2C.h" #include "RTC.h" @@ -16,6 +17,9 @@ uint32_t sum; //uint16_t i; volatile uint32_t moy; // Volatile pour pouvoir le regarder dans Keil µVision +void pilotage(int commande) { + Update_Motor_PWM(commande,TIM3,3); + }; int main(void) { // ---- Setup ------ @@ -23,10 +27,20 @@ int main(void) { initServo(TIM4, 3); // Giroutte.c configEncoder(TIM2); + // init plateau + initPlato(TIM3, 3); + + //init Uart + My_USART_Config(USART1, 7500); //call with baudrate which is one over this value times clock frequency + USART_IT_Receive_Enable(USART1); + Init_IT_Receive(pilotage); + USART_Send_String(USART1,"bonjour bateau\r\n"); + // Initialisation des modules initAccelo(); initLacheur(); + //RTC initRTC(); diff --git a/Listings/ProjetVide.map b/Listings/ProjetVide.map new file mode 100644 index 0000000..3cb280e --- /dev/null +++ b/Listings/ProjetVide.map @@ -0,0 +1,329 @@ +Component: Arm Compiler for Embedded 6.23 Tool: armlink [5f102400] + +============================================================================== + +Section Cross References + + principal.o(.text.pilotage) refers to plateau.o(.text.Update_Motor_PWM) for Update_Motor_PWM + principal.o(.ARM.exidx.text.pilotage) refers to principal.o(.text.pilotage) for [Anonymous Symbol] + principal.o(.text.main) refers to servo.o(.text.initServo) for initServo + principal.o(.text.main) refers to girouette.o(.text.configEncoder) for configEncoder + principal.o(.text.main) refers to plateau.o(.text.initPlato) for initPlato + principal.o(.text.main) refers to myuart.o(.text.My_USART_Config) for My_USART_Config + principal.o(.text.main) refers to myuart.o(.text.USART_IT_Receive_Enable) for USART_IT_Receive_Enable + principal.o(.text.main) refers to principal.o(.text.pilotage) for pilotage + principal.o(.text.main) refers to myuart.o(.text.Init_IT_Receive) for Init_IT_Receive + principal.o(.text.main) refers to principal.o(.rodata.str1.1) for .L.str + principal.o(.text.main) refers to myuart.o(.text.USART_Send_String) for USART_Send_String + principal.o(.text.main) refers to accelerometre.o(.text.initAccelo) for initAccelo + principal.o(.text.main) refers to accelerometre.o(.text.initLacheur) for initLacheur + principal.o(.text.main) refers to principal.o(.bss.moyenne) for moyenne + principal.o(.text.main) refers to girouette.o(.text.LocaliserZero) for LocaliserZero + principal.o(.text.main) refers to girouette.o(.text.angleVent) for angleVent + principal.o(.text.main) refers to principal.o(.bss.angleVentVar) for angleVentVar + principal.o(.text.main) refers to girouette.o(.text.vent2voile) for vent2voile + principal.o(.text.main) refers to principal.o(.bss.angleVoileVar) for angleVoileVar + principal.o(.text.main) refers to servo.o(.text.Servo_Moteur) for Servo_Moteur + principal.o(.text.main) refers to accelerometre.o(.text.RecupAccelo) for RecupAccelo + principal.o(.text.main) refers to principal.o(.bss.sum) for sum + principal.o(.text.main) refers to principal.o(.bss.moy) for moy + principal.o(.text.main) refers to accelerometre.o(.text.LacheVoile) for LacheVoile + principal.o(.ARM.exidx.text.main) refers to principal.o(.text.main) for [Anonymous Symbol] + accelerometre.o(.ARM.exidx.text.initAccelo) refers to accelerometre.o(.text.initAccelo) for [Anonymous Symbol] + accelerometre.o(.text.RecupAccelo) refers to accelerometre.o(.bss.RecupAccelo.Messie) for RecupAccelo.Messie + accelerometre.o(.ARM.exidx.text.RecupAccelo) refers to accelerometre.o(.text.RecupAccelo) for [Anonymous Symbol] + accelerometre.o(.text.initLacheur) refers to horloge.o(.text.Timer_Init) for Timer_Init + accelerometre.o(.ARM.exidx.text.initLacheur) refers to accelerometre.o(.text.initLacheur) for [Anonymous Symbol] + accelerometre.o(.text.LacheVoile) refers to servo.o(.text.Servo_Moteur) for Servo_Moteur + accelerometre.o(.ARM.exidx.text.LacheVoile) refers to accelerometre.o(.text.LacheVoile) for [Anonymous Symbol] + girouette.o(.text.configEncoder) refers to horloge.o(.text.Timer_Init) for Timer_Init + girouette.o(.text.configEncoder) refers to drivergpio.o(.text.MyGPIO_Init) for MyGPIO_Init + girouette.o(.ARM.exidx.text.configEncoder) refers to girouette.o(.text.configEncoder) for [Anonymous Symbol] + girouette.o(.ARM.exidx.text.angleVent) refers to girouette.o(.text.angleVent) for [Anonymous Symbol] + girouette.o(.ARM.exidx.text.vent2voile) refers to girouette.o(.text.vent2voile) for [Anonymous Symbol] + girouette.o(.text.LocaliserZero) refers to drivergpio.o(.text.MyGPIO_Read) for MyGPIO_Read + girouette.o(.ARM.exidx.text.LocaliserZero) refers to girouette.o(.text.LocaliserZero) for [Anonymous Symbol] + myuart.o(.text.My_USART_Config) refers to drivergpio.o(.text.MyGPIO_Init) for MyGPIO_Init + myuart.o(.text.My_USART_Config) refers to myuart.o(.text.__NVIC_EnableIRQ) for __NVIC_EnableIRQ + myuart.o(.text.My_USART_Config) refers to myuart.o(.text.__NVIC_SetPriority) for __NVIC_SetPriority + myuart.o(.ARM.exidx.text.My_USART_Config) refers to myuart.o(.text.My_USART_Config) for [Anonymous Symbol] + myuart.o(.ARM.exidx.text.__NVIC_EnableIRQ) refers to myuart.o(.text.__NVIC_EnableIRQ) for [Anonymous Symbol] + myuart.o(.ARM.exidx.text.__NVIC_SetPriority) refers to myuart.o(.text.__NVIC_SetPriority) for [Anonymous Symbol] + myuart.o(.ARM.exidx.text.USART_Send_Char) refers to myuart.o(.text.USART_Send_Char) for [Anonymous Symbol] + myuart.o(.text.USART_Send_String) refers to myuart.o(.text.USART_Send_Char) for USART_Send_Char + myuart.o(.ARM.exidx.text.USART_Send_String) refers to myuart.o(.text.USART_Send_String) for [Anonymous Symbol] + myuart.o(.ARM.exidx.text.USART_IT_Receive_Enable) refers to myuart.o(.text.USART_IT_Receive_Enable) for [Anonymous Symbol] + myuart.o(.text.Init_IT_Receive) refers to myuart.o(.bss.pFnc_Receive) for pFnc_Receive + myuart.o(.ARM.exidx.text.Init_IT_Receive) refers to myuart.o(.text.Init_IT_Receive) for [Anonymous Symbol] + myuart.o(.text.USART1_IRQHandler) refers to myuart.o(.bss.pFnc_Receive) for pFnc_Receive + myuart.o(.ARM.exidx.text.USART1_IRQHandler) refers to myuart.o(.text.USART1_IRQHandler) for [Anonymous Symbol] + servo.o(.text.Servo_Moteur) refers to pwm.o(.text.Set_DutyCycle_PWM) for Set_DutyCycle_PWM + servo.o(.ARM.exidx.text.Servo_Moteur) refers to servo.o(.text.Servo_Moteur) for [Anonymous Symbol] + servo.o(.text.initServo) refers to horloge.o(.text.Timer_Init) for Timer_Init + servo.o(.text.initServo) refers to drivergpio.o(.text.MyGPIO_Init) for MyGPIO_Init + servo.o(.text.initServo) refers to pwm.o(.text.MyTimer_PWM) for MyTimer_PWM + servo.o(.ARM.exidx.text.initServo) refers to servo.o(.text.initServo) for [Anonymous Symbol] + plateau.o(.text.initPlato) refers to drivergpio.o(.text.MyGPIO_Init) for MyGPIO_Init + plateau.o(.text.initPlato) refers to horloge.o(.text.Timer_Init) for Timer_Init + plateau.o(.text.initPlato) refers to pwm.o(.text.MyTimer_PWM) for MyTimer_PWM + plateau.o(.ARM.exidx.text.initPlato) refers to plateau.o(.text.initPlato) for [Anonymous Symbol] + plateau.o(.text.Update_Motor_PWM) refers to drivergpio.o(.text.MYGPIO_PinOn) for MYGPIO_PinOn + plateau.o(.text.Update_Motor_PWM) refers to drivergpio.o(.text.MYGPIO_PinOff) for MYGPIO_PinOff + plateau.o(.text.Update_Motor_PWM) refers to pwm.o(.text.Set_DutyCycle_PWM) for Set_DutyCycle_PWM + plateau.o(.ARM.exidx.text.Update_Motor_PWM) refers to plateau.o(.text.Update_Motor_PWM) for [Anonymous Symbol] + drivergpio.o(.ARM.exidx.text.MyGPIO_Init) refers to drivergpio.o(.text.MyGPIO_Init) for [Anonymous Symbol] + drivergpio.o(.ARM.exidx.text.MyGPIO_Read) refers to drivergpio.o(.text.MyGPIO_Read) for [Anonymous Symbol] + drivergpio.o(.ARM.exidx.text.MyGPIO_Set) refers to drivergpio.o(.text.MyGPIO_Set) for [Anonymous Symbol] + drivergpio.o(.ARM.exidx.text.MyGPIO_Reset) refers to drivergpio.o(.text.MyGPIO_Reset) for [Anonymous Symbol] + drivergpio.o(.ARM.exidx.text.MYGPIO_PinOn) refers to drivergpio.o(.text.MYGPIO_PinOn) for [Anonymous Symbol] + drivergpio.o(.ARM.exidx.text.MYGPIO_PinOff) refers to drivergpio.o(.text.MYGPIO_PinOff) for [Anonymous Symbol] + drivergpio.o(.ARM.exidx.text.MyGPIO_Toggle) refers to drivergpio.o(.text.MyGPIO_Toggle) for [Anonymous Symbol] + horloge.o(.ARM.exidx.text.Timer_Init) refers to horloge.o(.text.Timer_Init) for [Anonymous Symbol] + horloge.o(.text.MyTimer_ActiveIT) refers to horloge.o(.bss.TIM2_Appel) for TIM2_Appel + horloge.o(.text.MyTimer_ActiveIT) refers to horloge.o(.text.__NVIC_EnableIRQ) for __NVIC_EnableIRQ + horloge.o(.text.MyTimer_ActiveIT) refers to horloge.o(.text.__NVIC_SetPriority) for __NVIC_SetPriority + horloge.o(.text.MyTimer_ActiveIT) refers to horloge.o(.bss.TIM3_Appel) for TIM3_Appel + horloge.o(.text.MyTimer_ActiveIT) refers to horloge.o(.bss.TIM4_Appel) for TIM4_Appel + horloge.o(.ARM.exidx.text.MyTimer_ActiveIT) refers to horloge.o(.text.MyTimer_ActiveIT) for [Anonymous Symbol] + horloge.o(.ARM.exidx.text.__NVIC_EnableIRQ) refers to horloge.o(.text.__NVIC_EnableIRQ) for [Anonymous Symbol] + horloge.o(.ARM.exidx.text.__NVIC_SetPriority) refers to horloge.o(.text.__NVIC_SetPriority) for [Anonymous Symbol] + horloge.o(.text.TIM2_IRQHandler) refers to horloge.o(.bss.TIM2_Appel) for TIM2_Appel + horloge.o(.ARM.exidx.text.TIM2_IRQHandler) refers to horloge.o(.text.TIM2_IRQHandler) for [Anonymous Symbol] + horloge.o(.text.TIM3_IRQHandler) refers to horloge.o(.bss.TIM3_Appel) for TIM3_Appel + horloge.o(.ARM.exidx.text.TIM3_IRQHandler) refers to horloge.o(.text.TIM3_IRQHandler) for [Anonymous Symbol] + horloge.o(.text.TIM4_IRQHandler) refers to horloge.o(.bss.TIM4_Appel) for TIM4_Appel + horloge.o(.ARM.exidx.text.TIM4_IRQHandler) refers to horloge.o(.text.TIM4_IRQHandler) for [Anonymous Symbol] + mygpio.o(.ARM.exidx.text.initGPIO_Interne) refers to mygpio.o(.text.initGPIO_Interne) for [Anonymous Symbol] + mygpio.o(.ARM.exidx.text.boutonAppuye_Interne) refers to mygpio.o(.text.boutonAppuye_Interne) for [Anonymous Symbol] + mygpio.o(.ARM.exidx.text.allumerDEL_Interne) refers to mygpio.o(.text.allumerDEL_Interne) for [Anonymous Symbol] + mygpio.o(.ARM.exidx.text.eteindreDEL_Interne) refers to mygpio.o(.text.eteindreDEL_Interne) for [Anonymous Symbol] + mygpio.o(.ARM.exidx.text.commuterDEL_Interne) refers to mygpio.o(.text.commuterDEL_Interne) for [Anonymous Symbol] + mygpio.o(.ARM.exidx.text.initGPIO_Externe) refers to mygpio.o(.text.initGPIO_Externe) for [Anonymous Symbol] + mygpio.o(.ARM.exidx.text.boutonAppuye_Externe) refers to mygpio.o(.text.boutonAppuye_Externe) for [Anonymous Symbol] + mygpio.o(.ARM.exidx.text.allumerDEL_Externe) refers to mygpio.o(.text.allumerDEL_Externe) for [Anonymous Symbol] + mygpio.o(.ARM.exidx.text.eteindreDEL_Externe) refers to mygpio.o(.text.eteindreDEL_Externe) for [Anonymous Symbol] + mygpio.o(.ARM.exidx.text.commuterDEL_Externe) refers to mygpio.o(.text.commuterDEL_Externe) for [Anonymous Symbol] + pwm.o(.ARM.exidx.text.MyTimer_PWM) refers to pwm.o(.text.MyTimer_PWM) for [Anonymous Symbol] + pwm.o(.ARM.exidx.text.Set_DutyCycle_PWM) refers to pwm.o(.text.Set_DutyCycle_PWM) for [Anonymous Symbol] + i2c.o(.ARM.exidx.text.initI2C) refers to i2c.o(.text.initI2C) for [Anonymous Symbol] + startup_stm32f10x_md.o(STACK) refers (Special) to heapauxi.o(.text) for __use_two_region_memory + startup_stm32f10x_md.o(HEAP) refers (Special) to heapauxi.o(.text) for __use_two_region_memory + startup_stm32f10x_md.o(RESET) refers (Special) to heapauxi.o(.text) for __use_two_region_memory + 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 horloge.o(.text.TIM2_IRQHandler) for TIM2_IRQHandler + startup_stm32f10x_md.o(RESET) refers to horloge.o(.text.TIM3_IRQHandler) for TIM3_IRQHandler + startup_stm32f10x_md.o(RESET) refers to horloge.o(.text.TIM4_IRQHandler) for TIM4_IRQHandler + startup_stm32f10x_md.o(RESET) refers to myuart.o(.text.USART1_IRQHandler) for USART1_IRQHandler + startup_stm32f10x_md.o(.text) refers (Special) to heapauxi.o(.text) for __use_two_region_memory + startup_stm32f10x_md.o(.text) refers to system_stm32f10x.o(.text.SystemInit) for SystemInit + startup_stm32f10x_md.o(.text) refers to __main.o(!!!main) for __main + startup_stm32f10x_md.o(.text) refers to startup_stm32f10x_md.o(HEAP) for Heap_Mem + startup_stm32f10x_md.o(.text) refers to startup_stm32f10x_md.o(STACK) for Stack_Mem + system_stm32f10x.o(.text.SystemInit) refers to system_stm32f10x.o(.text.SetSysClock) for SetSysClock + system_stm32f10x.o(.ARM.exidx.text.SystemInit) refers to system_stm32f10x.o(.text.SystemInit) for [Anonymous Symbol] + system_stm32f10x.o(.text.SetSysClock) refers to system_stm32f10x.o(.text.SetSysClockTo72) for SetSysClockTo72 + system_stm32f10x.o(.ARM.exidx.text.SetSysClock) refers to system_stm32f10x.o(.text.SetSysClock) for [Anonymous Symbol] + system_stm32f10x.o(.text.SystemCoreClockUpdate) refers to system_stm32f10x.o(.data.SystemCoreClock) for SystemCoreClock + system_stm32f10x.o(.text.SystemCoreClockUpdate) refers to system_stm32f10x.o(.rodata.AHBPrescTable) for AHBPrescTable + system_stm32f10x.o(.ARM.exidx.text.SystemCoreClockUpdate) refers to system_stm32f10x.o(.text.SystemCoreClockUpdate) for [Anonymous Symbol] + system_stm32f10x.o(.ARM.exidx.text.SetSysClockTo72) refers to system_stm32f10x.o(.text.SetSysClockTo72) for [Anonymous Symbol] + __main.o(!!!main) refers to __rtentry.o(.ARM.Collect$$rtentry$$00000000) for __rt_entry + __rtentry.o(.ARM.Collect$$rtentry$$00000000) refers (Special) to __rtentry2.o(.ARM.Collect$$rtentry$$0000000A) for __rt_entry_li + __rtentry.o(.ARM.Collect$$rtentry$$00000000) refers (Special) to __rtentry2.o(.ARM.Collect$$rtentry$$0000000D) for __rt_entry_main + __rtentry.o(.ARM.Collect$$rtentry$$00000000) refers (Special) to __rtentry2.o(.ARM.Collect$$rtentry$$0000000C) for __rt_entry_postli_1 + __rtentry.o(.ARM.Collect$$rtentry$$00000000) refers (Special) to __rtentry2.o(.ARM.Collect$$rtentry$$00000009) for __rt_entry_postsh_1 + __rtentry.o(.ARM.Collect$$rtentry$$00000000) refers (Special) to __rtentry2.o(.ARM.Collect$$rtentry$$00000002) for __rt_entry_presh_1 + __rtentry.o(.ARM.Collect$$rtentry$$00000000) refers (Special) to __rtentry4.o(.ARM.Collect$$rtentry$$00000004) for __rt_entry_sh + __rtentry2.o(.ARM.Collect$$rtentry$$00000008) refers to boardinit2.o(.text) for _platform_post_stackheap_init + __rtentry2.o(.ARM.Collect$$rtentry$$0000000A) refers to libinit.o(.ARM.Collect$$libinit$$00000000) for __rt_lib_init + __rtentry2.o(.ARM.Collect$$rtentry$$0000000B) refers to boardinit3.o(.text) for _platform_post_lib_init + __rtentry2.o(.ARM.Collect$$rtentry$$0000000D) refers to principal.o(.text.main) for main + __rtentry2.o(.ARM.Collect$$rtentry$$0000000D) refers to exit.o(.text) for exit + __rtentry2.o(.ARM.exidx) refers to __rtentry2.o(.ARM.Collect$$rtentry$$00000001) for .ARM.Collect$$rtentry$$00000001 + __rtentry2.o(.ARM.exidx) refers to __rtentry2.o(.ARM.Collect$$rtentry$$00000008) for .ARM.Collect$$rtentry$$00000008 + __rtentry2.o(.ARM.exidx) refers to __rtentry2.o(.ARM.Collect$$rtentry$$0000000A) for .ARM.Collect$$rtentry$$0000000A + __rtentry2.o(.ARM.exidx) refers to __rtentry2.o(.ARM.Collect$$rtentry$$0000000B) for .ARM.Collect$$rtentry$$0000000B + __rtentry2.o(.ARM.exidx) refers to __rtentry2.o(.ARM.Collect$$rtentry$$0000000D) for .ARM.Collect$$rtentry$$0000000D + __rtentry4.o(.ARM.Collect$$rtentry$$00000004) refers to sys_stackheap_outer.o(.text) for __user_setup_stackheap + __rtentry4.o(.ARM.exidx) refers to __rtentry4.o(.ARM.Collect$$rtentry$$00000004) for .ARM.Collect$$rtentry$$00000004 + sys_stackheap_outer.o(.text) refers to libspace.o(.text) for __user_perproc_libspace + sys_stackheap_outer.o(.text) refers to startup_stm32f10x_md.o(.text) for __user_initial_stackheap + exit.o(.text) refers to rtexit.o(.ARM.Collect$$rtexit$$00000000) for __rt_exit + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$00000030) for __rt_lib_init_alloca_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$0000002E) for __rt_lib_init_argv_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$0000001D) for __rt_lib_init_atexit_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$00000023) for __rt_lib_init_clock_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$00000034) for __rt_lib_init_cpp_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$00000032) for __rt_lib_init_exceptions_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$00000002) for __rt_lib_init_fp_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$00000021) for __rt_lib_init_fp_trap_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$00000025) for __rt_lib_init_getenv_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$0000000C) for __rt_lib_init_heap_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$00000013) for __rt_lib_init_lc_collate_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$00000015) for __rt_lib_init_lc_ctype_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$00000017) for __rt_lib_init_lc_monetary_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$00000019) for __rt_lib_init_lc_numeric_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$0000001B) for __rt_lib_init_lc_time_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$00000006) for __rt_lib_init_preinit_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$00000010) for __rt_lib_init_rand_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$00000004) for __rt_lib_init_relocate_pie_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$00000035) for __rt_lib_init_return + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$0000001F) for __rt_lib_init_signal_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$00000027) for __rt_lib_init_stdio_1 + libinit.o(.ARM.Collect$$libinit$$00000000) refers (Special) to libinit2.o(.ARM.Collect$$libinit$$0000000E) for __rt_lib_init_user_alloc_1 + libspace.o(.text) refers to libspace.o(.bss) for __libspace_start + rtexit.o(.ARM.Collect$$rtexit$$00000000) refers (Special) to rtexit2.o(.ARM.Collect$$rtexit$$00000004) for __rt_exit_exit + rtexit.o(.ARM.Collect$$rtexit$$00000000) refers (Special) to rtexit2.o(.ARM.Collect$$rtexit$$00000003) for __rt_exit_ls + rtexit.o(.ARM.Collect$$rtexit$$00000000) refers (Special) to rtexit2.o(.ARM.Collect$$rtexit$$00000002) for __rt_exit_prels_1 + rtexit.o(.ARM.exidx) refers (Special) to rtexit2.o(.ARM.Collect$$rtexit$$00000004) for __rt_exit_exit + rtexit.o(.ARM.exidx) refers (Special) to rtexit2.o(.ARM.Collect$$rtexit$$00000003) for __rt_exit_ls + rtexit.o(.ARM.exidx) refers (Special) to rtexit2.o(.ARM.Collect$$rtexit$$00000002) for __rt_exit_prels_1 + rtexit.o(.ARM.exidx) refers to rtexit.o(.ARM.Collect$$rtexit$$00000000) for .ARM.Collect$$rtexit$$00000000 + libinit2.o(.ARM.Collect$$libinit$$00000012) refers to libinit2.o(.ARM.Collect$$libinit$$00000011) for .ARM.Collect$$libinit$$00000011 + libinit2.o(.ARM.Collect$$libinit$$00000014) refers to libinit2.o(.ARM.Collect$$libinit$$00000011) for .ARM.Collect$$libinit$$00000011 + libinit2.o(.ARM.Collect$$libinit$$00000016) refers to libinit2.o(.ARM.Collect$$libinit$$00000011) for .ARM.Collect$$libinit$$00000011 + libinit2.o(.ARM.Collect$$libinit$$00000018) refers to libinit2.o(.ARM.Collect$$libinit$$00000011) for .ARM.Collect$$libinit$$00000011 + libinit2.o(.ARM.Collect$$libinit$$0000001A) refers to libinit2.o(.ARM.Collect$$libinit$$00000011) for .ARM.Collect$$libinit$$00000011 + libinit2.o(.ARM.Collect$$libinit$$00000028) refers to argv_veneer.o(.emb_text) for __ARM_argv_veneer + libinit2.o(.ARM.Collect$$libinit$$00000029) refers to argv_veneer.o(.emb_text) for __ARM_argv_veneer + rtexit2.o(.ARM.Collect$$rtexit$$00000003) refers to libshutdown.o(.ARM.Collect$$libshutdown$$00000000) for __rt_lib_shutdown + rtexit2.o(.ARM.Collect$$rtexit$$00000004) refers to sys_exit.o(.text) for _sys_exit + rtexit2.o(.ARM.exidx) refers to rtexit2.o(.ARM.Collect$$rtexit$$00000001) for .ARM.Collect$$rtexit$$00000001 + rtexit2.o(.ARM.exidx) refers to rtexit2.o(.ARM.Collect$$rtexit$$00000003) for .ARM.Collect$$rtexit$$00000003 + rtexit2.o(.ARM.exidx) refers to rtexit2.o(.ARM.Collect$$rtexit$$00000004) for .ARM.Collect$$rtexit$$00000004 + argv_veneer.o(.emb_text) refers to no_argv.o(.text) for __ARM_get_argv + sys_exit.o(.text) refers (Special) to use_no_semi.o(.text) for __I$use$semihosting + sys_exit.o(.text) refers (Special) to indicate_semi.o(.text) for __semihosting_library_function + sys_exit_hlt.o(.text) refers (Special) to use_no_semi.o(.text) for __I$use$semihosting + sys_exit_hlt.o(.text) refers (Special) to indicate_semi.o(.text) for __semihosting_library_function + _get_argv_nomalloc.o(.text) refers (Special) to hrguard.o(.text) for __heap_region$guard + _get_argv_nomalloc.o(.text) refers to defsig_rtmem_outer.o(.text) for __rt_SIGRTMEM + _get_argv_nomalloc.o(.text) refers to sys_command.o(.text) for _sys_command_string + libshutdown.o(.ARM.Collect$$libshutdown$$00000000) refers (Special) to libshutdown2.o(.ARM.Collect$$libshutdown$$00000002) for __rt_lib_shutdown_cpp_1 + libshutdown.o(.ARM.Collect$$libshutdown$$00000000) refers (Special) to libshutdown2.o(.ARM.Collect$$libshutdown$$00000007) for __rt_lib_shutdown_fp_trap_1 + libshutdown.o(.ARM.Collect$$libshutdown$$00000000) refers (Special) to libshutdown2.o(.ARM.Collect$$libshutdown$$0000000F) for __rt_lib_shutdown_heap_1 + libshutdown.o(.ARM.Collect$$libshutdown$$00000000) refers (Special) to libshutdown2.o(.ARM.Collect$$libshutdown$$00000010) for __rt_lib_shutdown_return + libshutdown.o(.ARM.Collect$$libshutdown$$00000000) refers (Special) to libshutdown2.o(.ARM.Collect$$libshutdown$$0000000A) for __rt_lib_shutdown_signal_1 + libshutdown.o(.ARM.Collect$$libshutdown$$00000000) refers (Special) to libshutdown2.o(.ARM.Collect$$libshutdown$$00000004) for __rt_lib_shutdown_stdio_1 + libshutdown.o(.ARM.Collect$$libshutdown$$00000000) refers (Special) to libshutdown2.o(.ARM.Collect$$libshutdown$$0000000C) for __rt_lib_shutdown_user_alloc_1 + sys_command.o(.text) refers (Special) to use_no_semi.o(.text) for __I$use$semihosting + sys_command.o(.text) refers (Special) to indicate_semi.o(.text) for __semihosting_library_function + sys_command_hlt.o(.text) refers (Special) to use_no_semi.o(.text) for __I$use$semihosting + sys_command_hlt.o(.text) refers (Special) to indicate_semi.o(.text) for __semihosting_library_function + defsig_rtmem_outer.o(.text) refers to defsig_rtmem_inner.o(.text) for __rt_SIGRTMEM_inner + defsig_rtmem_outer.o(.text) refers to defsig_exit.o(.text) for __sig_exit + defsig_rtmem_formal.o(.text) refers to rt_raise.o(.text) for __rt_raise + rt_raise.o(.text) refers to __raise.o(.text) for __raise + rt_raise.o(.text) refers to sys_exit.o(.text) for _sys_exit + defsig_exit.o(.text) refers to sys_exit.o(.text) for _sys_exit + defsig_rtmem_inner.o(.text) refers to defsig_general.o(.text) for __default_signal_display + __raise.o(.text) refers to defsig.o(CL$$defsig) for __default_signal_handler + defsig_general.o(.text) refers to sys_wrch.o(.text) for _ttywrch + sys_wrch.o(.text) refers (Special) to use_no_semi.o(.text) for __I$use$semihosting + sys_wrch.o(.text) refers (Special) to indicate_semi.o(.text) for __semihosting_library_function + sys_wrch_hlt.o(.text) refers (Special) to use_no_semi.o(.text) for __I$use$semihosting + sys_wrch_hlt.o(.text) refers (Special) to indicate_semi.o(.text) for __semihosting_library_function + defsig.o(CL$$defsig) refers to defsig_rtmem_inner.o(.text) for __rt_SIGRTMEM_inner + defsig_abrt_inner.o(.text) refers to defsig_general.o(.text) for __default_signal_display + defsig_fpe_inner.o(.text) refers to defsig_general.o(.text) for __default_signal_display + defsig_rtred_inner.o(.text) refers to defsig_general.o(.text) for __default_signal_display + defsig_stak_inner.o(.text) refers to defsig_general.o(.text) for __default_signal_display + defsig_pvfn_inner.o(.text) refers to defsig_general.o(.text) for __default_signal_display + defsig_cppl_inner.o(.text) refers to defsig_general.o(.text) for __default_signal_display + defsig_segv_inner.o(.text) refers to defsig_general.o(.text) for __default_signal_display + defsig_other.o(.text) refers to defsig_general.o(.text) for __default_signal_display + + +============================================================================== + +Removing Unused input sections from the image. + + Removing principal.o(.text), (0 bytes). + Removing principal.o(.ARM.exidx.text.pilotage), (8 bytes). + Removing principal.o(.ARM.exidx.text.main), (8 bytes). + Removing principal.o(.ARM.use_no_argv), (4 bytes). + Removing accelerometre.o(.text), (0 bytes). + Removing accelerometre.o(.ARM.exidx.text.initAccelo), (8 bytes). + Removing accelerometre.o(.ARM.exidx.text.RecupAccelo), (8 bytes). + Removing accelerometre.o(.ARM.exidx.text.initLacheur), (8 bytes). + Removing accelerometre.o(.ARM.exidx.text.LacheVoile), (8 bytes). + Removing girouette.o(.text), (0 bytes). + Removing girouette.o(.ARM.exidx.text.configEncoder), (8 bytes). + Removing girouette.o(.ARM.exidx.text.angleVent), (8 bytes). + Removing girouette.o(.ARM.exidx.text.vent2voile), (8 bytes). + Removing girouette.o(.ARM.exidx.text.LocaliserZero), (8 bytes). + Removing myuart.o(.text), (0 bytes). + Removing myuart.o(.ARM.exidx.text.My_USART_Config), (8 bytes). + Removing myuart.o(.ARM.exidx.text.__NVIC_EnableIRQ), (8 bytes). + Removing myuart.o(.ARM.exidx.text.__NVIC_SetPriority), (8 bytes). + Removing myuart.o(.ARM.exidx.text.USART_Send_Char), (8 bytes). + Removing myuart.o(.ARM.exidx.text.USART_Send_String), (8 bytes). + Removing myuart.o(.ARM.exidx.text.USART_IT_Receive_Enable), (8 bytes). + Removing myuart.o(.ARM.exidx.text.Init_IT_Receive), (8 bytes). + Removing myuart.o(.ARM.exidx.text.USART1_IRQHandler), (8 bytes). + Removing servo.o(.text), (0 bytes). + Removing servo.o(.ARM.exidx.text.Servo_Moteur), (8 bytes). + Removing servo.o(.ARM.exidx.text.initServo), (8 bytes). + Removing plateau.o(.text), (0 bytes). + Removing plateau.o(.ARM.exidx.text.initPlato), (8 bytes). + Removing plateau.o(.ARM.exidx.text.Update_Motor_PWM), (8 bytes). + Removing drivergpio.o(.text), (0 bytes). + Removing drivergpio.o(.ARM.exidx.text.MyGPIO_Init), (8 bytes). + Removing drivergpio.o(.ARM.exidx.text.MyGPIO_Read), (8 bytes). + Removing drivergpio.o(.text.MyGPIO_Set), (24 bytes). + Removing drivergpio.o(.ARM.exidx.text.MyGPIO_Set), (8 bytes). + Removing drivergpio.o(.text.MyGPIO_Reset), (28 bytes). + Removing drivergpio.o(.ARM.exidx.text.MyGPIO_Reset), (8 bytes). + Removing drivergpio.o(.ARM.exidx.text.MYGPIO_PinOn), (8 bytes). + Removing drivergpio.o(.ARM.exidx.text.MYGPIO_PinOff), (8 bytes). + Removing drivergpio.o(.text.MyGPIO_Toggle), (30 bytes). + Removing drivergpio.o(.ARM.exidx.text.MyGPIO_Toggle), (8 bytes). + Removing horloge.o(.text), (0 bytes). + Removing horloge.o(.ARM.exidx.text.Timer_Init), (8 bytes). + Removing horloge.o(.text.MyTimer_ActiveIT), (268 bytes). + Removing horloge.o(.ARM.exidx.text.MyTimer_ActiveIT), (8 bytes). + Removing horloge.o(.text.__NVIC_EnableIRQ), (48 bytes). + Removing horloge.o(.ARM.exidx.text.__NVIC_EnableIRQ), (8 bytes). + Removing horloge.o(.text.__NVIC_SetPriority), (66 bytes). + Removing horloge.o(.ARM.exidx.text.__NVIC_SetPriority), (8 bytes). + Removing horloge.o(.ARM.exidx.text.TIM2_IRQHandler), (8 bytes). + Removing horloge.o(.ARM.exidx.text.TIM3_IRQHandler), (8 bytes). + Removing horloge.o(.ARM.exidx.text.TIM4_IRQHandler), (8 bytes). + Removing mygpio.o(.text), (0 bytes). + Removing mygpio.o(.text.initGPIO_Interne), (66 bytes). + Removing mygpio.o(.ARM.exidx.text.initGPIO_Interne), (8 bytes). + Removing mygpio.o(.text.boutonAppuye_Interne), (16 bytes). + Removing mygpio.o(.ARM.exidx.text.boutonAppuye_Interne), (8 bytes). + Removing mygpio.o(.text.allumerDEL_Interne), (18 bytes). + Removing mygpio.o(.ARM.exidx.text.allumerDEL_Interne), (8 bytes). + Removing mygpio.o(.text.eteindreDEL_Interne), (18 bytes). + Removing mygpio.o(.ARM.exidx.text.eteindreDEL_Interne), (8 bytes). + Removing mygpio.o(.text.commuterDEL_Interne), (18 bytes). + Removing mygpio.o(.ARM.exidx.text.commuterDEL_Interne), (8 bytes). + Removing mygpio.o(.text.initGPIO_Externe), (58 bytes). + Removing mygpio.o(.ARM.exidx.text.initGPIO_Externe), (8 bytes). + Removing mygpio.o(.text.boutonAppuye_Externe), (16 bytes). + Removing mygpio.o(.ARM.exidx.text.boutonAppuye_Externe), (8 bytes). + Removing mygpio.o(.text.allumerDEL_Externe), (18 bytes). + Removing mygpio.o(.ARM.exidx.text.allumerDEL_Externe), (8 bytes). + Removing mygpio.o(.text.eteindreDEL_Externe), (18 bytes). + Removing mygpio.o(.ARM.exidx.text.eteindreDEL_Externe), (8 bytes). + Removing mygpio.o(.text.commuterDEL_Externe), (18 bytes). + Removing mygpio.o(.ARM.exidx.text.commuterDEL_Externe), (8 bytes). + Removing pwm.o(.text), (0 bytes). + Removing pwm.o(.ARM.exidx.text.MyTimer_PWM), (8 bytes). + Removing pwm.o(.ARM.exidx.text.Set_DutyCycle_PWM), (8 bytes). + Removing i2c.o(.text), (0 bytes). + Removing i2c.o(.text.initI2C), (42 bytes). + Removing i2c.o(.ARM.exidx.text.initI2C), (8 bytes). + Removing system_stm32f10x.o(.text), (0 bytes). + Removing system_stm32f10x.o(.ARM.exidx.text.SystemInit), (8 bytes). + Removing system_stm32f10x.o(.ARM.exidx.text.SetSysClock), (8 bytes). + Removing system_stm32f10x.o(.text.SystemCoreClockUpdate), (290 bytes). + Removing system_stm32f10x.o(.ARM.exidx.text.SystemCoreClockUpdate), (8 bytes). + Removing system_stm32f10x.o(.ARM.exidx.text.SetSysClockTo72), (8 bytes). + Removing system_stm32f10x.o(.data.SystemCoreClock), (4 bytes). + Removing system_stm32f10x.o(.rodata.AHBPrescTable), (16 bytes). + +86 unused section(s) (total 1508 bytes) removed from the image. diff --git a/Objects/ProjetVide.build_log.htm b/Objects/ProjetVide.build_log.htm index 6441825..a1f3f9e 100644 --- a/Objects/ProjetVide.build_log.htm +++ b/Objects/ProjetVide.build_log.htm @@ -26,41 +26,20 @@ Project File Date: 12/16/2025

Output:

*** Using Compiler 'V6.23', folder: 'C:\Keil\542a\ARM\ARMCLANG\Bin' -Rebuild target 'Simulation' -Pilotes/Source/Horloge.c(75): error: redefinition of 'TIM2_IRQHandler' - 75 | void TIM2_IRQHandler(void) { //On redefinit le IRQHandler qui est dj ecrit dans le code source - | ^ -Pilotes/Source/Horloge.c(33): note: previous definition is here - 33 | void TIM2_IRQHandler(void) { //On redefinit le IRQHandler qui est dj ecrit dans le code source - | ^ -1 error generated. -compiling Horloge.c... -compiling DriverGPIO.c... -Services/Source/Girouette.c(13): error: call to undeclared function 'Timer_init'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] - 13 | Timer_init(Timer, 0, 0); - | ^ -Services/Source/Girouette.c(13): note: did you mean 'Timer_Init'? -./Pilotes/Include\Horloge.h(10): note: 'Timer_Init' declared here - 10 | void Timer_Init(TIM_TypeDef *Timer, unsigned short Autoreload, unsigned short Prescaler); - | ^ -1 error generated. -compiling Girouette.c... -compiling Servo.c... -compiling MyUart.c... -Application/principal.c(8): warning: In file included from... -./Pilotes/Include\RTC.h(4): error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int] - 4 | initRTC(); - | ^ - | int -1 error generated. +Build target 'Simulation' compiling principal.c... -compiling Accelerometre.c... -compiling MYGPIO.c... -compiling PWM.c... -compiling I2C.c... -compiling system_stm32f10x.c... -assembling startup_stm32f10x_md.s... -".\Objects\ProjetVide.axf" - 3 Error(s), 0 Warning(s). +linking... +.\Objects\ProjetVide.axf: Error: L6218E: Undefined symbol initRTC (referred from principal.o). +.\Objects\ProjetVide.axf: Error: L6218E: Undefined symbol getTime (referred from principal.o). +.\Objects\ProjetVide.axf: Error: L6218E: Undefined symbol MySPI_Init (referred from accelerometre.o). +.\Objects\ProjetVide.axf: Error: L6218E: Undefined symbol MySPI_Clear_NSS (referred from accelerometre.o). +.\Objects\ProjetVide.axf: Error: L6218E: Undefined symbol MySPI_Send (referred from accelerometre.o). +.\Objects\ProjetVide.axf: Error: L6218E: Undefined symbol MySPI_Set_NSS (referred from accelerometre.o). +.\Objects\ProjetVide.axf: Error: L6218E: Undefined symbol MySPI_Read (referred from accelerometre.o). +Not enough information to list image symbols. +Not enough information to list load addresses in the image map. +Finished: 2 information, 0 warning and 7 error messages. +".\Objects\ProjetVide.axf" - 7 Error(s), 0 Warning(s).

Software Packages used:

diff --git a/Objects/ProjetVide.lnp b/Objects/ProjetVide.lnp index 025ec31..cf79c38 100644 --- a/Objects/ProjetVide.lnp +++ b/Objects/ProjetVide.lnp @@ -4,12 +4,11 @@ ".\objects\girouette.o" ".\objects\myuart.o" ".\objects\servo.o" +".\objects\plateau.o" ".\objects\drivergpio.o" ".\objects\horloge.o" ".\objects\mygpio.o" -".\objects\mytimer.o" ".\objects\pwm.o" -".\objects\timer.o" ".\objects\i2c.o" ".\objects\startup_stm32f10x_md.o" ".\objects\system_stm32f10x.o" diff --git a/Objects/ProjetVoilier_Simulation.dep b/Objects/ProjetVoilier_Simulation.dep index 9f1335c..c0983ab 100644 --- a/Objects/ProjetVoilier_Simulation.dep +++ b/Objects/ProjetVoilier_Simulation.dep @@ -1,6 +1,6 @@ Dependencies for Project 'ProjetVoilier', Target 'Simulation': (DO NOT MODIFY !) CompilerVersion: 6230000::V6.23::ARMCLANG -F (.\Application\principal.c)(0x6941A6B5)(-xc --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O0 -ffunction-sections -Wall -Wextra -Wno-packed -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./Pilotes/Include -I ./Pilotes/Source -I ./Services/Source -I ./Services/Include -I . -I ./Objects -I./RTE/Device/STM32F103RB -I./RTE/_Simulation -IC:/ProgramData/Keil/Packs/ARM/CMSIS/6.2.0/CMSIS/Core/Include -IC:/ProgramData/Keil/Packs/Keil/STM32F1xx_DFP/2.4.1/Device/Include -D__UVISION_VERSION="542" -DSTM32F10X_MD -D_RTE_ -o ./objects/principal.o -MMD) +F (.\Application\principal.c)(0x6941AAEF)(-xc --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O0 -ffunction-sections -Wall -Wextra -Wno-packed -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./Pilotes/Include -I ./Pilotes/Source -I ./Services/Source -I ./Services/Include -I . -I ./Objects -I./RTE/Device/STM32F103RB -I./RTE/_Simulation -IC:/ProgramData/Keil/Packs/ARM/CMSIS/6.2.0/CMSIS/Core/Include -IC:/ProgramData/Keil/Packs/Keil/STM32F1xx_DFP/2.4.1/Device/Include -D__UVISION_VERSION="542" -DSTM32F10X_MD -D_RTE_ -o ./objects/principal.o -MMD) I (C:\ProgramData\Keil\Packs\Keil\STM32F1xx_DFP\2.4.1\Device\Include\stm32f10x.h)(0x6853B9CE) I (RTE\_Simulation\RTE_Components.h)(0x69419DE7) I (C:\ProgramData\Keil\Packs\ARM\CMSIS\6.2.0\CMSIS\Core\Include\core_cm3.h)(0x6853B99E) @@ -9,8 +9,10 @@ I (Pilotes\Include\Horloge.h)(0x69419DE6) I (Services\Include\Accelerometre.h)(0x69419DE7) I (Services\Include\Girouette.h)(0x69419DE7) I (Services\Include\Servo.h)(0x69419DE7) +I (Pilotes\Include\MyUart.h)(0x6941AA24) +I (Pilotes\Include\Plateau.h)(0x6941A967) I (Pilotes\Include\I2C.h)(0x69419DE6) -I (Pilotes\Include\RTC.h)(0x6941A458) +I (Pilotes\Include\RTC.h)(0x6941ABAC) F (.\Services\Source\Accelerometre.c)(0x69419DE7)(-xc --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O0 -ffunction-sections -Wall -Wextra -Wno-packed -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./Pilotes/Include -I ./Pilotes/Source -I ./Services/Source -I ./Services/Include -I . -I ./Objects -I./RTE/Device/STM32F103RB -I./RTE/_Simulation -IC:/ProgramData/Keil/Packs/ARM/CMSIS/6.2.0/CMSIS/Core/Include -IC:/ProgramData/Keil/Packs/Keil/STM32F1xx_DFP/2.4.1/Device/Include -D__UVISION_VERSION="542" -DSTM32F10X_MD -D_RTE_ -o ./objects/accelerometre.o -MMD) I (C:\ProgramData\Keil\Packs\Keil\STM32F1xx_DFP\2.4.1\Device\Include\stm32f10x.h)(0x6853B9CE) I (RTE\_Simulation\RTE_Components.h)(0x69419DE7) @@ -20,7 +22,7 @@ I (Pilotes\Include\Horloge.h)(0x69419DE6) I (Pilotes\Include\MySPI.h)(0x69419DE6) I (Services\Include\Accelerometre.h)(0x69419DE7) I (Services\Include\Servo.h)(0x69419DE7) -F (.\Services\Source\Girouette.c)(0x69419DE7)(-xc --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O0 -ffunction-sections -Wall -Wextra -Wno-packed -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./Pilotes/Include -I ./Pilotes/Source -I ./Services/Source -I ./Services/Include -I . -I ./Objects -I./RTE/Device/STM32F103RB -I./RTE/_Simulation -IC:/ProgramData/Keil/Packs/ARM/CMSIS/6.2.0/CMSIS/Core/Include -IC:/ProgramData/Keil/Packs/Keil/STM32F1xx_DFP/2.4.1/Device/Include -D__UVISION_VERSION="542" -DSTM32F10X_MD -D_RTE_ -o ./objects/girouette.o -MMD) +F (.\Services\Source\Girouette.c)(0x6941AB12)(-xc --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O0 -ffunction-sections -Wall -Wextra -Wno-packed -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./Pilotes/Include -I ./Pilotes/Source -I ./Services/Source -I ./Services/Include -I . -I ./Objects -I./RTE/Device/STM32F103RB -I./RTE/_Simulation -IC:/ProgramData/Keil/Packs/ARM/CMSIS/6.2.0/CMSIS/Core/Include -IC:/ProgramData/Keil/Packs/Keil/STM32F1xx_DFP/2.4.1/Device/Include -D__UVISION_VERSION="542" -DSTM32F10X_MD -D_RTE_ -o ./objects/girouette.o -MMD) I (C:\ProgramData\Keil\Packs\Keil\STM32F1xx_DFP\2.4.1\Device\Include\stm32f10x.h)(0x6853B9CE) I (RTE\_Simulation\RTE_Components.h)(0x69419DE7) I (C:\ProgramData\Keil\Packs\ARM\CMSIS\6.2.0\CMSIS\Core\Include\core_cm3.h)(0x6853B99E) @@ -44,13 +46,21 @@ I (C:\ProgramData\Keil\Packs\Keil\STM32F1xx_DFP\2.4.1\Device\Include\system_stm3 I (Pilotes\Include\DriverGPIO.h)(0x6941A7A8) I (Pilotes\Include\PWM.h)(0x69419DE6) I (Pilotes\Include\Horloge.h)(0x69419DE6) +F (\\netapp2\jdreschler\Documents\ProjetVoilier\BE_VOILIER\Pilotes\Source\Plateau.c)(0x6941AB75)(-xc --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O0 -ffunction-sections -Wall -Wextra -Wno-packed -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./Pilotes/Include -I ./Pilotes/Source -I ./Services/Source -I ./Services/Include -I . -I ./Objects -I./RTE/Device/STM32F103RB -I./RTE/_Simulation -IC:/ProgramData/Keil/Packs/ARM/CMSIS/6.2.0/CMSIS/Core/Include -IC:/ProgramData/Keil/Packs/Keil/STM32F1xx_DFP/2.4.1/Device/Include -D__UVISION_VERSION="542" -DSTM32F10X_MD -D_RTE_ -o ./objects/plateau.o -MMD) +I (C:\ProgramData\Keil\Packs\Keil\STM32F1xx_DFP\2.4.1\Device\Include\stm32f10x.h)(0x6853B9CE) +I (RTE\_Simulation\RTE_Components.h)(0x69419DE7) +I (C:\ProgramData\Keil\Packs\ARM\CMSIS\6.2.0\CMSIS\Core\Include\core_cm3.h)(0x6853B99E) +I (C:\ProgramData\Keil\Packs\Keil\STM32F1xx_DFP\2.4.1\Device\Include\system_stm32f10x.h)(0x6853B9CE) +I (Pilotes\Include\PWM.h)(0x69419DE6) +I (Pilotes\Include\DriverGPIO.h)(0x6941A7A8) +I (Pilotes\Include\Horloge.h)(0x69419DE6) F (.\Pilotes\Source\DriverGPIO.c)(0x6941A787)(-xc --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O0 -ffunction-sections -Wall -Wextra -Wno-packed -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./Pilotes/Include -I ./Pilotes/Source -I ./Services/Source -I ./Services/Include -I . -I ./Objects -I./RTE/Device/STM32F103RB -I./RTE/_Simulation -IC:/ProgramData/Keil/Packs/ARM/CMSIS/6.2.0/CMSIS/Core/Include -IC:/ProgramData/Keil/Packs/Keil/STM32F1xx_DFP/2.4.1/Device/Include -D__UVISION_VERSION="542" -DSTM32F10X_MD -D_RTE_ -o ./objects/drivergpio.o -MMD) I (C:\ProgramData\Keil\Packs\Keil\STM32F1xx_DFP\2.4.1\Device\Include\stm32f10x.h)(0x6853B9CE) I (RTE\_Simulation\RTE_Components.h)(0x69419DE7) I (C:\ProgramData\Keil\Packs\ARM\CMSIS\6.2.0\CMSIS\Core\Include\core_cm3.h)(0x6853B99E) I (C:\ProgramData\Keil\Packs\Keil\STM32F1xx_DFP\2.4.1\Device\Include\system_stm32f10x.h)(0x6853B9CE) I (Pilotes\Include\DriverGPIO.h)(0x6941A7A8) -F (.\Pilotes\Source\Horloge.c)(0x6941A458)(-xc --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O0 -ffunction-sections -Wall -Wextra -Wno-packed -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./Pilotes/Include -I ./Pilotes/Source -I ./Services/Source -I ./Services/Include -I . -I ./Objects -I./RTE/Device/STM32F103RB -I./RTE/_Simulation -IC:/ProgramData/Keil/Packs/ARM/CMSIS/6.2.0/CMSIS/Core/Include -IC:/ProgramData/Keil/Packs/Keil/STM32F1xx_DFP/2.4.1/Device/Include -D__UVISION_VERSION="542" -DSTM32F10X_MD -D_RTE_ -o ./objects/horloge.o -MMD) +F (.\Pilotes\Source\Horloge.c)(0x6941ABA0)(-xc --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -gdwarf-4 -O0 -ffunction-sections -Wall -Wextra -Wno-packed -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./Pilotes/Include -I ./Pilotes/Source -I ./Services/Source -I ./Services/Include -I . -I ./Objects -I./RTE/Device/STM32F103RB -I./RTE/_Simulation -IC:/ProgramData/Keil/Packs/ARM/CMSIS/6.2.0/CMSIS/Core/Include -IC:/ProgramData/Keil/Packs/Keil/STM32F1xx_DFP/2.4.1/Device/Include -D__UVISION_VERSION="542" -DSTM32F10X_MD -D_RTE_ -o ./objects/horloge.o -MMD) I (C:\ProgramData\Keil\Packs\Keil\STM32F1xx_DFP\2.4.1\Device\Include\stm32f10x.h)(0x6853B9CE) I (RTE\_Simulation\RTE_Components.h)(0x69419DE7) I (C:\ProgramData\Keil\Packs\ARM\CMSIS\6.2.0\CMSIS\Core\Include\core_cm3.h)(0x6853B99E) diff --git a/Objects/girouette.o b/Objects/girouette.o new file mode 100644 index 0000000..17197e7 Binary files /dev/null and b/Objects/girouette.o differ diff --git a/Objects/horloge.o b/Objects/horloge.o new file mode 100644 index 0000000..b9e6e1b Binary files /dev/null and b/Objects/horloge.o differ diff --git a/Objects/plateau.d b/Objects/plateau.d new file mode 100644 index 0000000..670de8d --- /dev/null +++ b/Objects/plateau.d @@ -0,0 +1,8 @@ +./objects/plateau.o: \ + \\netapp2\jdreschler\Documents\ProjetVoilier\BE_VOILIER\Pilotes\Source\Plateau.c \ + C:\ProgramData\Keil\Packs\Keil\STM32F1xx_DFP\2.4.1\Device\Include\stm32f10x.h \ + RTE\_Simulation\RTE_Components.h \ + C:\ProgramData\Keil\Packs\ARM\CMSIS\6.2.0\CMSIS\Core\Include\core_cm3.h \ + C:\ProgramData\Keil\Packs\Keil\STM32F1xx_DFP\2.4.1\Device\Include\system_stm32f10x.h \ + Pilotes\Include\PWM.h Pilotes\Include\DriverGPIO.h \ + Pilotes\Include\Horloge.h diff --git a/Objects/plateau.o b/Objects/plateau.o new file mode 100644 index 0000000..76189a9 Binary files /dev/null and b/Objects/plateau.o differ diff --git a/Objects/principal.d b/Objects/principal.d index 6b3c9ad..d28c550 100644 --- a/Objects/principal.d +++ b/Objects/principal.d @@ -5,4 +5,5 @@ C:\ProgramData\Keil\Packs\Keil\STM32F1xx_DFP\2.4.1\Device\Include\system_stm32f10x.h \ Pilotes\Include\Horloge.h Services\Include\Accelerometre.h \ Services\Include\Girouette.h Services\Include\Servo.h \ + Pilotes\Include\MyUart.h Pilotes\Include\Plateau.h \ Pilotes\Include\I2C.h Pilotes\Include\RTC.h diff --git a/Objects/principal.o b/Objects/principal.o new file mode 100644 index 0000000..0fa8804 Binary files /dev/null and b/Objects/principal.o differ diff --git a/Pilotes/Include/RTC.h b/Pilotes/Include/RTC.h index c6677c2..4391b3d 100644 --- a/Pilotes/Include/RTC.h +++ b/Pilotes/Include/RTC.h @@ -1,7 +1,7 @@ #ifndef RTC_H_ #define RTC_H_ #include -initRTC(); +void initRTC(); int getTime(); diff --git a/Pilotes/Source/Horloge.c b/Pilotes/Source/Horloge.c index a33396a..71d43bc 100644 --- a/Pilotes/Source/Horloge.c +++ b/Pilotes/Source/Horloge.c @@ -29,14 +29,6 @@ void Timer_Init(TIM_TypeDef *Timer, unsigned short Autoreload, unsigned short Pr } -//La fonction TIM2_IRQHandler existe déjà dans le processeur, on l'a juste redifint, tel qu'à chaque overflow on met un bit 1 dans GPIOA_ODR -void TIM2_IRQHandler(void) { //On redefinit le IRQHandler qui est déjà ecrit dans le code source - if (TIM2->SR & TIM_SR_UIF) { //On met le bit de overflow à un dès qu'on a overflow - TIM2->SR &= ~TIM_SR_UIF; //Remise à zero - - if (TIM2_Appel){TIM2_Appel();} - } -} void MyTimer_ActiveIT(TIM_TypeDef * Timer, char Prio, void(*Interrupt_fonc)(void)) { //On veut créer une fonction qui envoie un signal au cas où il y a debordement, avec une prioritaire, 0 plus importante 15 moins importante if (Timer == TIM2) { diff --git a/Pilotes/Source/Plateau.c b/Pilotes/Source/Plateau.c index dc446f1..d4d74f2 100644 --- a/Pilotes/Source/Plateau.c +++ b/Pilotes/Source/Plateau.c @@ -1,12 +1,13 @@ #include "stm32f10x.h" #include "PWM.h" +#include "DriverGPIO.h" +#include "Horloge.h" void initPlato(TIM_TypeDef * Timer, int Channel){ // Config du moteur servo MyGPIO_Init(GPIOB, 5, AltOut_Ppull); //config pin de direction 0 ou 1 if (Timer == TIM3) { - EnableTimer(TIM3); - MyTimer_Base_Init(TIM3, 159, 17); // Pour obtenir fréq de 20kHZ + Timer_Init(TIM3, 159, 17); // Pour obtenir fréq de 20kHZ if (Channel == 3){ MyGPIO_Init(GPIOB, 0, AltOut_Ppull); // Outut push pull alternate, config pin de consigne entre -100 et 100 MyTimer_PWM(TIM3, 3); //TIM3 CH3 diff --git a/ProjetVoilier.uvguix.jdreschler b/ProjetVoilier.uvguix.jdreschler index 521621d..b265f70 100644 --- a/ProjetVoilier.uvguix.jdreschler +++ b/ProjetVoilier.uvguix.jdreschler @@ -6,7 +6,7 @@
### uVision Project, (C) Keil Software
- \\netapp2\orvik\Bureau\BE_VOILIER\ProjetVoilier\Pilotes\Source + \\netapp2\jdreschler\Documents\ProjetVoilier\BE_VOILIER\Pilotes\Source @@ -90,8 +90,8 @@ 44 - 0 - 1 + 2 + 3 -1 -1 @@ -110,8 +110,8 @@ 0 - 1037 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000900000008000000010000003D553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C50696C6F7465735C536F757263655C4D79556172742E6300000000084D79556172742E6300000000C5D4F200FFFFFFFF41553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C50696C6F7465735C536F757263655C4472697665724750494F2E63000000000C4472697665724750494F2E6300000000FFDC7800FFFFFFFF3D553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C4170706C69636174696F6E5C7072696E636970616C2E63000000000B7072696E636970616C2E6300000000BECEA100FFFFFFFF3E553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C50696C6F7465735C536F757263655C486F726C6F67652E630000000009486F726C6F67652E6300000000F0A0A100FFFFFFFF53553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000BCA8E100FFFFFFFF3F553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C50696C6F7465735C496E636C7564655C486F726C6F67652E680000000009486F726C6F67652E68000000009CC1B600FFFFFFFF4D433A5C50726F6772616D446174615C4B65696C5C5061636B735C4B65696C5C53544D3332463178785F4446505C322E342E315C4465766963655C496E636C7564655C73746D3332663130782E68000000000B73746D3332663130782E6800000000F7B88600FFFFFFFF42553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C50696C6F7465735C496E636C7564655C4472697665724750494F2E68000000000C4472697665724750494F2E6800000000D9ADC200FFFFFFFF3E553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C50696C6F7465735C536F757263655C506C61746561752E630000000009506C61746561752E6300000000A5C2D700FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F50000006E000000BF030000C8030000 + 1579 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000F0000000E000000010000003D553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C50696C6F7465735C536F757263655C4D79556172742E6300000000084D79556172742E6300000000C5D4F200FFFFFFFF41553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C50696C6F7465735C536F757263655C4472697665724750494F2E63000000000C4472697665724750494F2E6300000000FFDC7800FFFFFFFF3D553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C4170706C69636174696F6E5C7072696E636970616C2E63000000000B7072696E636970616C2E6300000000BECEA100FFFFFFFF3E553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C50696C6F7465735C536F757263655C486F726C6F67652E630000000009486F726C6F67652E6300000000F0A0A100FFFFFFFF53553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000BCA8E100FFFFFFFF3F553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C50696C6F7465735C496E636C7564655C486F726C6F67652E680000000009486F726C6F67652E68000000009CC1B600FFFFFFFF4D433A5C50726F6772616D446174615C4B65696C5C5061636B735C4B65696C5C53544D3332463178785F4446505C322E342E315C4465766963655C496E636C7564655C73746D3332663130782E68000000000B73746D3332663130782E6800000000F7B88600FFFFFFFF42553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C50696C6F7465735C496E636C7564655C4472697665724750494F2E68000000000C4472697665724750494F2E6800000000D9ADC200FFFFFFFF3E553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C50696C6F7465735C536F757263655C506C61746561752E630000000009506C61746561752E6300000000A5C2D700FFFFFFFF3F553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C50696C6F7465735C496E636C7564655C506C61746561752E680000000009506C61746561752E6800000000B3A6BE00FFFFFFFF3A553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C50696C6F7465735C536F757263655C50574D2E63000000000550574D2E6300000000EAD6A300FFFFFFFF3E553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C50696C6F7465735C496E636C7564655C4D79556172742E6800000000084D79556172742E6800000000F6FA7D00FFFFFFFF41553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C53657276696365735C536F757263655C4769726F75657474652E63000000000B4769726F75657474652E6300000000B5E99D00FFFFFFFF505C5C6E6574617070325C6A6472657363686C65725C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C50696C6F7465735C536F757263655C506C61746561752E630000000009506C61746561752E63000000005FC3CF00FFFFFFFF3B553A5C446F63756D656E74735C50726F6A6574566F696C6965725C42455F564F494C4945525C50696C6F7465735C496E636C7564655C5254432E6800000000055254432E6800000000C1838300FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F40000006600000080070000C9030000 @@ -150,7 +150,7 @@ 0 16 - 0300000066000000ED00000090030000 + 0300000066000000ED00000099030000 16 @@ -170,7 +170,7 @@ 0 16 - 0300000066000000ED00000090030000 + 0300000066000000ED00000099030000 16 @@ -450,7 +450,7 @@ 0 16 - 0300000066000000ED00000090030000 + 0300000066000000ED00000099030000 16 @@ -470,7 +470,7 @@ 0 16 - 0300000066000000ED00000090030000 + 0300000066000000ED00000099030000 16 @@ -490,7 +490,7 @@ 0 16 - 00000000C1030000BE0300004D040000 + 00000000CA0300008007000056040000 16 @@ -530,7 +530,7 @@ 0 16 - 03000000C4030000BB03000034040000 + 03000000CD030000BB0300003D040000 16 @@ -1170,7 +1170,7 @@ 0 16 - 03000000C4030000BB03000034040000 + 03000000CD030000BB0300003D040000 16 @@ -1190,7 +1190,7 @@ 0 16 - 03000000C4030000BB03000034040000 + 03000000CD030000BB0300003D040000 16 @@ -1250,7 +1250,7 @@ 0 16 - 03000000C4030000BB03000034040000 + 03000000CD030000BB0300003D040000 16 @@ -1270,7 +1270,7 @@ 0 16 - 03000000C4030000BB03000034040000 + 03000000CD030000BB0300003D040000 16 @@ -1710,7 +1710,7 @@ 0 16 - 0000000000000000BE0300001C000000 + 0000000000000000D10300001C000000 16 @@ -1730,7 +1730,7 @@ 0 16 - 000000004D040000BE03000060040000 + 00000000560400008007000069040000 16 @@ -1799,7 +1799,7 @@ 3312 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000EF00000090050000F3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000FD0100002101000099060000C1010000F40000004F00000090050000EF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A00400006D020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A905000021010000990600003F030000A00400004F000000900500006D02000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000A9030000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000901000021010000F90100007B040000000000004F000000F0000000A90300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000059020000900500005D02000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000090100002F03000099060000E3030000000000005D020000900500001103000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC80200005D020000CC0200001103000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000A9030000BE030000AD030000010000000100001004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000090100007F040000C70400001F05000000000000AD030000BE0300004D0400000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000EF00000090050000F3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000FD0100002101000099060000C1010000F40000004F00000090050000EF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A00400006D020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A905000021010000990600003F030000A00400004F000000900500006D02000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000B2030000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000901000021010000F90100007B040000000000004F000000F0000000B20300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000059020000900500005D02000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000090100002F03000099060000E3030000000000005D020000900500001103000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC80200005D020000CC0200001103000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000B203000080070000B6030000010000000100001004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000090100007F040000C70400001F05000000000000B603000080070000560400000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 @@ -1822,7 +1822,7 @@ Build 989 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050010000000A53696D756C6174696F6E96000000000000000200045265656C0A53696D756C6174696F6E00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050010000000A53696D756C6174696F6E96000000000000000200045265656C0A53696D756C6174696F6E00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3603,12 +3603,12 @@ 0 100 - 8 + 14 .\Pilotes\Source\MyUart.c - 31 + 0 1 - 18 + 4 1 0 @@ -3616,7 +3616,7 @@ .\Pilotes\Source\DriverGPIO.c 55 - 44 + 43 84 1 @@ -3624,9 +3624,9 @@ .\Application\principal.c - 16 - 1 - 8 + 17 + 16 + 30 1 0 @@ -3634,8 +3634,8 @@ .\Pilotes\Source\Horloge.c 0 - 1 - 1 + 23 + 31 1 0 @@ -3651,9 +3651,9 @@ Pilotes\Include\Horloge.h - 66 + 0 1 - 16 + 10 1 0 @@ -3669,22 +3669,76 @@ Pilotes\Include\DriverGPIO.h - 0 + 15 1 - 20 + 17 1 0 U:\Documents\ProjetVoilier\BE_VOILIER\Pilotes\Source\Plateau.c - 29 + 39 1 - 27 + 20 0 0 + + Pilotes\Include\Plateau.h + 70 + 1 + 4 + 0 + + 0 + + + .\Pilotes\Source\PWM.c + 0 + 1 + 1 + 1 + + 0 + + + Pilotes\Include\MyUart.h + 12 + 1 + 6 + 0 + + 0 + + + .\Services\Source\Girouette.c + 13 + 1 + 15 + 1 + + 0 + + + \\netapp2\jdreschler\Documents\ProjetVoilier\BE_VOILIER\Pilotes\Source\Plateau.c + 22 + 1 + 11 + 1 + + 0 + + + Pilotes\Include\RTC.h + 0 + 1 + 9 + 1 + + 0 + diff --git a/ProjetVoilier.uvoptx b/ProjetVoilier.uvoptx index 815bd49..272bf8e 100644 --- a/ProjetVoilier.uvoptx +++ b/ProjetVoilier.uvoptx @@ -433,7 +433,7 @@ 2 4 1 - 0 + 1 0 0 .\Pilotes\Source\MyUart.c @@ -453,6 +453,18 @@ 0 0 + + 2 + 6 + 1 + 0 + 0 + 0 + \\netapp2\jdreschler\Documents\ProjetVoilier\BE_VOILIER\Pilotes\Source\Plateau.c + Plateau.c + 0 + 0 + @@ -463,9 +475,9 @@ 0 3 - 6 + 7 1 - 1 + 0 0 0 .\Pilotes\Source\DriverGPIO.c @@ -475,7 +487,7 @@ 3 - 7 + 8 1 0 0 @@ -487,7 +499,7 @@ 3 - 8 + 9 1 0 0 @@ -499,7 +511,7 @@ 3 - 9 + 10 1 0 0 @@ -511,7 +523,7 @@ 3 - 10 + 11 1 1 0 diff --git a/ProjetVoilier.uvprojx b/ProjetVoilier.uvprojx index c0eaf7d..6605cb8 100644 --- a/ProjetVoilier.uvprojx +++ b/ProjetVoilier.uvprojx @@ -414,6 +414,11 @@ 1 .\Services\Source\Servo.c + + Plateau.c + 1 + \\netapp2\jdreschler\Documents\ProjetVoilier\BE_VOILIER\Pilotes\Source\Plateau.c + @@ -862,6 +867,11 @@ 1 .\Services\Source\Servo.c + + Plateau.c + 1 + \\netapp2\jdreschler\Documents\ProjetVoilier\BE_VOILIER\Pilotes\Source\Plateau.c + diff --git a/Services/Source/Girouette.c b/Services/Source/Girouette.c index 6f3d61c..99cdae2 100644 --- a/Services/Source/Girouette.c +++ b/Services/Source/Girouette.c @@ -10,7 +10,7 @@ void configEncoder(TIM_TypeDef * Timer) { // Timer - Timer_init(Timer, 0, 0); + Timer_Init(Timer, 0, 0); // Settings Timer -> CCMR1 |= TIM_CCMR1_CC1S; // TI1FP1 mapped on TI1