diff --git a/FileInclude/Batterie.c b/FileInclude/Batterie.c new file mode 100644 index 0000000..cf33df4 --- /dev/null +++ b/FileInclude/Batterie.c @@ -0,0 +1,31 @@ +#include "Batterie.h" +#define NULL 0 + + + + +/* Delarations */ +MyGPIO_Struct_TypeDef GPIOC0; /* Les pins sont a remappés */ +int nivBatterie = 0; + +void Init_Batterie (void){ + + /* Configuration des GPIOs */ + GPIOC0.GPIO = GPIOC; + GPIOC0.GPIO_Pin = 0; + GPIOC0.GPIO_Conf = In_Analog; + MyGPIO_Init(&GPIOC0); + + /* On configure l'ADC */ + initADC(10); + startADC(); +} + + +int Get_Batterie (void){ + + nivBatterie = read(); // sur 12 bits + nivBatterie *= 100; + return (nivBatterie / 4095); // pour avoir le niveau sur 100% + +} diff --git a/FileInclude/Batterie.h b/FileInclude/Batterie.h new file mode 100644 index 0000000..4adbf03 --- /dev/null +++ b/FileInclude/Batterie.h @@ -0,0 +1,11 @@ +#ifndef MYBATTERIE_H +#define MYBATTERIE_H +#include "stm32f10x.h" +#include "MyADC.h" +#include "MyTimer.h" +#include "Driver_GPIO.h" + +void Init_Batterie (void); +int Get_Batterie (void); + +#endif diff --git a/FileInclude/MyADC.c b/FileInclude/MyADC.c index 6532fff..76955b8 100644 --- a/FileInclude/MyADC.c +++ b/FileInclude/MyADC.c @@ -21,6 +21,7 @@ void startADC(void) { int read(void) { int value ; + startADC(); // Recuperer le bit de End of conversion while (!(ADC1->SR & (0x01 << 1))); //on veut masquer les 12 bits les plus bas donc on prend le not de 0x0f >> 12 (111000000000) diff --git a/FileInclude/Plateau.c b/FileInclude/Plateau.c index b2ece7e..19a1ea2 100644 --- a/FileInclude/Plateau.c +++ b/FileInclude/Plateau.c @@ -37,10 +37,10 @@ void Init_Plateau (void) { void Set_Direction (char sens) { /* Rotation */ - if (sens == HORRAIRE){ + if (sens == ANTI_HORRAIRE){ MyGPIO_Reset(GPIOA5.GPIO, GPIOA5.GPIO_Pin); // on met à 0 } - else if (sens == ANTI_HORRAIRE) { + else if (sens == HORRAIRE) { MyGPIO_Set(GPIOA5.GPIO, GPIOA5.GPIO_Pin); // on met à 1 } } diff --git a/FileInclude/Plateau.h b/FileInclude/Plateau.h index 94cbceb..9ef064a 100644 --- a/FileInclude/Plateau.h +++ b/FileInclude/Plateau.h @@ -8,6 +8,6 @@ void Init_Plateau (void); void Set_Direction (char sens); void Set_Vitesse (char vitesse); -void Set_Moteur_Plateau(char sens, char vitesse); // -1 gauche et 1 droite +void Set_Moteur_Plateau(char sens, char vitesse); #endif diff --git a/FileInclude/Telecommande.c b/FileInclude/Telecommande.c index d66f23b..0bf148e 100644 --- a/FileInclude/Telecommande.c +++ b/FileInclude/Telecommande.c @@ -3,4 +3,83 @@ #include "Driver_GPIO.h" #include "Plateau.h" #include "Telecommande.h" +#define NULL 0 + +/* Declaration */ +USART_TypeDef USART ; +USART_TypeDef * Usart = &USART; +MyGPIO_Struct_TypeDef GPIOA10; // pin rx = reception +MyGPIO_Struct_TypeDef GPIOA9; // pin tx = envoie +void (* ptr) (char) = NULL; + +/* Configuration de l'UART */ +void Init_USART (USART_TypeDef * USART){ + + /* Configuration des GPIOs */ + GPIOA10.GPIO = GPIOA; + GPIOA10.GPIO_Pin = 10; + GPIOA10.GPIO_Conf = In_Floating; + MyGPIO_Init(&GPIOA10); + + GPIOA9.GPIO = GPIOA; + GPIOA9.GPIO_Pin = 9; + GPIOA9.GPIO_Conf = AltOut_Ppull; + MyGPIO_Init(&GPIOA9); + + /* Configuration de l'USART */ + RCC->APB2ENR |= RCC_APB2ENR_USART1EN ; // activation de la clock + USART1->CR1 |= USART_CR1_UE ; // rendre usart enable + USART1->CR1 &= ~(USART_CR1_M); // mettre à 8 la longueur du mot + + // bd 9600 (cf. prof) puis calcul de la mantisse et de la fraction (cf. p 804) + USART1->BRR |= 0x0C; // mantisse + USART1->BRR |= (0x01D4 << 4) ; // fraction + + // Active la reception et l'emission + USART1->CR1 |= USART_CR1_RE; + USART1->CR1 |= USART_CR1_TE; + + /* On active les interruptions pour l'usart1 */ + USART1->CR1 |= USART_CR1_RXNEIE; +} + +/* Envoie d'un character */ +void Send_Char (char c) { + while (((USART1->SR >> 6) & 0x1) == 0);// tant que la transmission n'est pas finie + USART1->DR = c; +} + +/* Envoie de messages */ +void Send_Message (char message[]){ + int i = 0; + while (message[i] != '\0') { + Send_Char(message[i]); + i+=1; + } +} + + + +void USART1_IRQHandler() { + char input; + input = USART1->DR ; // on récupère ce qu'il y a dans le registre + (*ptr) (input); // on execute la fonction +} + +/* Reception de message */ +void Init_Message_Reception(void (* pFonction) (char)){ //(void (* pFonction) (char)){ + + /* Configuration de l'interruption */ + //!\\ A revoir cette partie ! p 198 + NVIC->ISER[1] |= NVIC_ISER_SETENA_5 ;//NVIC_IABR_ACTIVE_5 ; // on autorise l'interuption au niveau du coeur par le usart1 + NVIC->IP[37] = 7; // on parametre la prio de l'usart + + /* Activation de la réception */ + USART1->CR1 |= USART_CR1_RE ; + ptr = pFonction; //fonction à appeler par le handler + + +} + + diff --git a/FileInclude/Telecommande.h b/FileInclude/Telecommande.h index 030bc72..675cbdf 100644 --- a/FileInclude/Telecommande.h +++ b/FileInclude/Telecommande.h @@ -2,19 +2,15 @@ #define MYTELCOMMANDE_H #include "stm32f10x.h" -/* Configuration de l'UART */ -void Init_UART (USART_TypeDef * UART); +/* Configuration de l'USART */ +void Init_USART (USART_TypeDef * USART); /* Envoie de messages */ void Send_Message (char message[]); /* Reception de message */ -void Receive_Message (void (* pFonction) (char)); + +void Init_Message_Reception(void (* pFonction) (char)); //pFonction traitera le message - - - - - #endif diff --git a/Listings/Projet1_Simulation.map b/Listings/Projet1_Simulation.map index 5285229..f6c4d0b 100644 --- a/Listings/Projet1_Simulation.map +++ b/Listings/Projet1_Simulation.map @@ -4,13 +4,20 @@ Component: ARM Compiler 5.06 update 7 (build 960) Tool: armlink [4d3601] Section Cross References - main.o(i.main) refers to plateau.o(i.Set_Moteur_Plateau) for Set_Moteur_Plateau + main.o(i.f) refers to plateau.o(i.Set_Moteur_Plateau) for Set_Moteur_Plateau + main.o(i.f) refers to main.o(.data) for droite + main.o(i.main) refers to telecommande.o(i.Init_USART) for Init_USART + main.o(i.main) refers to batterie.o(i.Init_Batterie) for Init_Batterie + main.o(i.main) refers to batterie.o(i.Get_Batterie) for Get_Batterie + main.o(i.main) refers to telecommande.o(i.Send_Message) for Send_Message + main.o(i.main) refers to main.o(.data) for bat mytimer.o(i.MyTimer_ActiveIT) refers to mytimer.o(.data) for ptr1 mytimer.o(i.MyTimer_PWM) refers to driver_gpio.o(i.MyGPIO_Init) for MyGPIO_Init mytimer.o(i.TIM1_UP_IRQHandler) refers to mytimer.o(.data) for ptr1 mytimer.o(i.TIM2_IRQHandler) refers to mytimer.o(.data) for ptr2 mytimer.o(i.TIM3_IRQHandler) refers to mytimer.o(.data) for ptr3 mytimer.o(i.TIM4_IRQHandler) refers to mytimer.o(.data) for ptr4 + myadc.o(i.read) refers to myadc.o(i.startADC) for startADC plateau.o(i.Init_Plateau) refers to mytimer.o(i.MyTimer_Base_Init) for MyTimer_Base_Init plateau.o(i.Init_Plateau) refers to driver_gpio.o(i.MyGPIO_Init) for MyGPIO_Init plateau.o(i.Init_Plateau) refers to mytimer.o(i.MyTimer_Base_Start) for MyTimer_Base_Start @@ -25,12 +32,25 @@ Section Cross References plateau.o(i.Set_Moteur_Plateau) refers to plateau.o(i.Set_Vitesse) for Set_Vitesse plateau.o(i.Set_Vitesse) refers to mytimer.o(i.Set_PWM_PRCT) for Set_PWM_PRCT plateau.o(i.Set_Vitesse) refers to plateau.o(.data) for Data + telecommande.o(i.Init_Message_Reception) refers to telecommande.o(.data) for ptr + telecommande.o(i.Init_USART) refers to driver_gpio.o(i.MyGPIO_Init) for MyGPIO_Init + telecommande.o(i.Init_USART) refers to telecommande.o(.bss) for GPIOA10 + telecommande.o(i.Send_Message) refers to telecommande.o(i.Send_Char) for Send_Char + telecommande.o(i.USART1_IRQHandler) refers to telecommande.o(.data) for ptr + telecommande.o(.data) refers to telecommande.o(.bss) for USART + batterie.o(i.Get_Batterie) refers to myadc.o(i.read) for read + batterie.o(i.Get_Batterie) refers to batterie.o(.data) for nivBatterie + batterie.o(i.Init_Batterie) refers to driver_gpio.o(i.MyGPIO_Init) for MyGPIO_Init + batterie.o(i.Init_Batterie) refers to myadc.o(i.initADC) for initADC + batterie.o(i.Init_Batterie) refers to myadc.o(i.startADC) for startADC + batterie.o(i.Init_Batterie) refers to batterie.o(.bss) for GPIOC0 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 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 startup_stm32f10x_md.o(RESET) refers to mytimer.o(i.TIM4_IRQHandler) for TIM4_IRQHandler + startup_stm32f10x_md.o(RESET) refers to telecommande.o(i.USART1_IRQHandler) for USART1_IRQHandler startup_stm32f10x_md.o(.text) refers to system_stm32f10x.o(i.SystemInit) for SystemInit startup_stm32f10x_md.o(.text) refers to entry.o(.ARM.Collect$$$$00000000) for __main system_stm32f10x.o(i.SetSysClock) refers to system_stm32f10x.o(i.SetSysClockTo72) for SetSysClockTo72 @@ -61,27 +81,44 @@ Removing Unused input sections from the image. Removing main.o(.rev16_text), (4 bytes). Removing main.o(.revsh_text), (4 bytes). Removing main.o(.rrx_text), (6 bytes). + Removing main.o(i.f), (64 bytes). Removing driver_gpio.o(.rev16_text), (4 bytes). Removing driver_gpio.o(.revsh_text), (4 bytes). Removing driver_gpio.o(.rrx_text), (6 bytes). Removing driver_gpio.o(i.MyGPIO_Read), (12 bytes). + Removing driver_gpio.o(i.MyGPIO_Reset), (14 bytes). + Removing driver_gpio.o(i.MyGPIO_Set), (12 bytes). Removing driver_gpio.o(i.MyGPIO_Toggle), (12 bytes). 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.Get_Max_Duty), (6 bytes). Removing mytimer.o(i.MyTimer_ActiveIT), (176 bytes). + Removing mytimer.o(i.MyTimer_Base_Init), (108 bytes). + Removing mytimer.o(i.MyTimer_Base_Start), (10 bytes). Removing mytimer.o(i.MyTimer_Base_Stop), (10 bytes). + Removing mytimer.o(i.MyTimer_PWM), (464 bytes). Removing mytimer.o(i.Set_Duty_Cycle), (40 bytes). + Removing mytimer.o(i.Set_PWM_PRCT), (56 bytes). Removing myadc.o(.rev16_text), (4 bytes). Removing myadc.o(.revsh_text), (4 bytes). Removing myadc.o(.rrx_text), (6 bytes). - Removing myadc.o(i.initADC), (60 bytes). - Removing myadc.o(i.read), (32 bytes). - Removing myadc.o(i.startADC), (20 bytes). Removing plateau.o(.rev16_text), (4 bytes). Removing plateau.o(.revsh_text), (4 bytes). Removing plateau.o(.rrx_text), (6 bytes). + Removing plateau.o(i.Init_Plateau), (124 bytes). + Removing plateau.o(i.Set_Direction), (40 bytes). + Removing plateau.o(i.Set_Moteur_Plateau), (24 bytes). + Removing plateau.o(i.Set_Vitesse), (32 bytes). + Removing plateau.o(.bss), (24 bytes). + Removing plateau.o(.data), (16 bytes). + Removing telecommande.o(.rev16_text), (4 bytes). + Removing telecommande.o(.revsh_text), (4 bytes). + Removing telecommande.o(.rrx_text), (6 bytes). + Removing telecommande.o(i.Init_Message_Reception), (56 bytes). + Removing batterie.o(.rev16_text), (4 bytes). + Removing batterie.o(.revsh_text), (4 bytes). + Removing batterie.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). @@ -89,7 +126,7 @@ Removing Unused input sections from the image. Removing system_stm32f10x.o(i.SystemCoreClockUpdate), (164 bytes). Removing system_stm32f10x.o(.data), (20 bytes). -30 unused section(s) (total 1148 bytes) removed from the image. +47 unused section(s) (total 2108 bytes) removed from the image. ============================================================================== @@ -99,28 +136,31 @@ Image Symbol Table Symbol Name Value Ov Type Size Object(Section) - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7b.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.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 entry12b.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7b.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 entry10a.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 entry11b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7a.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry5.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE + FileInclude\Batterie.c 0x00000000 Number 0 batterie.o ABSOLUTE FileInclude\MyADC.c 0x00000000 Number 0 myadc.o ABSOLUTE FileInclude\MyTimer.c 0x00000000 Number 0 mytimer.o ABSOLUTE FileInclude\Plateau.c 0x00000000 Number 0 plateau.o ABSOLUTE FileInclude\Telecommande.c 0x00000000 Number 0 telecommande.o ABSOLUTE + FileInclude\\Batterie.c 0x00000000 Number 0 batterie.o ABSOLUTE FileInclude\\MyADC.c 0x00000000 Number 0 myadc.o ABSOLUTE FileInclude\\MyTimer.c 0x00000000 Number 0 mytimer.o ABSOLUTE FileInclude\\Plateau.c 0x00000000 Number 0 plateau.o ABSOLUTE + FileInclude\\Telecommande.c 0x00000000 Number 0 telecommande.o ABSOLUTE RTE\Device\STM32F103RB\startup_stm32f10x_md.s 0x00000000 Number 0 startup_stm32f10x_md.o ABSOLUTE RTE\Device\STM32F103RB\system_stm32f10x.c 0x00000000 Number 0 system_stm32f10x.o ABSOLUTE RTE\\Device\\STM32F103RB\\system_stm32f10x.c 0x00000000 Number 0 system_stm32f10x.o ABSOLUTE @@ -145,34 +185,36 @@ 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 36 init.o(.text) - i.Init_Plateau 0x0800014c Section 0 plateau.o(i.Init_Plateau) - i.MyGPIO_Init 0x080001c8 Section 0 driver_gpio.o(i.MyGPIO_Init) - i.MyGPIO_Reset 0x0800027c Section 0 driver_gpio.o(i.MyGPIO_Reset) - i.MyGPIO_Set 0x0800028a Section 0 driver_gpio.o(i.MyGPIO_Set) - i.MyTimer_Base_Init 0x08000298 Section 0 mytimer.o(i.MyTimer_Base_Init) - i.MyTimer_Base_Start 0x08000304 Section 0 mytimer.o(i.MyTimer_Base_Start) - i.MyTimer_PWM 0x08000310 Section 0 mytimer.o(i.MyTimer_PWM) - i.SetSysClock 0x080004e0 Section 0 system_stm32f10x.o(i.SetSysClock) - SetSysClock 0x080004e1 Thumb Code 8 system_stm32f10x.o(i.SetSysClock) - i.SetSysClockTo72 0x080004e8 Section 0 system_stm32f10x.o(i.SetSysClockTo72) - SetSysClockTo72 0x080004e9 Thumb Code 214 system_stm32f10x.o(i.SetSysClockTo72) - i.Set_Direction 0x080005c8 Section 0 plateau.o(i.Set_Direction) - i.Set_Moteur_Plateau 0x080005f0 Section 0 plateau.o(i.Set_Moteur_Plateau) - i.Set_PWM_PRCT 0x08000608 Section 0 mytimer.o(i.Set_PWM_PRCT) - i.Set_Vitesse 0x08000640 Section 0 plateau.o(i.Set_Vitesse) - i.SystemInit 0x08000660 Section 0 system_stm32f10x.o(i.SystemInit) - i.TIM1_UP_IRQHandler 0x080006c0 Section 0 mytimer.o(i.TIM1_UP_IRQHandler) - i.TIM2_IRQHandler 0x080006e4 Section 0 mytimer.o(i.TIM2_IRQHandler) - i.TIM3_IRQHandler 0x08000708 Section 0 mytimer.o(i.TIM3_IRQHandler) - i.TIM4_IRQHandler 0x0800072c Section 0 mytimer.o(i.TIM4_IRQHandler) - i.__scatterload_copy 0x08000750 Section 14 handlers.o(i.__scatterload_copy) - i.__scatterload_null 0x0800075e Section 2 handlers.o(i.__scatterload_null) - i.__scatterload_zeroinit 0x08000760 Section 14 handlers.o(i.__scatterload_zeroinit) - i.main 0x0800076e Section 0 main.o(i.main) - .data 0x20000000 Section 16 mytimer.o(.data) - .data 0x20000010 Section 16 plateau.o(.data) - .bss 0x20000020 Section 24 plateau.o(.bss) - STACK 0x20000038 Section 1024 startup_stm32f10x_md.o(STACK) + i.Get_Batterie 0x0800014c Section 0 batterie.o(i.Get_Batterie) + i.Init_Batterie 0x08000174 Section 0 batterie.o(i.Init_Batterie) + i.Init_USART 0x0800019c Section 0 telecommande.o(i.Init_USART) + i.MyGPIO_Init 0x08000238 Section 0 driver_gpio.o(i.MyGPIO_Init) + i.Send_Char 0x080002ec Section 0 telecommande.o(i.Send_Char) + i.Send_Message 0x08000308 Section 0 telecommande.o(i.Send_Message) + i.SetSysClock 0x08000320 Section 0 system_stm32f10x.o(i.SetSysClock) + SetSysClock 0x08000321 Thumb Code 8 system_stm32f10x.o(i.SetSysClock) + i.SetSysClockTo72 0x08000328 Section 0 system_stm32f10x.o(i.SetSysClockTo72) + SetSysClockTo72 0x08000329 Thumb Code 214 system_stm32f10x.o(i.SetSysClockTo72) + i.SystemInit 0x08000408 Section 0 system_stm32f10x.o(i.SystemInit) + i.TIM1_UP_IRQHandler 0x08000468 Section 0 mytimer.o(i.TIM1_UP_IRQHandler) + i.TIM2_IRQHandler 0x0800048c Section 0 mytimer.o(i.TIM2_IRQHandler) + i.TIM3_IRQHandler 0x080004b0 Section 0 mytimer.o(i.TIM3_IRQHandler) + i.TIM4_IRQHandler 0x080004d4 Section 0 mytimer.o(i.TIM4_IRQHandler) + i.USART1_IRQHandler 0x080004f8 Section 0 telecommande.o(i.USART1_IRQHandler) + i.__scatterload_copy 0x08000514 Section 14 handlers.o(i.__scatterload_copy) + i.__scatterload_null 0x08000522 Section 2 handlers.o(i.__scatterload_null) + i.__scatterload_zeroinit 0x08000524 Section 14 handlers.o(i.__scatterload_zeroinit) + i.initADC 0x08000534 Section 0 myadc.o(i.initADC) + i.main 0x08000570 Section 0 main.o(i.main) + i.read 0x0800060c Section 0 myadc.o(i.read) + i.startADC 0x08000634 Section 0 myadc.o(i.startADC) + .data 0x20000000 Section 16 main.o(.data) + .data 0x20000010 Section 16 mytimer.o(.data) + .data 0x20000020 Section 8 telecommande.o(.data) + .data 0x20000028 Section 4 batterie.o(.data) + .bss 0x2000002c Section 52 telecommande.o(.bss) + .bss 0x20000060 Section 12 batterie.o(.bss) + STACK 0x20000070 Section 1024 startup_stm32f10x_md.o(STACK) Global Symbols @@ -241,7 +283,6 @@ Image Symbol Table TIM1_BRK_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) TIM1_CC_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) TIM1_TRG_COM_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) - USART1_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) USART2_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) USART3_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) USBWakeUp_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) @@ -250,38 +291,43 @@ Image Symbol Table WWDG_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) __scatterload 0x08000129 Thumb Code 28 init.o(.text) __scatterload_rt2 0x08000129 Thumb Code 0 init.o(.text) - Init_Plateau 0x0800014d Thumb Code 98 plateau.o(i.Init_Plateau) - MyGPIO_Init 0x080001c9 Thumb Code 166 driver_gpio.o(i.MyGPIO_Init) - MyGPIO_Reset 0x0800027d Thumb Code 14 driver_gpio.o(i.MyGPIO_Reset) - MyGPIO_Set 0x0800028b Thumb Code 12 driver_gpio.o(i.MyGPIO_Set) - MyTimer_Base_Init 0x08000299 Thumb Code 98 mytimer.o(i.MyTimer_Base_Init) - MyTimer_Base_Start 0x08000305 Thumb Code 10 mytimer.o(i.MyTimer_Base_Start) - MyTimer_PWM 0x08000311 Thumb Code 448 mytimer.o(i.MyTimer_PWM) - Set_Direction 0x080005c9 Thumb Code 34 plateau.o(i.Set_Direction) - Set_Moteur_Plateau 0x080005f1 Thumb Code 24 plateau.o(i.Set_Moteur_Plateau) - Set_PWM_PRCT 0x08000609 Thumb Code 56 mytimer.o(i.Set_PWM_PRCT) - Set_Vitesse 0x08000641 Thumb Code 22 plateau.o(i.Set_Vitesse) - SystemInit 0x08000661 Thumb Code 78 system_stm32f10x.o(i.SystemInit) - TIM1_UP_IRQHandler 0x080006c1 Thumb Code 28 mytimer.o(i.TIM1_UP_IRQHandler) - TIM2_IRQHandler 0x080006e5 Thumb Code 32 mytimer.o(i.TIM2_IRQHandler) - TIM3_IRQHandler 0x08000709 Thumb Code 28 mytimer.o(i.TIM3_IRQHandler) - TIM4_IRQHandler 0x0800072d Thumb Code 28 mytimer.o(i.TIM4_IRQHandler) - __scatterload_copy 0x08000751 Thumb Code 14 handlers.o(i.__scatterload_copy) - __scatterload_null 0x0800075f Thumb Code 2 handlers.o(i.__scatterload_null) - __scatterload_zeroinit 0x08000761 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) - main 0x0800076f Thumb Code 12 main.o(i.main) - Region$$Table$$Base 0x0800077c Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x0800079c Number 0 anon$$obj.o(Region$$Table) - ptr1 0x20000000 Data 4 mytimer.o(.data) - ptr2 0x20000004 Data 4 mytimer.o(.data) - ptr3 0x20000008 Data 4 mytimer.o(.data) - ptr4 0x2000000c Data 4 mytimer.o(.data) - channel 0x20000010 Data 1 plateau.o(.data) - TIM 0x20000014 Data 8 plateau.o(.data) - Data 0x2000001c Data 4 plateau.o(.data) - GPIOA5 0x20000020 Data 12 plateau.o(.bss) - GPIOA6 0x2000002c Data 12 plateau.o(.bss) - __initial_sp 0x20000438 Data 0 startup_stm32f10x_md.o(STACK) + Get_Batterie 0x0800014d Thumb Code 36 batterie.o(i.Get_Batterie) + Init_Batterie 0x08000175 Thumb Code 32 batterie.o(i.Init_Batterie) + Init_USART 0x0800019d Thumb Code 134 telecommande.o(i.Init_USART) + MyGPIO_Init 0x08000239 Thumb Code 166 driver_gpio.o(i.MyGPIO_Init) + Send_Char 0x080002ed Thumb Code 22 telecommande.o(i.Send_Char) + Send_Message 0x08000309 Thumb Code 24 telecommande.o(i.Send_Message) + SystemInit 0x08000409 Thumb Code 78 system_stm32f10x.o(i.SystemInit) + TIM1_UP_IRQHandler 0x08000469 Thumb Code 28 mytimer.o(i.TIM1_UP_IRQHandler) + TIM2_IRQHandler 0x0800048d Thumb Code 32 mytimer.o(i.TIM2_IRQHandler) + TIM3_IRQHandler 0x080004b1 Thumb Code 28 mytimer.o(i.TIM3_IRQHandler) + TIM4_IRQHandler 0x080004d5 Thumb Code 28 mytimer.o(i.TIM4_IRQHandler) + USART1_IRQHandler 0x080004f9 Thumb Code 18 telecommande.o(i.USART1_IRQHandler) + __scatterload_copy 0x08000515 Thumb Code 14 handlers.o(i.__scatterload_copy) + __scatterload_null 0x08000523 Thumb Code 2 handlers.o(i.__scatterload_null) + __scatterload_zeroinit 0x08000525 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) + initADC 0x08000535 Thumb Code 50 myadc.o(i.initADC) + main 0x08000571 Thumb Code 92 main.o(i.main) + read 0x0800060d Thumb Code 34 myadc.o(i.read) + startADC 0x08000635 Thumb Code 14 myadc.o(i.startADC) + Region$$Table$$Base 0x08000648 Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x08000668 Number 0 anon$$obj.o(Region$$Table) + droite 0x20000000 Data 4 main.o(.data) + b 0x20000004 Data 4 main.o(.data) + testBatterie 0x20000008 Data 4 main.o(.data) + bat 0x2000000c Data 4 main.o(.data) + ptr1 0x20000010 Data 4 mytimer.o(.data) + ptr2 0x20000014 Data 4 mytimer.o(.data) + ptr3 0x20000018 Data 4 mytimer.o(.data) + ptr4 0x2000001c Data 4 mytimer.o(.data) + Usart 0x20000020 Data 4 telecommande.o(.data) + ptr 0x20000024 Data 4 telecommande.o(.data) + nivBatterie 0x20000028 Data 4 batterie.o(.data) + USART 0x2000002c Data 28 telecommande.o(.bss) + GPIOA10 0x20000048 Data 12 telecommande.o(.bss) + GPIOA9 0x20000054 Data 12 telecommande.o(.bss) + GPIOC0 0x20000060 Data 12 batterie.o(.bss) + __initial_sp 0x20000470 Data 0 startup_stm32f10x_md.o(STACK) @@ -289,69 +335,64 @@ Image Symbol Table Memory Map of the image - Image Entry point : 0x08000105 + Image Entry point : 0x080000ed - Load Region LR_1 (Base: 0x08000000, Size: 0x000007bc, Max: 0xffffffff, ABSOLUTE) + Load Region LR_IROM1 (Base: 0x08000000, Size: 0x00000694, Max: 0x00020000, ABSOLUTE) - Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x0000079c, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000668, Max: 0x00020000, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x08000000 0x08000000 0x000000ec Data RO 309 RESET startup_stm32f10x_md.o - 0x080000ec 0x080000ec 0x00000000 Code RO 360 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) - 0x080000ec 0x080000ec 0x00000004 Code RO 363 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) - 0x080000f0 0x080000f0 0x00000004 Code RO 366 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 368 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 370 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) - 0x080000f4 0x080000f4 0x00000008 Code RO 371 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) - 0x080000fc 0x080000fc 0x00000004 Code RO 378 .ARM.Collect$$$$0000000E mc_w.l(entry12b.o) - 0x08000100 0x08000100 0x00000000 Code RO 373 .ARM.Collect$$$$0000000F mc_w.l(entry10a.o) - 0x08000100 0x08000100 0x00000000 Code RO 375 .ARM.Collect$$$$00000011 mc_w.l(entry11a.o) - 0x08000100 0x08000100 0x00000004 Code RO 364 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) - 0x08000104 0x08000104 0x00000024 Code RO 310 * .text startup_stm32f10x_md.o - 0x08000128 0x08000128 0x00000024 Code RO 379 .text mc_w.l(init.o) - 0x0800014c 0x0800014c 0x0000007c Code RO 258 i.Init_Plateau plateau.o - 0x080001c8 0x080001c8 0x000000b4 Code RO 69 i.MyGPIO_Init driver_gpio.o - 0x0800027c 0x0800027c 0x0000000e Code RO 71 i.MyGPIO_Reset driver_gpio.o - 0x0800028a 0x0800028a 0x0000000c Code RO 72 i.MyGPIO_Set driver_gpio.o - 0x08000296 0x08000296 0x00000002 PAD - 0x08000298 0x08000298 0x0000006c Code RO 122 i.MyTimer_Base_Init mytimer.o - 0x08000304 0x08000304 0x0000000a Code RO 123 i.MyTimer_Base_Start mytimer.o - 0x0800030e 0x0800030e 0x00000002 PAD - 0x08000310 0x08000310 0x000001d0 Code RO 125 i.MyTimer_PWM mytimer.o - 0x080004e0 0x080004e0 0x00000008 Code RO 317 i.SetSysClock system_stm32f10x.o - 0x080004e8 0x080004e8 0x000000e0 Code RO 318 i.SetSysClockTo72 system_stm32f10x.o - 0x080005c8 0x080005c8 0x00000028 Code RO 259 i.Set_Direction plateau.o - 0x080005f0 0x080005f0 0x00000018 Code RO 260 i.Set_Moteur_Plateau plateau.o - 0x08000608 0x08000608 0x00000038 Code RO 127 i.Set_PWM_PRCT mytimer.o - 0x08000640 0x08000640 0x00000020 Code RO 261 i.Set_Vitesse plateau.o - 0x08000660 0x08000660 0x00000060 Code RO 320 i.SystemInit system_stm32f10x.o - 0x080006c0 0x080006c0 0x00000024 Code RO 128 i.TIM1_UP_IRQHandler mytimer.o - 0x080006e4 0x080006e4 0x00000024 Code RO 129 i.TIM2_IRQHandler mytimer.o - 0x08000708 0x08000708 0x00000024 Code RO 130 i.TIM3_IRQHandler mytimer.o - 0x0800072c 0x0800072c 0x00000024 Code RO 131 i.TIM4_IRQHandler mytimer.o - 0x08000750 0x08000750 0x0000000e Code RO 383 i.__scatterload_copy mc_w.l(handlers.o) - 0x0800075e 0x0800075e 0x00000002 Code RO 384 i.__scatterload_null mc_w.l(handlers.o) - 0x08000760 0x08000760 0x0000000e Code RO 385 i.__scatterload_zeroinit mc_w.l(handlers.o) - 0x0800076e 0x0800076e 0x0000000c Code RO 4 i.main main.o - 0x0800077a 0x0800077a 0x00000002 PAD - 0x0800077c 0x0800077c 0x00000020 Data RO 381 Region$$Table anon$$obj.o + 0x08000000 0x08000000 0x000000ec Data RO 413 RESET startup_stm32f10x_md.o + 0x080000ec 0x080000ec 0x00000000 Code RO 464 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) + 0x080000ec 0x080000ec 0x00000004 Code RO 467 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) + 0x080000f0 0x080000f0 0x00000004 Code RO 470 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 472 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 474 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) + 0x080000f4 0x080000f4 0x00000008 Code RO 475 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) + 0x080000fc 0x080000fc 0x00000004 Code RO 482 .ARM.Collect$$$$0000000E mc_w.l(entry12b.o) + 0x08000100 0x08000100 0x00000000 Code RO 477 .ARM.Collect$$$$0000000F mc_w.l(entry10a.o) + 0x08000100 0x08000100 0x00000000 Code RO 479 .ARM.Collect$$$$00000011 mc_w.l(entry11a.o) + 0x08000100 0x08000100 0x00000004 Code RO 468 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) + 0x08000104 0x08000104 0x00000024 Code RO 414 .text startup_stm32f10x_md.o + 0x08000128 0x08000128 0x00000024 Code RO 483 .text mc_w.l(init.o) + 0x0800014c 0x0800014c 0x00000028 Code RO 377 i.Get_Batterie batterie.o + 0x08000174 0x08000174 0x00000028 Code RO 378 i.Init_Batterie batterie.o + 0x0800019c 0x0800019c 0x0000009c Code RO 323 i.Init_USART telecommande.o + 0x08000238 0x08000238 0x000000b4 Code RO 84 i.MyGPIO_Init driver_gpio.o + 0x080002ec 0x080002ec 0x0000001c Code RO 324 i.Send_Char telecommande.o + 0x08000308 0x08000308 0x00000018 Code RO 325 i.Send_Message telecommande.o + 0x08000320 0x08000320 0x00000008 Code RO 421 i.SetSysClock system_stm32f10x.o + 0x08000328 0x08000328 0x000000e0 Code RO 422 i.SetSysClockTo72 system_stm32f10x.o + 0x08000408 0x08000408 0x00000060 Code RO 424 i.SystemInit system_stm32f10x.o + 0x08000468 0x08000468 0x00000024 Code RO 143 i.TIM1_UP_IRQHandler mytimer.o + 0x0800048c 0x0800048c 0x00000024 Code RO 144 i.TIM2_IRQHandler mytimer.o + 0x080004b0 0x080004b0 0x00000024 Code RO 145 i.TIM3_IRQHandler mytimer.o + 0x080004d4 0x080004d4 0x00000024 Code RO 146 i.TIM4_IRQHandler mytimer.o + 0x080004f8 0x080004f8 0x0000001c Code RO 326 i.USART1_IRQHandler telecommande.o + 0x08000514 0x08000514 0x0000000e Code RO 487 i.__scatterload_copy mc_w.l(handlers.o) + 0x08000522 0x08000522 0x00000002 Code RO 488 i.__scatterload_null mc_w.l(handlers.o) + 0x08000524 0x08000524 0x0000000e Code RO 489 i.__scatterload_zeroinit mc_w.l(handlers.o) + 0x08000532 0x08000532 0x00000002 PAD + 0x08000534 0x08000534 0x0000003c Code RO 234 i.initADC myadc.o + 0x08000570 0x08000570 0x0000009c Code RO 5 i.main main.o + 0x0800060c 0x0800060c 0x00000028 Code RO 235 i.read myadc.o + 0x08000634 0x08000634 0x00000014 Code RO 236 i.startADC myadc.o + 0x08000648 0x08000648 0x00000020 Data RO 485 Region$$Table anon$$obj.o - Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x0800079c, Size: 0x00000020, Max: 0xffffffff, ABSOLUTE) + Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x08000668, Size: 0x00000470, Max: 0x00005000, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 0x0800079c 0x00000010 Data RW 132 .data mytimer.o - 0x20000010 0x080007ac 0x00000010 Data RW 263 .data plateau.o - - - Execution Region ER_ZI (Exec base: 0x20000020, Load base: 0x080007bc, Size: 0x00000418, Max: 0xffffffff, ABSOLUTE) - - Exec Addr Load Addr Size Type Attr Idx E Section Name Object - - 0x20000020 - 0x00000018 Zero RW 262 .bss plateau.o - 0x20000038 - 0x00000400 Zero RW 307 STACK startup_stm32f10x_md.o + 0x20000000 0x08000668 0x00000010 Data RW 6 .data main.o + 0x20000010 0x08000678 0x00000010 Data RW 147 .data mytimer.o + 0x20000020 0x08000688 0x00000008 Data RW 328 .data telecommande.o + 0x20000028 0x08000690 0x00000004 Data RW 380 .data batterie.o + 0x2000002c - 0x00000034 Zero RW 327 .bss telecommande.o + 0x20000060 - 0x0000000c Zero RW 379 .bss batterie.o + 0x2000006c 0x08000694 0x00000004 PAD + 0x20000070 - 0x00000400 Zero RW 411 STACK startup_stm32f10x_md.o ============================================================================== @@ -361,17 +402,19 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name - 206 14 0 0 0 2722 driver_gpio.o - 12 0 0 0 0 206767 main.o - 782 54 0 16 0 6027 mytimer.o - 220 42 0 16 24 2755 plateau.o + 80 12 0 4 12 1168 batterie.o + 180 14 0 0 0 1658 driver_gpio.o + 156 64 0 16 0 207163 main.o + 120 22 0 0 0 1308 myadc.o + 144 28 0 16 0 3521 mytimer.o 36 8 236 0 1024 808 startup_stm32f10x_md.o 328 28 0 0 0 1973 system_stm32f10x.o + 236 38 0 8 52 2809 telecommande.o ---------------------------------------------------------------------- - 1590 146 268 32 1048 221052 Object Totals + 1280 214 268 44 1092 220408 Object Totals 0 0 32 0 0 0 (incl. Generated) - 6 0 0 0 0 0 (incl. Padding) + 0 0 0 0 4 0 (incl. Padding) ---------------------------------------------------------------------- @@ -390,8 +433,8 @@ Image component sizes 36 8 0 0 0 68 init.o ---------------------------------------------------------------------- - 90 16 0 0 0 68 Library Totals - 0 0 0 0 0 0 (incl. Padding) + 92 16 0 0 0 68 Library Totals + 2 0 0 0 0 0 (incl. Padding) ---------------------------------------------------------------------- @@ -400,7 +443,7 @@ Image component sizes 90 16 0 0 0 68 mc_w.l ---------------------------------------------------------------------- - 90 16 0 0 0 68 Library Totals + 92 16 0 0 0 68 Library Totals ---------------------------------------------------------------------- @@ -409,15 +452,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 1680 162 268 32 1048 220388 Grand Totals - 1680 162 268 32 1048 220388 ELF Image Totals - 1680 162 268 32 0 0 ROM Totals + 1372 230 268 44 1092 219848 Grand Totals + 1372 230 268 44 1092 219848 ELF Image Totals + 1372 230 268 44 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 1948 ( 1.90kB) - Total RW Size (RW Data + ZI Data) 1080 ( 1.05kB) - Total ROM Size (Code + RO Data + RW Data) 1980 ( 1.93kB) + Total RO Size (Code + RO Data) 1640 ( 1.60kB) + Total RW Size (RW Data + ZI Data) 1136 ( 1.11kB) + Total ROM Size (Code + RO Data + RW Data) 1684 ( 1.64kB) ============================================================================== diff --git a/Listings/startup_stm32f10x_md.lst b/Listings/startup_stm32f10x_md.lst index 37414f5..45d2bb2 100644 --- a/Listings/startup_stm32f10x_md.lst +++ b/Listings/startup_stm32f10x_md.lst @@ -465,12 +465,12 @@ ARM Macro Assembler Page 8 00000000 Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw ork --depend=.\objects\startup_stm32f10x_md.d -o.\objects\startup_stm32f10x_md. -o -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -IC:\Programdata\Keil\Arm\Pack -s\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32 -F1xx_DFP\2.3.0\Device\Include --predefine="__EVAL SETA 1" --predefine="__MICROL -IB SETA 1" --predefine="__UVISION_VERSION SETA 534" --predefine="_RTE_ SETA 1" ---predefine="STM32F10X_MD SETA 1" --predefine="_RTE_ SETA 1" --list=.\listings\ -startup_stm32f10x_md.lst RTE\Device\STM32F103RB\startup_stm32f10x_md.s +o -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\ +CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_D +FP\2.3.0\Device\Include --predefine="__EVAL SETA 1" --predefine="__MICROLIB SET +A 1" --predefine="__UVISION_VERSION SETA 534" --predefine="_RTE_ SETA 1" --pred +efine="STM32F10X_MD SETA 1" --predefine="_RTE_ SETA 1" --list=.\listings\startu +p_stm32f10x_md.lst RTE\Device\STM32F103RB\startup_stm32f10x_md.s diff --git a/Objects/Projet1_Réel.dep b/Objects/Projet1_Réel.dep index d5b327d..c0af0f8 100644 --- a/Objects/Projet1_Réel.dep +++ b/Objects/Projet1_Réel.dep @@ -1,43 +1,101 @@ Dependencies for Project 'Projet1', Target 'Réel': (DO NOT MODIFY !) CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC -F (.\Sources\prinicpal.c)(0x6340254D)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\prinicpal.o --omf_browse .\objects\prinicpal.crf --depend .\objects\prinicpal.d) +F (.\Sources\main.c)(0x6372704A)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\main.o --omf_browse .\objects\main.crf --depend .\objects\main.d) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) -I (.\RTE\_R_el\RTE_Components.h)(0x63285003) +I (.\RTE\_R_el\RTE_Components.h)(0x6352AB59) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC) -I (.\FileInclude\Driver_GPIO.h)(0x63315001) -I (.\FileInclude\MyTimer.h)(0x6340244A) +I (.\FileInclude\Driver_GPIO.h)(0x6352AB58) +I (.\FileInclude\MyTimer.h)(0x6352B8A4) +I (.\FileInclude\MyADC.h)(0x6352AB58) +I (.\FileInclude\Plateau.h)(0x63725F44) +I (.\FileInclude\Telecommande.h)(0x6368CE08) +I (.\FileInclude\Batterie.h)(0x63712E97) F (U:\Documents\4ir\S1\Microcontroleur\Drivers\FileInclude\Driver_GPIO.c)(0x633153E6)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\driver_gpio.o --omf_browse .\objects\driver_gpio.crf --depend .\objects\driver_gpio.d) I (U:\Documents\4ir\S1\Microcontroleur\Drivers\FileInclude\Driver_GPIO.h)(0x63315001) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) -I (.\RTE\_R_el\RTE_Components.h)(0x63285003) +I (.\RTE\_R_el\RTE_Components.h)(0x6352AB59) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC) -F (.\FileInclude\MyTimer.c)(0x63402350)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\mytimer.o --omf_browse .\objects\mytimer.crf --depend .\objects\mytimer.d) -I (FileInclude\MyTimer.h)(0x6340244A) +F (.\FileInclude\MyTimer.c)(0x635EAD7F)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\mytimer.o --omf_browse .\objects\mytimer.crf --depend .\objects\mytimer.d) +I (FileInclude\MyTimer.h)(0x6352B8A4) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) -I (.\RTE\_R_el\RTE_Components.h)(0x63285003) +I (.\RTE\_R_el\RTE_Components.h)(0x6352AB59) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC) -I (FileInclude\Driver_GPIO.h)(0x63315001) -F (.\FileInclude\MyTimer.h)(0x6340244A)() -F (RTE\Device\STM32F103RB\RTE_Device.h)(0x59283406)() -F (RTE\Device\STM32F103RB\startup_stm32f10x_md.s)(0x58258CCC)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 534" --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)(0x58258CCC)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\system_stm32f10x.o --omf_browse .\objects\system_stm32f10x.crf --depend .\objects\system_stm32f10x.d) +I (FileInclude\Driver_GPIO.h)(0x6352AB58) +F (.\FileInclude\MyTimer.h)(0x6352B8A4)() +F (.\FileInclude\MyADC.c)(0x63726E79)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\myadc.o --omf_browse .\objects\myadc.crf --depend .\objects\myadc.d) +I (FileInclude\MyADC.h)(0x6352AB58) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) -I (.\RTE\_R_el\RTE_Components.h)(0x63285003) +I (.\RTE\_R_el\RTE_Components.h)(0x6352AB59) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) +I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582) +I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC) +I (FileInclude\MyTimer.h)(0x6352B8A4) +I (FileInclude\Driver_GPIO.h)(0x6352AB58) +F (.\FileInclude\MyADC.h)(0x6352AB58)() +F (.\FileInclude\Plateau.c)(0x635BB6D1)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\plateau.o --omf_browse .\objects\plateau.crf --depend .\objects\plateau.d) +I (FileInclude\MyTimer.h)(0x6352B8A4) +I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) +I (.\RTE\_R_el\RTE_Components.h)(0x6352AB59) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) +I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582) +I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC) +I (FileInclude\Driver_GPIO.h)(0x6352AB58) +I (FileInclude\Plateau.h)(0x63725F44) +F (.\FileInclude\Telecommande.c)(0x6368E779)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\telecommande.o --omf_browse .\objects\telecommande.crf --depend .\objects\telecommande.d) +I (FileInclude\MyTimer.h)(0x6352B8A4) +I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) +I (.\RTE\_R_el\RTE_Components.h)(0x6352AB59) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) +I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582) +I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC) +I (FileInclude\Driver_GPIO.h)(0x6352AB58) +I (FileInclude\Plateau.h)(0x63725F44) +I (FileInclude\Telecommande.h)(0x6368CE08) +F (.\FileInclude\Plateau.h)(0x63725F44)() +F (.\FileInclude\Telecommande.h)(0x6368CE08)() +F (.\FileInclude\Batterie.c)(0x637268C7)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\batterie.o --omf_browse .\objects\batterie.crf --depend .\objects\batterie.d) +I (FileInclude\Batterie.h)(0x63712E97) +I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) +I (.\RTE\_R_el\RTE_Components.h)(0x6352AB59) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) +I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582) +I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC) +I (FileInclude\MyADC.h)(0x6352AB58) +I (FileInclude\MyTimer.h)(0x6352B8A4) +I (FileInclude\Driver_GPIO.h)(0x6352AB58) +F (.\FileInclude\Batterie.h)(0x63712E97)() +F (RTE\Device\STM32F103RB\RTE_Device.h)(0x6352AB59)() +F (RTE\Device\STM32F103RB\startup_stm32f10x_md.s)(0x6352AB59)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 534" --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)(0x6352AB59)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\system_stm32f10x.o --omf_browse .\objects\system_stm32f10x.crf --depend .\objects\system_stm32f10x.d) +I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) +I (.\RTE\_R_el\RTE_Components.h)(0x6352AB59) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582) diff --git a/Objects/Projet1_SImulation.dep b/Objects/Projet1_SImulation.dep index bad3036..4cb5eb9 100644 --- a/Objects/Projet1_SImulation.dep +++ b/Objects/Projet1_SImulation.dep @@ -1,6 +1,6 @@ Dependencies for Project 'Projet1', Target 'SImulation': (DO NOT MODIFY !) CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC -F (.\Sources\main.c)(0x635B8BB4)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\main.o --omf_browse .\objects\main.crf --depend .\objects\main.d) +F (.\Sources\main.c)(0x63725877)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\main.o --omf_browse .\objects\main.crf --depend .\objects\main.d) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) I (.\RTE\_SImulation\RTE_Components.h)(0x6352AB59) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) @@ -12,7 +12,9 @@ I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_ I (.\FileInclude\Driver_GPIO.h)(0x6352AB58) I (.\FileInclude\MyTimer.h)(0x6352B8A4) I (.\FileInclude\MyADC.h)(0x6352AB58) -I (.\FileInclude\Plateau.h)(0x635B8BB4) +I (.\FileInclude\Plateau.h)(0x635B93E6) +I (.\FileInclude\Telecommande.h)(0x6368CE08) +I (.\FileInclude\Batterie.h)(0x63712E97) F (U:\Documents\4ir\S1\Microcontroleur\Drivers\FileInclude\Driver_GPIO.c)(0x633153E6)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\driver_gpio.o --omf_browse .\objects\driver_gpio.crf --depend .\objects\driver_gpio.d) I (U:\Documents\4ir\S1\Microcontroleur\Drivers\FileInclude\Driver_GPIO.h)(0x63315001) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) @@ -23,7 +25,7 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_versio I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC) -F (.\FileInclude\MyTimer.c)(0x6352B8A4)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\mytimer.o --omf_browse .\objects\mytimer.crf --depend .\objects\mytimer.d) +F (.\FileInclude\MyTimer.c)(0x635EAD7F)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\mytimer.o --omf_browse .\objects\mytimer.crf --depend .\objects\mytimer.d) I (FileInclude\MyTimer.h)(0x6352B8A4) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) I (.\RTE\_SImulation\RTE_Components.h)(0x6352AB59) @@ -48,7 +50,7 @@ I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_ I (FileInclude\MyTimer.h)(0x6352B8A4) I (FileInclude\Driver_GPIO.h)(0x6352AB58) F (.\FileInclude\MyADC.h)(0x6352AB58)() -F (.\FileInclude\Plateau.c)(0x635B8BB4)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\plateau.o --omf_browse .\objects\plateau.crf --depend .\objects\plateau.d) +F (.\FileInclude\Plateau.c)(0x635BB6D1)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\plateau.o --omf_browse .\objects\plateau.crf --depend .\objects\plateau.d) I (FileInclude\MyTimer.h)(0x6352B8A4) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) I (.\RTE\_SImulation\RTE_Components.h)(0x6352AB59) @@ -59,10 +61,36 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compil I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC) I (FileInclude\Driver_GPIO.h)(0x6352AB58) -I (FileInclude\Plateau.h)(0x635B8BB4) -F (.\FileInclude\Telecommande.c)(0x6352B81B)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\telecommande.o --omf_browse .\objects\telecommande.crf --depend .\objects\telecommande.d) -F (.\FileInclude\Plateau.h)(0x635B8BB4)() -F (.\FileInclude\Telecommande.h)(0x6352B81B)() +I (FileInclude\Plateau.h)(0x635B93E6) +F (.\FileInclude\Telecommande.c)(0x6368E779)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\telecommande.o --omf_browse .\objects\telecommande.crf --depend .\objects\telecommande.d) +I (FileInclude\MyTimer.h)(0x6352B8A4) +I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) +I (.\RTE\_SImulation\RTE_Components.h)(0x6352AB59) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) +I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582) +I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC) +I (FileInclude\Driver_GPIO.h)(0x6352AB58) +I (FileInclude\Plateau.h)(0x635B93E6) +I (FileInclude\Telecommande.h)(0x6368CE08) +F (.\FileInclude\Plateau.h)(0x635B93E6)() +F (.\FileInclude\Telecommande.h)(0x6368CE08)() +F (.\FileInclude\Batterie.c)(0x63712DDE)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\batterie.o --omf_browse .\objects\batterie.crf --depend .\objects\batterie.d) +I (FileInclude\Batterie.h)(0x63712E97) +I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) +I (.\RTE\_SImulation\RTE_Components.h)(0x6352AB59) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) +I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22) +I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582) +I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC) +I (FileInclude\MyADC.h)(0x6352AB58) +I (FileInclude\MyTimer.h)(0x6352B8A4) +I (FileInclude\Driver_GPIO.h)(0x6352AB58) +F (.\FileInclude\Batterie.h)(0x63712E97)() F (RTE\Device\STM32F103RB\RTE_Device.h)(0x6352AB59)() F (RTE\Device\STM32F103RB\startup_stm32f10x_md.s)(0x6352AB59)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 534" --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)(0x6352AB59)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\system_stm32f10x.o --omf_browse .\objects\system_stm32f10x.crf --depend .\objects\system_stm32f10x.d) diff --git a/Objects/Projet1_Simulation.axf b/Objects/Projet1_Simulation.axf index 70958d2..379cda5 100644 Binary files a/Objects/Projet1_Simulation.axf and b/Objects/Projet1_Simulation.axf differ diff --git a/Objects/Projet1_Simulation.build_log.htm b/Objects/Projet1_Simulation.build_log.htm index 0923277..0949ca2 100644 --- a/Objects/Projet1_Simulation.build_log.htm +++ b/Objects/Projet1_Simulation.build_log.htm @@ -17,26 +17,27 @@ Library Manager: ArmAr.exe V5.06 update 7 (build 960) Hex Converter: FromElf.exe V5.06 update 7 (build 960) CPU DLL: SARMCM3.DLL V5.34.0.0 Dialog DLL: DARMSTM.DLL V1.68.0.0 -Target DLL: UL2CM3.DLL V1.163.9.0 +Target DLL: STLink\ST-LINKIII-KEIL_SWO.dll V3.0.8.0 Dialog DLL: TARMSTM.DLL V1.66.0.0