diff --git a/FileInclude/Lib_Com_Periph_2022.lib b/FileInclude/Lib_Com_Periph_2022.lib new file mode 100644 index 0000000..ce805ab Binary files /dev/null and b/FileInclude/Lib_Com_Periph_2022.lib differ diff --git a/FileInclude/MyGirouette.c b/FileInclude/MyGirouette.c index da55233..9270efb 100644 --- a/FileInclude/MyGirouette.c +++ b/FileInclude/MyGirouette.c @@ -10,7 +10,6 @@ void EXTI0_IRQHandler(void) { EXTI->PR |= (1<<0) ; } - void Init_Girouette(void){ MyGPIO_Struct_TypeDef GPIOA0={ diff --git a/FileInclude/MyI2C.h b/FileInclude/MyI2C.h new file mode 100644 index 0000000..289c9ed --- /dev/null +++ b/FileInclude/MyI2C.h @@ -0,0 +1,229 @@ +#ifndef _I2C_ +#define _I2C_ + +#include "stm32f10x.h" + +/************************************************************************************* +===================== By Periph team INSA GEI 2022 =========================== +*************************************************************************************/ + +/* +************************************************************************************* +===================== I2C les IO STM32F103 ================================= +************************************************************************************* + +Les IO sont pris en charge par la lib, pas besoin de faire les configurations Alt OD. + +**I2C1** +SCL PB6 +SDA PB7 + +**I2C2** +SCL PB10 +SDA PB11 + + +************************************************************************************* +==================== Fondamentaux I2C ========================================== +************************************************************************************* +- Bus synchrone Low speed (<100kHz) ou high speed (=400kHz), Ici Low speed 100kHz. +- Transfert octet par octet, poids fort en premier, avec aquittement pour chaque octet +- Deux lignes SDA et SCL (horloge) en open drain, repos '1' +- bit "normal" = SDA stable lors du pulse SCL (ie durant l'état haut de SCL, SDA est stable) +- bit Start/Stop/Restart = SDA non stable lorsque SCL vaut '1' (violation règle précédente) + * Start : front descendant de SDA lorsque SCL vaut '1' + * Stop : front montant de SDA lorsque SCL = '1' + * Restart = Start en cours de trame (typiquement pour changer Write/read). +- uC en Mode Master uniquement (c'est notre choix) : c'est le uC qui est maître de l'horloge SCL. +- Le Slave a une @ 7 bits. On ajoute un bit LSB qui est /WR (donc 0 pour écriture, 1 pour lecture) +- Une adresse s'écrit donc |a6 a5 a4 a3 a2 a1 a0 /WR| ce qui donne 8 bits. Elle indique une future +lecture ou écriture. +On parle d'@ 7 bits en regroupant |a6 a5 a4 a3 a2 a1 a0| +On parle d'@ 8 bits en regroupant |a6 a5 a4 a3 a2 a1 a0 /WR| (donc une @ écriture, une @ lecture) +NB : préférer le concept @7bits...c'est plus clair. + +- On peut lire ou écrire une ou plusieurs données à la suite. C'est lors de l'envoie de l'adresse Slave +par le Master que le sens à venir pour les datas est indiqué. +- En écriture, + * les Ack sont faits par le slave après chaque octet envoyé par le master (Ack = mise à 0 le bit 9). +- En lecture, + * dès que le l@ slave est transmise (/RW = 1), et le Ack réalisé, le slave positionne le bit 7 + du prochain octet à lire sur SDA par anticipation , + * le master enchaîne ses pulses (9), lors du pulse 9 (le dernier) c'est le master qui acquite. + * Après chaque acquitement, le Slave amorce le prochain octet en positionnant son bit 7 sur SDA + * Après le dernier octet, le Master génère un stop. + * Pour pouvoir générer le stop, le Master doit piloter SDA, or ce n'est pas possible puisque + le Slave positionne le futur bit 7 ... Pour régler ce problème : + lors du dernier transfert, le Master N'acquitte PAS (NACK). Ainsi le Slave ne + propose plus le bit 7 du prochain octet sur SDA et libère SDA. Le Master peut alors clôturer la + communication avec un Stop. + + + + +======= Echange typique avec un Slave ================================================================ +- Une lecture ou écriture se fait vers un Slave et à partir d'une adresse mémoire donnée (pointeur interne). +Ce pointeur est automatiquement incrémenté dans le slave lors des accès écriture ou lecture. + +- Ecriture de N octets , trame complète (@ = adresse slave, pt = valeur de chargement du pointeur interne) +|Start Cond |@6|@5|@4|@3|@2|@1|@0| Wr =0 |Slave ACK| +|pt7|pt6|pt5|pt4|pt3|pt2|pt1|pt0|Slave ACK| +|d7|d6|d5|d4|d3|d2|d1|d0|Slave ACK| (data 1) +..... +|d7|d6|d5|d4|d3|d2|d1|d0|Salve ACK|Stop Cond| (data N) + +- Lecture de N octets à partir d'une adresse de pointeur donnée +|Start Cond |@6|@5|@4|@3|@2|@1|@0| Wr =0 |Slave ACK| +|pt7|pt6|pt5|pt4|pt3|pt2|pt1|pt0|Slave ACK| +|ReStart Cond |@6|@5|@4|@3|@2|@1|@0| Wr =1 |Slave ACK| (NB: restart nécessaire pour changer écriture / lecture) +|d7|d6|d5|d4|d3|d2|d1|d0|Master ACK| (data 1) +..... +|d7|d6|d5|d4|d3|d2|d1|d0|Master ACK| (data N-1) +|d7|d6|d5|d4|d3|d2|d1|d0|Master NACK|Stop Cond| (data N) + + + + + +************************************************************************************* +==================== La lib I2C ========================================== +************************************************************************************* + +3 fonctions essentielles : +MyI2C_Init +MyI2C_PutString +MyI2C_GetString + +1 fonction spéciale : MyI2C_Get_Error + +Les fonctions Put/Get string fonctionnent sur le principe classique décrit précédemment +(Slave@, Pter @, Data...). +La fonction init prend parmi ses paramètres le nom d'une fct callback d'erreur. +En fait, le driver gère en IT les erreurs possibles I2C. La fonction MyI2C_Get_Error permet de +recevoir un code erreur. +Il est conseillé d'utiliser ce callback. Si on tombe dedans, c'est qu'une erreur s'est produite. +Si le code erreur est "inconnu", souvent c'est qu'il y a un soucis à l'adressage slave: +Vérifier alors la connectique physique SDA/SCL ainsi que l'alimentation du slave ou tout simplement +l'@ slave ! + + +==========================================================================================*/ + + + + + +/*========================================================================================= + GESTION ERREURS +========================================================================================= */ +typedef enum +{ + OK, + BusError, // + AckFail, // Pas,d'ack + TimeOut, // SCL est resté plus de 25ms à l'état bas + UnknownError // IT erreur déclenchée mais pas de flag explicite ... +} MyI2C_Err_Enum; + + + + +/** + * @brief Retourne les erreurs I2C + * @param I2Cx: where x can be 1 or 2 to select the I2C peripheral. + * @retval Type d'erreur rencontrée , voir MyI2C_Err_Enum + */ + +MyI2C_Err_Enum MyI2C_Get_Error(I2C_TypeDef * I2Cx); + + + +/*========================================================================================= + INITIALISATION I2C +========================================================================================= */ + + +/** + * @brief Initialise l'interface I2C (1 ou 2) + * @param I2Cx: where x can be 1 or 2 to select the I2C peripheral. + * @param char IT_Prio_I2CErr 0 à 15 (utilisé en cas d'erreur, IT courte et non bloquante + * @param *ITErr_function : callback à utiliser pour sortir d'un plantage transmission + * @retval None + * @Example MyI2C_Init(I2C1, 2,My_CallbackErr); + + + + */ +void MyI2C_Init(I2C_TypeDef * I2Cx, char IT_Prio_I2CErr, void (*ITErr_function) (void)); + + + +/*========================================================================================= + EMISSION I2C : PutString +========================================================================================= */ + + +// Structure de données pour l'émission ou la réception I2C : +typedef struct +{ + char SlaveAdress7bits; // l'adresse I2C du slave device + char * Ptr_Data; // l'adresse du début de tableau char à recevoir/émettre (tableau en RAM uC) + char Nb_Data; // le nbre d'octets à envoyer / recevoir +} +MyI2C_RecSendData_Typedef; + + + +/** + * @brief|Start Cond |@6|@5|@4|@3|@2|@1|@0| Wr =0 |Slave ACK| + |pt7|pt6|pt5|pt4|pt3|pt2|pt1|pt0|Slave ACK| + |d7|d6|d5|d4|d3|d2|d1|d0|Slave ACK| (data 1) + ..... + |d7|d6|d5|d4|d3|d2|d1|d0|Salve ACK|Stop Cond| (data N) + + * @param I2Cx: where x can be 1 or 2 to select the I2C peripheral. + * @param PteurAdress = adresse de démarrage écriture à l'interieur du slave I2C + * @param DataToSend, adresse de la structure qui contient les informations à transmettre + voir définition MyI2C_RecSendData_Typedef + * @retval None + * @Example MyI2C_PutString(I2C1,0xAA, &MyI2C_SendTimeData); + * Ecrit dans le slave câblé sur I2C1 à partir de l'@ mémoire interne Slave 0xAA + + */ +void MyI2C_PutString(I2C_TypeDef * I2Cx, char PteurAdress, MyI2C_RecSendData_Typedef * DataToSend); + + + + + + + + + + +/*========================================================================================= + Réception I2C : GetString +========================================================================================= */ + +/** + * @brief |Start Cond |@6|@5|@4|@3|@2|@1|@0| Wr =0 |Slave ACK| + |pt7|pt6|pt5|pt4|pt3|pt2|pt1|pt0|Slave ACK| + |ReStart Cond |@6|@5|@4|@3|@2|@1|@0| Wr =1 |Slave ACK| + |d7|d6|d5|d4|d3|d2|d1|d0|Master ACK| (data 1) + ..... + |d7|d6|d5|d4|d3|d2|d1|d0|Master NACK|Stop Cond| (data N) + + * @param I2Cx: where x can be 1 or 2 to select the I2C peripheral. + * @param PteurAdress = adresse de démarrage lecture à l'interieur du slave I2C + * @param DataToSend, adresse de la structure qui contient les informations nécessaires à la + réception des données voir définition MyI2C_RecSendData_Typedef + * @retval None + * @Example MyI2C_GetString(I2C1,0xAA, &MyI2C_RecevievedTimeData); + Lit dans le slave câblé sur I2C1 à partir de l'@ mémoire interne Slave 0xAA + */ +void MyI2C_GetString(I2C_TypeDef * I2Cx, char PteurAdress, MyI2C_RecSendData_Typedef * DataToReceive); + + + + +#endif diff --git a/FileInclude/MyIC2.c b/FileInclude/MyIC2.c new file mode 100644 index 0000000..e8a4a42 --- /dev/null +++ b/FileInclude/MyIC2.c @@ -0,0 +1,32 @@ +#include "MyI2C.h" + +void I2C_Init() { + + /* Déclaration */ + MyGPIO_Struct_TypeDef GPIOB6; // pin SCL + MyGPIO_Struct_TypeDef GPIOB7; // pin SDA + + /* On reset les registres de l'I2C1 */ + RCC->APB1RSTR |= RCC_APB1RSTR_I2C1RST; // reset en le mettant à 1 + RCC->APB1RSTR &= ~RCC_APB1RSTR_I2C1RST;// et on remet le bit à 0 (reset termine) + RCC->APB1ENR |=RCC_APB1ENR_I2C1EN; // clock eanble + // reset software + I2C1->CR1 |= I2C_CR1_SWRST; + I2C1->CR1 &= ~I2C_CR1_SWRST; + + /* Initialisation des GPIO */ + GPIOB6.GPIO = GPIOB; + GPIOB6.GPIO_Pin = 6; + GPIOB6.GPIO_Conf = AltOut_Ppull; + GPIOB7.GPIO = GPIOB; + GPIOB7.GPIO_Pin = 7; + GPIOB7.GPIO_Conf = AltOut_Ppull; + + MyGPIO_Init(&GPIOB6); + MyGPIO_Init(&GPIOB7); + I2C1->CCR &= ~(0x1 << 15); // mode SM ? + I2C1->CR1 |= I2C_CR1_PE; // Peripheral Enable + I2C1->CR2 |= 36; // 36MHz + I2C1->CCR |= 270; // on met le CCR à 270 pour avoir 100 kHz +} + diff --git a/FileInclude/MySPI.h b/FileInclude/MySPI.h new file mode 100644 index 0000000..b5f9aef --- /dev/null +++ b/FileInclude/MySPI.h @@ -0,0 +1,129 @@ + +#ifndef INC_MYSPI_H_ +#define INC_MYSPI_H_ + +#include "stm32f10x.h" + +/************************************************************************************* +===================== By Periph team INSA GEI 2022 =========================== +*************************************************************************************/ + +/* +************************************************************************************* +===================== I2C les IO STM32F103 ================================= +************************************************************************************* +Les IO sont pris en charge par la lib, pas besoin de faire les configurations + + +Sur la Nucléo , le SPI1 est perturbé par la LED2 (PA5), mais doit pouvoir subir les front SCK qd même (LED clignote vite..) +le SPI2 n'est pas utilisable car pin non connectées par défaut (sauf à modifier les SB). En fait la Nucléo fait un choix entre SPI1 +et SPI2 par soudage jumper (SB). + +-> Utiliser SPI1 avec la carte Nucléo + + * **IO SPI 1** + SPI1_NSS PA4 + SPI1_SCK PA5 + SPI1_MISO PA6 + SPI1_MOSI PA7 + + **IO SPI 2** + SPI2_NSS PB12 + SPI2_SCK PB13 + SPI2_MISO PB14 + SPI2_MOSI PB15 + + + + + +************************************************************************************* +==================== Fondamentaux SPI ========================================== +************************************************************************************* +- Bus Synchrone, 4 fils (même si on peut l'utiliser en 3 fils) +- Transfert à l'octet +- Protocole entre un Master (contrôle SCK) et un Slave +- SCK permet de synchroniser les bits de chaque octet. Il se configure par : + * son niveau de repos : ici niveau '1' + * le front actif de synchronisation pour chaque bit : ici front montant (front up durant bit stable) +- /CS ou /NSS active le slave sur l'état bas +- MOSI : Master Out Slave In (donc data circulant du Master vers le Slave, donc écriture dans le Slave) +- MISO : Master In Slave Out (donc data circulant du Slave vers le Master, donc lecture du Slave) + +Bien que la lib propose une fonction d'écriture et de lecture : + * une écriture s'accompagne obligatoirement d'une lecture (bidon) + * une lecture s'accompagne obligatoirement d'une écriture (bidon) +La gestion /CS = /NSS se fait "à la main". On peut alors lire toute une série d'octets +en laissant /CS à l'état bas pendant toute la durée de circulation des octets. + + +************************************************************************************* +==================== La lib SPI ========================================== +************************************************************************************* + +fonctions essentielles : + +MySPI_Init +MySPI_Send +MySPI_Read +MySPI_Set_NSS +MySPI_Clear_NSS + + +==========================================================================================*/ + + + + +/*========================================================================================= + INITIALISATION SPI +========================================================================================= */ + +/** + * @brief Configure le SPI spécifié : FSCK = 281kHz, Repos SCK = '1', Front actif = up + Gestion /CS logicielle à part, configure les 4 IO + - SCK, MOSI : Out Alt push pull + - MISO : floating input + - /NSS (/CS) : Out push pull + * @param SPI_TypeDef * SPI : SPI1 ou SPI2 + */ +void MySPI_Init(SPI_TypeDef * SPI); + + + +/** + * @brief Envoie un octet (/CS non géré, à faire logiciellement) + Plus en détail, émission de l'octet souhaité sur MOSI + Lecture en même temps d'un octet poubelle sur MISO (non exploité) + * @param : char ByteToSend : l'octet à envoyer + */ +void MySPI_Send(char ByteToSend); + + +/** + * @brief Reçoit un octet (/CS non géré, à faire logiciellement) + Plus en détail, émission d'un octet bidon sur MOSI (0x00) + pour élaborer les 8 fronts sur SCK et donc piloter le slave en lecture + qui répond sur MISO + * @param : none + * @retval : l'octet lu. + */ +char MySPI_Read(void); + + + +/** + * @brief Positionne /CS = /NSS à '1'. A utiliser pour borner les octets à transmettre/recevoir + * @param : none + */ +void MySPI_Set_NSS(void); + + + +/** + * @brief Positionne /CS = /NSS à '0'. A utiliser pour borner les octets à transmettre/recevoir + * @param :none + */ +void MySPI_Clear_NSS(void); + +#endif diff --git a/FileInclude/Time.c b/FileInclude/Time.c new file mode 100644 index 0000000..3d61d55 --- /dev/null +++ b/FileInclude/Time.c @@ -0,0 +1,26 @@ +#include "MyI2C.h" +#include "Time.h" +#define NULL 0 + +MyI2C_RecSendData_Typedef Receive; +MyI2C_RecSendData_Typedef * RData = &Receive; + +char* Get_Time(){ + time varTime; + char input[7]; + + RData->SlaveAdress7bits = 0x68; + RData->Ptr_Data = input; + RData->Nb_Data = 7; + MyI2C_GetString(I2C1, 0x0, RData); + + varTime.year = input[6]; + varTime.month = input[5]; + varTime.day = input[4]; + varTime.weekday = input[3]; + varTime.hour = input[2]; + varTime.minute = input[1]; + varTime.second = input[0]; + + return("coucou"); +} diff --git a/FileInclude/Time.h b/FileInclude/Time.h new file mode 100644 index 0000000..4f8ac08 --- /dev/null +++ b/FileInclude/Time.h @@ -0,0 +1,17 @@ +#ifndef MYTIME_H +#define MYTIME_H +#include "stm32f10x.h" + + +typedef struct{ + int year; + int month; + int day; + int weekday; + int hour; + int minute; + int second; +} time; + +char* Get_Time(void); +#endif diff --git a/Listings/startup_stm32f10x_md.lst b/Listings/startup_stm32f10x_md.lst index 8f160af..7398f8f 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\_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 +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 diff --git a/Objects/Projet1_Réel.dep b/Objects/Projet1_Réel.dep index a62d3d9..ad28dda 100644 --- a/Objects/Projet1_Réel.dep +++ b/Objects/Projet1_Réel.dep @@ -1,6 +1,6 @@ Dependencies for Project 'Projet1', Target 'Réel': (DO NOT MODIFY !) CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC -F (.\Sources\main.c)(0x6380E187)(-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) +F (.\Sources\main.c)(0x6380F673)(-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)(0x6380DAE5) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) @@ -17,6 +17,8 @@ I (.\FileInclude\Telecommande.h)(0x6380DAE4) I (.\FileInclude\Batterie.h)(0x6380DAE4) I (.\FileInclude\MyGirouette.h)(0x6380DAE4) I (.\FileInclude\MyVoile.h)(0x6380DAE4) +I (.\FileInclude\MyI2C.h)(0x634E5A47) +I (C:\Keil_v5\ARM\ARMCC\include\Time.h)(0x5E8E9122) F (.\FileInclude\MyTimer.c)(0x6380DAE4)(-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)(0x6380DAE4) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) @@ -50,7 +52,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\MyGirouette.c)(0x6380DAE4)(-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\mygirouette.o --omf_browse .\objects\mygirouette.crf --depend .\objects\mygirouette.d) +F (.\FileInclude\MyGirouette.c)(0x6380F678)(-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\mygirouette.o --omf_browse .\objects\mygirouette.crf --depend .\objects\mygirouette.d) I (FileInclude\MyGirouette.h)(0x6380DAE4) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) I (.\RTE\_R_el\RTE_Components.h)(0x6380DAE5) @@ -86,7 +88,7 @@ I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_ I (FileInclude\MyADC.h)(0x6380DAE4) I (FileInclude\MyTimer.h)(0x6380DAE4) I (FileInclude\Driver_GPIO.h)(0x6380DAE4) -F (.\FileInclude\Plateau.c)(0x6380E0B0)(-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) +F (.\FileInclude\Plateau.c)(0x6380E3D6)(-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)(0x6380DAE4) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) I (.\RTE\_R_el\RTE_Components.h)(0x6380DAE5) @@ -111,6 +113,18 @@ I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_ I (FileInclude\Driver_GPIO.h)(0x6380DAE4) I (FileInclude\Plateau.h)(0x6380DAE4) I (FileInclude\Telecommande.h)(0x6380DAE4) +F (.\FileInclude\Time.c)(0x6380F610)(-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\time.o --omf_browse .\objects\time.crf --depend .\objects\time.d) +I (FileInclude\MyI2C.h)(0x634E5A47) +I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) +I (.\RTE\_R_el\RTE_Components.h)(0x6380DAE5) +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\Time.h)(0x63809D28) +F (.\FileInclude\Lib_Com_Periph_2022.lib)(0x634E68C6)() F (RTE\Device\STM32F103RB\RTE_Device.h)(0x6380DAE5)() F (RTE\Device\STM32F103RB\startup_stm32f10x_md.s)(0x6380DAE5)(--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)(0x6380DAE5)(-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) diff --git a/Objects/Projet1_SImulation.dep b/Objects/Projet1_SImulation.dep index fd367ee..0f5d1d9 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)(0x6380DFA7)(-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)(0x6380F803)(-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)(0x6380DAE5) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) @@ -17,6 +17,8 @@ I (.\FileInclude\Telecommande.h)(0x6380DAE4) I (.\FileInclude\Batterie.h)(0x6380DAE4) I (.\FileInclude\MyGirouette.h)(0x6380DAE4) I (.\FileInclude\MyVoile.h)(0x6380DAE4) +I (.\FileInclude\MyI2C.h)(0x634E5A47) +I (C:\Keil_v5\ARM\ARMCC\include\Time.h)(0x5E8E9122) F (.\FileInclude\MyTimer.c)(0x6380DAE4)(-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)(0x6380DAE4) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) @@ -50,7 +52,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\MyGirouette.c)(0x6380DAE4)(-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\mygirouette.o --omf_browse .\objects\mygirouette.crf --depend .\objects\mygirouette.d) +F (.\FileInclude\MyGirouette.c)(0x6380F678)(-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\mygirouette.o --omf_browse .\objects\mygirouette.crf --depend .\objects\mygirouette.d) I (FileInclude\MyGirouette.h)(0x6380DAE4) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) I (.\RTE\_SImulation\RTE_Components.h)(0x6380DAE5) @@ -86,7 +88,7 @@ I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_ I (FileInclude\MyADC.h)(0x6380DAE4) I (FileInclude\MyTimer.h)(0x6380DAE4) I (FileInclude\Driver_GPIO.h)(0x6380DAE4) -F (.\FileInclude\Plateau.c)(0x6380E0B0)(-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)(0x6380E3D6)(-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)(0x6380DAE4) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) I (.\RTE\_SImulation\RTE_Components.h)(0x6380DAE5) @@ -111,6 +113,18 @@ I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_ I (FileInclude\Driver_GPIO.h)(0x6380DAE4) I (FileInclude\Plateau.h)(0x6380DAE4) I (FileInclude\Telecommande.h)(0x6380DAE4) +F (.\FileInclude\Time.c)(0x6380F8F9)(-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\time.o --omf_browse .\objects\time.crf --depend .\objects\time.d) +I (FileInclude\MyI2C.h)(0x634E5A47) +I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) +I (.\RTE\_SImulation\RTE_Components.h)(0x6380DAE5) +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\Time.h)(0x6380F8F4) +F (.\FileInclude\Lib_Com_Periph_2022.lib)(0x634E68C6)() F (RTE\Device\STM32F103RB\RTE_Device.h)(0x6380DAE5)() F (RTE\Device\STM32F103RB\startup_stm32f10x_md.s)(0x6380DAE5)(--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)(0x6380DAE5)(-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 deleted file mode 100644 index 59a1127..0000000 Binary files a/Objects/Projet1_Simulation.axf and /dev/null differ diff --git a/Objects/Projet1_Simulation.build_log.htm b/Objects/Projet1_Simulation.build_log.htm index 9249a68..e10f6df 100644 --- a/Objects/Projet1_Simulation.build_log.htm +++ b/Objects/Projet1_Simulation.build_log.htm @@ -17,7 +17,7 @@ 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: STLink\ST-LINKIII-KEIL_SWO.dll V3.0.8.0 +Target DLL: UL2CM3.DLL V1.163.9.0 Dialog DLL: TARMSTM.DLL V1.66.0.0

Project:

@@ -26,24 +26,31 @@ Project File Date: 11/25/2022

Output:

*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin' -Rebuild target 'Réel' -compiling MyVoile.c... -compiling MyADC.c... -compiling Driver_GPIO.c... -compiling Batterie.c... +Rebuild target 'SImulation' compiling main.c... +Sources\main.c(52): warning: #223-D: function "Get_Time" declared implicitly + Send_Message(Get_Time()); +Sources\main.c(52): error: #167: argument of type "int" is incompatible with parameter of type "char *" + Send_Message(Get_Time()); +Sources\main.c: 1 warning, 1 error +compiling MyVoile.c... +compiling Driver_GPIO.c... compiling MyGirouette.c... -FileInclude\MyGirouette.c(26): warning: #177-D: variable "GPIOB0" was declared but never referenced +FileInclude\MyGirouette.c(25): warning: #177-D: variable "GPIOB0" was declared but never referenced MyGPIO_Struct_TypeDef GPIOB0={ FileInclude\MyGirouette.c: 1 warning, 0 errors +compiling Batterie.c... compiling MyTimer.c... +compiling MyADC.c... assembling startup_stm32f10x_md.s... -compiling system_stm32f10x.c... -compiling Telecommande.c... compiling Plateau.c... -linking... -Program Size: Code=4708 RO-data=320 RW-data=84 ZI-data=1116 -".\Objects\Projet1_Simulation.axf" - 0 Error(s), 1 Warning(s). +compiling Time.c... +FileInclude\Time.c(9): warning: #550-D: variable "varTime" was set but never used + time varTime; +FileInclude\Time.c: 1 warning, 0 errors +compiling Telecommande.c... +compiling system_stm32f10x.c... +".\Objects\Projet1_Simulation.axf" - 1 Error(s), 3 Warning(s).

Software Packages used:

@@ -61,7 +68,7 @@ Package Vendor: Keil

Collection of Component include folders:

.\RTE\Device\STM32F103RB - .\RTE\_R_el + .\RTE\_SImulation C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include @@ -70,10 +77,11 @@ Package Vendor: Keil * Component: ARM::CMSIS:CORE:5.4.0 * Component: Keil::Device:Startup:1.0.0 - Source file: Device\Source\ARM\startup_stm32f10x_md.s Include file: RTE_Driver\Config\RTE_Device.h - Source file: Device\Source\ARM\STM32F1xx_OPT.s Source file: Device\Source\system_stm32f10x.c + Source file: Device\Source\ARM\STM32F1xx_OPT.s + Source file: Device\Source\ARM\startup_stm32f10x_md.s +Target not created. Build Time Elapsed: 00:00:02 diff --git a/Objects/batterie.crf b/Objects/batterie.crf index 16a133a..ee491fb 100644 Binary files a/Objects/batterie.crf and b/Objects/batterie.crf differ diff --git a/Objects/batterie.d b/Objects/batterie.d index e4a4339..fb9f0ef 100644 --- a/Objects/batterie.d +++ b/Objects/batterie.d @@ -1,7 +1,7 @@ .\objects\batterie.o: FileInclude\Batterie.c .\objects\batterie.o: FileInclude\Batterie.h .\objects\batterie.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h -.\objects\batterie.o: .\RTE\_R_el\RTE_Components.h +.\objects\batterie.o: .\RTE\_SImulation\RTE_Components.h .\objects\batterie.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h .\objects\batterie.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h .\objects\batterie.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h diff --git a/Objects/batterie.o b/Objects/batterie.o index 0da57af..d9a8d97 100644 Binary files a/Objects/batterie.o and b/Objects/batterie.o differ diff --git a/Objects/driver_gpio.crf b/Objects/driver_gpio.crf index 74448ae..b6f0f9c 100644 Binary files a/Objects/driver_gpio.crf and b/Objects/driver_gpio.crf differ diff --git a/Objects/driver_gpio.d b/Objects/driver_gpio.d index e9527ff..bf555b6 100644 --- a/Objects/driver_gpio.d +++ b/Objects/driver_gpio.d @@ -1,7 +1,7 @@ .\objects\driver_gpio.o: FileInclude\Driver_GPIO.c .\objects\driver_gpio.o: FileInclude\Driver_GPIO.h .\objects\driver_gpio.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h -.\objects\driver_gpio.o: .\RTE\_R_el\RTE_Components.h +.\objects\driver_gpio.o: .\RTE\_SImulation\RTE_Components.h .\objects\driver_gpio.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h .\objects\driver_gpio.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h .\objects\driver_gpio.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h diff --git a/Objects/driver_gpio.o b/Objects/driver_gpio.o index c472015..1959bd3 100644 Binary files a/Objects/driver_gpio.o and b/Objects/driver_gpio.o differ diff --git a/Objects/main.crf b/Objects/main.crf index ae6b420..1d0378f 100644 Binary files a/Objects/main.crf and b/Objects/main.crf differ diff --git a/Objects/main.d b/Objects/main.d index e0665d9..246e3e6 100644 --- a/Objects/main.d +++ b/Objects/main.d @@ -1,6 +1,6 @@ .\objects\main.o: Sources\main.c .\objects\main.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h -.\objects\main.o: .\RTE\_R_el\RTE_Components.h +.\objects\main.o: .\RTE\_SImulation\RTE_Components.h .\objects\main.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h .\objects\main.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h .\objects\main.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h @@ -15,3 +15,5 @@ .\objects\main.o: .\FileInclude\Batterie.h .\objects\main.o: .\FileInclude\MyGirouette.h .\objects\main.o: .\FileInclude\MyVoile.h +.\objects\main.o: .\FileInclude\MyI2C.h +.\objects\main.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\Time.h diff --git a/Objects/myadc.crf b/Objects/myadc.crf index 5236b01..31fa122 100644 Binary files a/Objects/myadc.crf and b/Objects/myadc.crf differ diff --git a/Objects/myadc.d b/Objects/myadc.d index 827311e..ed71588 100644 --- a/Objects/myadc.d +++ b/Objects/myadc.d @@ -1,7 +1,7 @@ .\objects\myadc.o: FileInclude\MyADC.c .\objects\myadc.o: FileInclude\MyADC.h .\objects\myadc.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h -.\objects\myadc.o: .\RTE\_R_el\RTE_Components.h +.\objects\myadc.o: .\RTE\_SImulation\RTE_Components.h .\objects\myadc.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h .\objects\myadc.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h .\objects\myadc.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h diff --git a/Objects/myadc.o b/Objects/myadc.o index 086efc3..efb5b26 100644 Binary files a/Objects/myadc.o and b/Objects/myadc.o differ diff --git a/Objects/mygirouette.crf b/Objects/mygirouette.crf index 4dbbb09..c089936 100644 Binary files a/Objects/mygirouette.crf and b/Objects/mygirouette.crf differ diff --git a/Objects/mygirouette.d b/Objects/mygirouette.d index 56fc658..eeef927 100644 --- a/Objects/mygirouette.d +++ b/Objects/mygirouette.d @@ -1,7 +1,7 @@ .\objects\mygirouette.o: FileInclude\MyGirouette.c .\objects\mygirouette.o: FileInclude\MyGirouette.h .\objects\mygirouette.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h -.\objects\mygirouette.o: .\RTE\_R_el\RTE_Components.h +.\objects\mygirouette.o: .\RTE\_SImulation\RTE_Components.h .\objects\mygirouette.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h .\objects\mygirouette.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h .\objects\mygirouette.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h diff --git a/Objects/mygirouette.o b/Objects/mygirouette.o index d23e28b..a3bedf2 100644 Binary files a/Objects/mygirouette.o and b/Objects/mygirouette.o differ diff --git a/Objects/mytimer.crf b/Objects/mytimer.crf index d09b84d..3f25234 100644 Binary files a/Objects/mytimer.crf and b/Objects/mytimer.crf differ diff --git a/Objects/mytimer.d b/Objects/mytimer.d index 76ce1c8..3da3f45 100644 --- a/Objects/mytimer.d +++ b/Objects/mytimer.d @@ -1,7 +1,7 @@ .\objects\mytimer.o: FileInclude\MyTimer.c .\objects\mytimer.o: FileInclude\MyTimer.h .\objects\mytimer.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h -.\objects\mytimer.o: .\RTE\_R_el\RTE_Components.h +.\objects\mytimer.o: .\RTE\_SImulation\RTE_Components.h .\objects\mytimer.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h .\objects\mytimer.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h .\objects\mytimer.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h diff --git a/Objects/mytimer.o b/Objects/mytimer.o index 9a03b7e..21a37b2 100644 Binary files a/Objects/mytimer.o and b/Objects/mytimer.o differ diff --git a/Objects/myvoile.crf b/Objects/myvoile.crf index 92499a6..359cdfa 100644 Binary files a/Objects/myvoile.crf and b/Objects/myvoile.crf differ diff --git a/Objects/myvoile.d b/Objects/myvoile.d index 52db53d..c636e0b 100644 --- a/Objects/myvoile.d +++ b/Objects/myvoile.d @@ -1,7 +1,7 @@ .\objects\myvoile.o: MyVoile.c .\objects\myvoile.o: .\FileInclude\MyVoile.h .\objects\myvoile.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h -.\objects\myvoile.o: .\RTE\_R_el\RTE_Components.h +.\objects\myvoile.o: .\RTE\_SImulation\RTE_Components.h .\objects\myvoile.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h .\objects\myvoile.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h .\objects\myvoile.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h diff --git a/Objects/myvoile.o b/Objects/myvoile.o index bf2fe6c..13512bd 100644 Binary files a/Objects/myvoile.o and b/Objects/myvoile.o differ diff --git a/Objects/plateau.crf b/Objects/plateau.crf index 50cfd8c..eb72c98 100644 Binary files a/Objects/plateau.crf and b/Objects/plateau.crf differ diff --git a/Objects/plateau.d b/Objects/plateau.d index 278251b..12f47fe 100644 --- a/Objects/plateau.d +++ b/Objects/plateau.d @@ -1,7 +1,7 @@ .\objects\plateau.o: FileInclude\Plateau.c .\objects\plateau.o: FileInclude\MyTimer.h .\objects\plateau.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h -.\objects\plateau.o: .\RTE\_R_el\RTE_Components.h +.\objects\plateau.o: .\RTE\_SImulation\RTE_Components.h .\objects\plateau.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h .\objects\plateau.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h .\objects\plateau.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h diff --git a/Objects/plateau.o b/Objects/plateau.o index 5a0b926..6a8b5ba 100644 Binary files a/Objects/plateau.o and b/Objects/plateau.o differ diff --git a/Objects/startup_stm32f10x_md.o b/Objects/startup_stm32f10x_md.o index 1ea7c65..90f8481 100644 Binary files a/Objects/startup_stm32f10x_md.o and b/Objects/startup_stm32f10x_md.o differ diff --git a/Objects/system_stm32f10x.crf b/Objects/system_stm32f10x.crf index 9383281..8a841a0 100644 Binary files a/Objects/system_stm32f10x.crf and b/Objects/system_stm32f10x.crf differ diff --git a/Objects/system_stm32f10x.d b/Objects/system_stm32f10x.d index ff9415b..f9aa43e 100644 --- a/Objects/system_stm32f10x.d +++ b/Objects/system_stm32f10x.d @@ -1,6 +1,6 @@ .\objects\system_stm32f10x.o: RTE\Device\STM32F103RB\system_stm32f10x.c .\objects\system_stm32f10x.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h -.\objects\system_stm32f10x.o: .\RTE\_R_el\RTE_Components.h +.\objects\system_stm32f10x.o: .\RTE\_SImulation\RTE_Components.h .\objects\system_stm32f10x.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h .\objects\system_stm32f10x.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h .\objects\system_stm32f10x.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h diff --git a/Objects/system_stm32f10x.o b/Objects/system_stm32f10x.o index 85d6ca3..1168e9b 100644 Binary files a/Objects/system_stm32f10x.o and b/Objects/system_stm32f10x.o differ diff --git a/Objects/telecommande.crf b/Objects/telecommande.crf index f1f963e..2962542 100644 Binary files a/Objects/telecommande.crf and b/Objects/telecommande.crf differ diff --git a/Objects/telecommande.d b/Objects/telecommande.d index a1172de..36b17bd 100644 --- a/Objects/telecommande.d +++ b/Objects/telecommande.d @@ -1,7 +1,7 @@ .\objects\telecommande.o: FileInclude\Telecommande.c .\objects\telecommande.o: FileInclude\MyTimer.h .\objects\telecommande.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h -.\objects\telecommande.o: .\RTE\_R_el\RTE_Components.h +.\objects\telecommande.o: .\RTE\_SImulation\RTE_Components.h .\objects\telecommande.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h .\objects\telecommande.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h .\objects\telecommande.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h diff --git a/Objects/telecommande.o b/Objects/telecommande.o index 93195d4..2aac364 100644 Binary files a/Objects/telecommande.o and b/Objects/telecommande.o differ diff --git a/Objects/time.crf b/Objects/time.crf new file mode 100644 index 0000000..7c118f4 Binary files /dev/null and b/Objects/time.crf differ diff --git a/Objects/time.d b/Objects/time.d new file mode 100644 index 0000000..964501a --- /dev/null +++ b/Objects/time.d @@ -0,0 +1,11 @@ +.\objects\time.o: FileInclude\Time.c +.\objects\time.o: FileInclude\MyI2C.h +.\objects\time.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h +.\objects\time.o: .\RTE\_SImulation\RTE_Components.h +.\objects\time.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h +.\objects\time.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h +.\objects\time.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h +.\objects\time.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h +.\objects\time.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h +.\objects\time.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h +.\objects\time.o: FileInclude\Time.h diff --git a/Objects/main.o b/Objects/time.o similarity index 79% rename from Objects/main.o rename to Objects/time.o index c9eaca8..4e80660 100644 Binary files a/Objects/main.o and b/Objects/time.o differ diff --git a/Projet1.uvguix.alejeune b/Projet1.uvguix.alejeune index 9b4f4e8..8e6aad8 100644 --- a/Projet1.uvguix.alejeune +++ b/Projet1.uvguix.alejeune @@ -22,17 +22,17 @@ 38003 Registers - 150 100 + 150 137 346 Code Coverage - 1010 540 + 1010 160 204 Performance Analyzer - 1170 175 175 100 + 1170 @@ -71,7 +71,7 @@ 2506 Trace Data FiltIdx=0;DescrEn=0;DescrHeight=4;FuncTrc=1;FindType=8;ColWidths=004B00870082005F004600E600C80096 - 75 135 95 70 230 200 150 + 75 135 130 95 70 230 200 150 466 @@ -100,8 +100,8 @@ 2 3 - -1 - -1 + -32000 + -32000 -1 @@ -117,8 +117,8 @@ 0 - 1275 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000B00000000000000010000003D553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C536F75726365735C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF44553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C506C61746561752E630000000009506C61746561752E6300000000BECEA100FFFFFFFF44553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C506C61746561752E680000000009506C61746561752E6800000000F0A0A100FFFFFFFF49553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C54656C65636F6D6D616E64652E68000000000E54656C65636F6D6D616E64652E6800000000BCA8E100FFFFFFFF42553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C4D794144432E6300000000074D794144432E63000000009CC1B600FFFFFFFF45553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C447269766572735C46696C65496E636C7564655C4472697665725F4750494F2E63000000000D4472697665725F4750494F2E6300000000F7B88600FFFFFFFF45553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C42617474657269652E63000000000A42617474657269652E6300000000D9ADC200FFFFFFFF44553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C4D7954696D65722E6300000000094D7954696D65722E6300000000A5C2D700FFFFFFFF49553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C54656C65636F6D6D616E64652E63000000000E54656C65636F6D6D616E64652E6300000000B3A6BE00FFFFFFFF48553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C4D794769726F75657474652E63000000000D4D794769726F75657474652E6300000000B3A6BE00FFFFFFFF5C553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000EAD6A300FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000002D01000066000000000800008D030000 + 1524 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000010000002800000028000000020000000C00000000000000010000003D553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C536F75726365735C6D61696E2E6300000000066D61696E2E6301000000C5D4F200FFFFFFFF44553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C506C61746561752E630000000009506C61746561752E6301000000FFDC7800FFFFFFFF44553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C506C61746561752E680000000009506C61746561752E6801000000BECEA100FFFFFFFF49553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C54656C65636F6D6D616E64652E68000000000E54656C65636F6D6D616E64652E6801000000F0A0A100FFFFFFFF42553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C4D794144432E6300000000074D794144432E6301000000BCA8E100FFFFFFFF45553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C447269766572735C46696C65496E636C7564655C4472697665725F4750494F2E63000000000D4472697665725F4750494F2E63010000009CC1B600FFFFFFFF45553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C42617474657269652E63000000000A42617474657269652E6301000000F7B88600FFFFFFFF44553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C4D7954696D65722E6300000000094D7954696D65722E6301000000D9ADC200FFFFFFFF49553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C54656C65636F6D6D616E64652E63000000000E54656C65636F6D6D616E64652E6301000000A5C2D700FFFFFFFF48553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C4D794769726F75657474652E63000000000D4D794769726F75657474652E6301000000B3A6BE00FFFFFFFF41553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C54696D652E63000000000654696D652E6301000000EAD6A300FFFFFFFF41553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C54696D652E68000000000654696D652E6801000000F6FA7D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000002D01000066000000960400004803000001000000000000000000000042553A5C446F63756D656E74735C3469725C53315C4D6963726F636F6E74726F6C6575725C54505F566F696C6965725C46696C65496E636C7564655C4D794932432E6800000000074D794932432E6800000000C5D4F200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000096040000660000000008000048030000 @@ -157,7 +157,7 @@ 0 16 - 0300000066000000260100005D030000 + 03000000660000002601000018030000 16 @@ -177,7 +177,7 @@ 0 16 - 0300000066000000260100005D030000 + 03000000660000002601000018030000 16 @@ -457,7 +457,7 @@ 0 16 - 0300000066000000260100005D030000 + 03000000660000002601000018030000 16 @@ -477,7 +477,7 @@ 0 16 - 0300000066000000260100005D030000 + 03000000660000002601000018030000 16 @@ -497,7 +497,7 @@ 0 16 - 000000008E030000000800002E040000 + 0000000049030000000800002E040000 16 @@ -537,7 +537,7 @@ 0 16 - 0300000091030000FD07000015040000 + 030000004C030000FD07000015040000 16 @@ -1157,7 +1157,7 @@ 0 16 - 0300000066000000260100005D030000 + 03000000660000002601000018030000 16 @@ -1177,7 +1177,7 @@ 0 16 - 0300000091030000FD07000015040000 + 030000004C030000FD07000015040000 16 @@ -1197,7 +1197,7 @@ 0 16 - 0300000091030000FD07000015040000 + 030000004C030000FD07000015040000 16 @@ -1257,7 +1257,7 @@ 0 16 - 0300000091030000FD07000015040000 + 030000004C030000FD07000015040000 16 @@ -1277,7 +1277,7 @@ 0 16 - 0300000091030000FD07000015040000 + 030000004C030000FD07000015040000 16 @@ -1806,7 +1806,7 @@ 3312 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F6000000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A0040000660000009005000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF290100004F0000002D010000760300000100000002000010040000000100000012FFFFFF07040000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000290100008D030000000000004F00000029010000760300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000003002000090050000D4020000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000076030000000800007A030000010000000100001004000000010000003CFCFFFF37000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000000000000910300000008000045040000000000007A030000000800002E0400000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F6000000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A0040000660000009005000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF290100004F0000002D010000310300000100000002000010040000000100000012FFFFFF07040000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000000000000660000002901000048030000000000004F00000029010000310300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000003002000090050000D4020000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000031030000000800003503000001000000010000100400000001000000DEFCFFFFB2000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000004C03000000080000450400000000000035030000000800002E0400000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 @@ -1828,8 +1828,8 @@ 59399 Build - 983 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050010000000452E9656C960000000000000002000A53496D756C6174696F6E0452E9656C00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 989 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000A53496D756C6174696F6E960000000000000002000A53496D756C6174696F6E0452E9656C00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3606,23 +3606,23 @@ - 1 + 3 0 - 100 + 50 0 .\Sources\main.c - 18 - 40 - 48 + 0 + 1 + 52 1 0 .\FileInclude\Plateau.c - 26 + 27 10 50 1 @@ -3667,7 +3667,7 @@ .\FileInclude\Batterie.c - 20 + 21 1 27 1 @@ -3695,17 +3695,39 @@ .\FileInclude\MyGirouette.c 0 - 13 - 46 + 1 + 25 1 0 - RTE\Device\STM32F103RB\startup_stm32f10x_md.s - 0 - 128 - 133 + .\FileInclude\Time.c + 36 + 1 + 15 + 1 + + 0 + + + FileInclude\Time.h + 16 + 1 + 10 + 1 + + 0 + + + + 50 + 0 + + FileInclude\MyI2C.h + 47 + 188 + 224 1 0 diff --git a/Projet1.uvoptx b/Projet1.uvoptx index 95ea96c..59b441a 100644 --- a/Projet1.uvoptx +++ b/Projet1.uvoptx @@ -75,7 +75,7 @@ 1 0 - 0 + 1 18 @@ -144,16 +144,16 @@ 0 8 1 -
134219520
+
0
0 0 0 0 0 - 1 + 0 .\FileInclude\MyGirouette.c - \\Projet1_Simulation\FileInclude/MyGirouette.c\8 + @@ -169,7 +169,7 @@ 0 1 - 1 + 0 0 0 0 @@ -183,7 +183,7 @@ 0 0 0 - 1 + 0 0 0 0 @@ -287,7 +287,7 @@ 1 0 - 1 + 0 18 @@ -455,7 +455,7 @@ 1 1 1 - 0 + 1 0 0 .\Sources\main.c @@ -559,7 +559,7 @@ 2 9 1 - 1 + 0 0 0 .\FileInclude\Telecommande.c @@ -567,6 +567,30 @@ 0 0 + + 2 + 10 + 1 + 1 + 0 + 0 + .\FileInclude\Time.c + Time.c + 0 + 0 + + + 2 + 11 + 4 + 0 + 0 + 0 + .\FileInclude\Lib_Com_Periph_2022.lib + Lib_Com_Periph_2022.lib + 0 + 0 + diff --git a/Projet1.uvprojx b/Projet1.uvprojx index e81e8a9..de25a73 100644 --- a/Projet1.uvprojx +++ b/Projet1.uvprojx @@ -433,6 +433,16 @@ 1 .\FileInclude\Telecommande.c + + Time.c + 1 + .\FileInclude\Time.c + + + Lib_Com_Periph_2022.lib + 4 + .\FileInclude\Lib_Com_Periph_2022.lib + @@ -870,6 +880,16 @@ 1 .\FileInclude\Telecommande.c + + Time.c + 1 + .\FileInclude\Time.c + + + Lib_Com_Periph_2022.lib + 4 + .\FileInclude\Lib_Com_Periph_2022.lib + diff --git a/Sources/main.c b/Sources/main.c index 0bdd020..fd8ce2f 100644 --- a/Sources/main.c +++ b/Sources/main.c @@ -7,7 +7,8 @@ #include #include #include - +#include +#include /* Declarations */ int droite; @@ -21,7 +22,9 @@ char* visuBatterie = "[-----]"; MyTimer_Struct_TypeDef TIM; MyTimer_Struct_TypeDef * Data = &TIM; - +void I2CHandler(void) { + Send_Message("[ERROR] I2C PROBLEM EVERYBODY GET OUT!!!"); +} void handler() { counter ++; @@ -46,6 +49,8 @@ void handler() { if (counter == 10) { + Send_Message(Get_Time()); + bat = Get_Batterie(); if (bat < 20) { visuBatterie = "[-----]"; @@ -89,6 +94,9 @@ void f (char a) { int main (void) { + /* Init I2C */ + MyI2C_Init(I2C1, 2,I2CHandler); + /* Configuration du Timer */ Data->Timer = TIM1; Data->ARR = 65535; @@ -106,6 +114,7 @@ int main (void) /* Batterie */ Init_Batterie(); + while (1) { Set_Voile(Get_Angle()); }