Remote now uses the motor, creation of initImplementation

ok

driver/timer.c

@@ -4,6 +4,7 @@
 void plantage(void) {
 	while(1);
 }
+
 void (*IT_Tim1) (void) = plantage;
 void (*IT_Tim2) (void) = plantage;
 void (*IT_Tim3) (void) = plantage;
@@ -168,10 +169,10 @@ if(Timer == TIM1)
 	MyGPIO_Init(&PWM_OUT);
 }
 
-void MyTimer_DutyCycle(TIM_TypeDef * Timer, char Channel, unsigned char DutyCycle)
+void MyTimer_DutyCycle(TIM_TypeDef * Timer, char Channel, unsigned int DutyCycle)
 {
 	unsigned int RC;
-	RC = ((Timer->ARR)/100)*(DutyCycle);
+	RC = ((Timer->ARR)*(DutyCycle)/10000);
 	switch (Channel) {
 		case 1:
 			Timer->CCR1 = RC;

driver/timer.h

@@ -11,7 +11,7 @@ typedef struct {
 void MyTimer_Base_Init(MyTimer_Struct_Typedef * Timer);
 void MyTimer_ActiveIT(TIM_TypeDef * Timer, char Prio, void (*IT_function) (void));
 void MyTimer_PWM(TIM_TypeDef * Timer ,char Channel);
-void MyTimer_DutyCycle(TIM_TypeDef * Timer, char Channel, unsigned char DutyCycle);
+void MyTimer_DutyCycle(TIM_TypeDef * Timer, char Channel, unsigned int DutyCycle);
 
 #define MyTimer_Base_Start(Tim) (Tim.Timer->CR1 |= TIM_CR1_CEN)
 #define MyTimer_Base_Stop(Tim) (Tim.Timer->CR1 &= ~TIM_CR1_CEN)

driver/uart.c

@@ -161,4 +161,3 @@ void USART3_IRQHandler(void)
 	UART1.Wstop = stop1b; // nombre bit de stop (stop1b, stop2b)
 	MyUART_Init(&UART1); // initialisation
 */
-

implementation/motoreducteur.c

@@ -0,0 +1,41 @@
+#include "motoreducteur.h"
+#include "timer.h"
+#include "gpio.h"
+
+void MyMotor_Init(void)
+{
+	MyTimer_Struct_Typedef Timer;
+	MyGPIO_Struct_TypeDef Pin_Direction;
+	
+	//F de 50kHz
+	Timer.Timer = TIM3;
+	Timer.ARR = 3599;		//72Mhz / 50kHz = 1440 et 1440*1 = 1440
+	Timer.PSC = 0;
+	
+	Pin_Direction.GPIO = GPIOB;
+	Pin_Direction.GPIO_Pin = 1;
+	Pin_Direction.GPIO_Conf = Out_PullUp;
+	
+	MyTimer_Base_Init(&Timer);
+	MyGPIO_Init(&Pin_Direction);
+	
+	//Pin Timer 3 Channel 3 PB0
+	MyTimer_PWM(TIM3, 3);
+	MyTimer_DutyCycle(TIM3, 3, 0);
+
+	MyTimer_Base_Start(Timer);
+	MyMotor_ChangeDirection(ANTIHOR);
+}
+
+void MyMotor_ChangeSpeed(unsigned int DC)
+{
+	MyTimer_DutyCycle(TIM3, 3, DC);
+}
+
+void MyMotor_ChangeDirection(uint8_t Sens)
+{
+	if (Sens == HORAIRE)
+		MyGPIO_Set(GPIOB, 1);
+	if (Sens == ANTIHOR)
+		MyGPIO_Reset(GPIOB, 1);
+}

implementation/motoreducteur.h

@@ -0,0 +1,12 @@
+#ifndef MYMOTOR_H
+#define MYMOTOR_H
+#include "stm32f10x.h"
+
+#define HORAIRE 0x1
+#define ANTIHOR 0x0
+
+void MyMotor_Init(void);
+void MyMotor_ChangeSpeed(unsigned int DC);
+void MyMotor_ChangeDirection(uint8_t Sens);
+
+#endif

implementation/remote.c

@@ -1,5 +1,6 @@
 #include "remote.h"
 #include "gpio.h"
+#include "motoreducteur.h"
 
 MyUART_Struct_Typedef uartCool = {USART1,9600,lengthBit8,parityNone,stopBit1};
 
@@ -7,12 +8,14 @@ void remote(uint8_t data)
 {
 		MyUART_Send(&uartCool,data);
 		int8_t signedData = (int8_t)data;
-		if(signedData > 0)
+		if(signedData >= 0)
 		{
-			MyGPIO_Set(GPIOA,5);
+			MyMotor_ChangeDirection(HORAIRE);
+			MyMotor_ChangeSpeed(signedData*100);
 		}
 		else {
-			MyGPIO_Reset(GPIOA,5);
+			MyMotor_ChangeDirection(ANTIHOR);
+			MyMotor_ChangeSpeed((-signedData)*100);
 		}
 }
 

implementation/rtc.c

@@ -0,0 +1,37 @@
+#include "rtc.h"
+
+void plantage_i2C(void) {
+	while(1);
+}
+
+void (*IT_I2C_Err) (void) = plantage_i2C;
+
+void MyRTC_Init(void)
+{
+	MyI2C_Init(I2C1, 15, IT_I2C_Err);
+}
+
+void MyRTC_GetTime(int* sec, int* min, int* hour, int* day, int* date, int* month, int* year)
+{
+	MyI2C_RecSendData_Typedef data;
+	char regCopy = 0;
+	
+	data.SlaveAdress7bits = 0x68;
+	data.Ptr_Data = &regCopy;
+	data.Nb_Data = 1;
+	
+	MyI2C_GetString(I2C1, 0x00, &data);
+	*sec = ((regCopy >> 4) & 0x07) * 10 + (regCopy & 0x0F);
+	MyI2C_GetString(I2C1, 0x01, &data);
+	*min = ((regCopy >> 4) & 0x07) * 10 + (regCopy & 0x0F);
+	MyI2C_GetString(I2C1, 0x02, &data);
+	*hour = 0;
+	MyI2C_GetString(I2C1, 0x03, &data);
+	*day = (regCopy & 0x07);
+	MyI2C_GetString(I2C1, 0x04, &data);
+	*date = ((regCopy >> 4) & 0x03) * 10 + (regCopy & 0x0F);
+	MyI2C_GetString(I2C1, 0x05, &data);
+	*month = ((regCopy >> 4) & 0x01) * 10 + (regCopy & 0x0F);
+	MyI2C_GetString(I2C1, 0x06, &data);
+	*year = ((regCopy >> 4) & 0xF0) * 10 + (regCopy & 0x0F) + 2000;
+}

implementation/rtc.h

@@ -0,0 +1,9 @@
+#ifndef MYRTC_H
+#define MYRTC_H
+#include "stm32f10x.h"
+#include "MyI2C.h"
+
+void MyRTC_Init(void);
+void MyRTC_GetTime(int* sec, int* min, int* hour, int* day, int* date, int* month, int* year);
+
+#endif

implementation/servo.c

@@ -0,0 +1,30 @@
+#include "servo.h"
+#include "timer.h"
+
+void MyServo_Init(void)
+{	
+	MyTimer_Struct_Typedef Timer;
+	
+	//Période de 20ms -> F de 50Hz
+	Timer.Timer = TIM2;
+	Timer.ARR = 3599;		//20*180 (angle) = 3600
+	Timer.PSC = 399;		//72Mhz / 50Hz = 1.44Mhz et 3600*400 = 1.44M
+	
+	MyTimer_Base_Init(&Timer);
+	
+	//Pin Timer 2 Channel 1 PA0
+	MyTimer_PWM(TIM2, 1);
+	MyTimer_DutyCycle(TIM2, 1, 750);
+
+	MyTimer_Base_Start(Timer);
+}
+
+void MyServo_ChangeAngle(uint8_t Angle)
+{
+	if (Angle > 180)
+		Angle = 180;
+	
+	int DC = 500 + (Angle * 500 / 180);
+	
+	MyTimer_DutyCycle(TIM2, 1, DC);
+}

implementation/servo.h

@@ -0,0 +1,13 @@
+#ifndef MYSERVO_H
+#define MYSERVO_H
+#include "stm32f10x.h"
+
+/*
+180 correspond à 0°
+0 correspond à 90°
+*/
+
+void MyServo_Init(void);
+void MyServo_ChangeAngle(uint8_t Angle);
+
+#endif

keilproject/Source/Principale.c

@@ -1,17 +1,29 @@
 #include "stm32f10x.h"
-#include "MyI2C.h"
-#include "MySPI.h"
-#include "remote.h"
 #include "gpio.h"
+#include "servo.h"
+#include "motoreducteur.h"
+#include "rtc.h"
+#include "remote.h"
+
+void initImplementation(void);
 
 int main (void)
 {
-	MyGPIO_Struct_TypeDef led = {GPIOA,5,Out_PullUp};	//led
+	//MyGPIO_Struct_TypeDef led = {GPIOA,5,Out_PullUp};	//led
-	MyGPIO_Init(&led);																//test des leds pour ignorer les contraintes liées aux différents ports
+	//MyGPIO_Init(&led);																//test des leds pour ignorer les contraintes liées aux différents ports
-	
+	initImplementation();
+	//MyRTC_GetTime(&sec, &min, &hour, &day, &date, &month, &year);
+ 	while(1){};
+}
+
+void initImplementation(void)
+{
+	MyServo_Init();
+	MyServo_ChangeAngle(179);
 	initRemote();
 	testRemote();
-	
+	MyMotor_Init();
- 	while(1){
+	MyMotor_ChangeSpeed(0);
-	};	
+	MyMotor_ChangeDirection(HORAIRE);
- }
+	MyRTC_Init();
+}

keilproject/voilier.uvoptx

@@ -26,9 +26,9 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>8000000</CLKADS>
+      <CLKADS>12000000</CLKADS>
       <OPTTT>
-        <gFlags>1</gFlags>
+        <gFlags>0</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
         <RunSim>0</RunSim>
         <RunTarget>1</RunTarget>
@@ -79,8 +79,8 @@
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
-        <uSim>1</uSim>
+        <uSim>0</uSim>
-        <uTrg>0</uTrg>
+        <uTrg>1</uTrg>
         <sLdApp>1</sLdApp>
         <sGomain>1</sGomain>
         <sRbreak>1</sRbreak>
@@ -117,101 +117,25 @@
         <pMon>BIN\UL2CM3.DLL</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMRTXEVENTFLAGS</Key>
-          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGDARM</Key>
-          <Name>(1010=1460,461,1836,1018,1)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=1009,499,1430,926,1)(121=1469,437,1890,864,0)(122=875,109,1296,536,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=105,137,504,482,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=879,71,1473,822,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=1014,43,1462,457,1)(161=568,150,1016,564,1)(162=1351,117,1799,531,1)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMDBGFLAGS</Key>
-          <Name>-T0</Name>
-        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
           <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM))</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint>
+      <Breakpoint/>
-        <Bp>
-          <Number>0</Number>
-          <Type>0</Type>
-          <LineNumber>29</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134219444</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\Source\Principale.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\cool_Simule\Source/Principale.c\29</Expression>
-        </Bp>
-        <Bp>
-          <Number>1</Number>
-          <Type>0</Type>
-          <LineNumber>28</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134219442</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\Source\Principale.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\cool_Simule\Source/Principale.c\28</Expression>
-        </Bp>
-        <Bp>
-          <Number>2</Number>
-          <Type>0</Type>
-          <LineNumber>8</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134219308</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\Source\Principale.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\cool_Simule\Source/Principale.c\8</Expression>
-        </Bp>
-      </Breakpoint>
-      <WatchWindow1>
-        <Ww>
-          <count>0</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>voyons</ItemText>
-        </Ww>
-        <Ww>
-          <count>1</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>returnValue</ItemText>
-        </Ww>
-      </WatchWindow1>
       <Tracepoint>
         <THDelay>0</THDelay>
       </Tracepoint>
       <DebugFlag>
         <trace>0</trace>
-        <periodic>1</periodic>
+        <periodic>0</periodic>
-        <aLwin>1</aLwin>
+        <aLwin>0</aLwin>
         <aCover>0</aCover>
         <aSer1>0</aSer1>
         <aSer2>0</aSer2>
         <aPa>0</aPa>
-        <viewmode>1</viewmode>
+        <viewmode>0</viewmode>
         <vrSel>0</vrSel>
         <aSym>0</aSym>
         <aTbox>0</aTbox>
@@ -257,7 +181,7 @@
     <ToolsetNumber>0x4</ToolsetNumber>
     <ToolsetName>ARM-ADS</ToolsetName>
     <TargetOption>
-      <CLKADS>8000000</CLKADS>
+      <CLKADS>12000000</CLKADS>
       <OPTTT>
         <gFlags>1</gFlags>
         <BeepAtEnd>1</BeepAtEnd>
@@ -348,35 +272,10 @@
         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGTARM</Key>
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGUARM</Key>
-          <Name>(105=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U066FFF504955857567155843 -O206 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)</Name>
+          <Name>-U066FFF504955857567155843 -O206 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMRTXEVENTFLAGS</Key>
-          <Name>-L70 -Z18 -C0 -M0 -T1</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGDARM</Key>
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name>
-        </SetRegEntry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>ARMDBGFLAGS</Key>
-          <Name>-T0</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -384,64 +283,19 @@
           <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM))</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint>
+      <Breakpoint/>
-        <Bp>
-          <Number>0</Number>
-          <Type>0</Type>
-          <LineNumber>10</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134219708</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>..\implementation\remote.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\cool_reel\../implementation/remote.c\10</Expression>
-        </Bp>
-        <Bp>
-          <Number>1</Number>
-          <Type>0</Type>
-          <LineNumber>9</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>0</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>0</BreakIfRCount>
-          <Filename>..\implementation\remote.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
-      </Breakpoint>
-      <WatchWindow1>
-        <Ww>
-          <count>0</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>quelquechose</ItemText>
-        </Ww>
-        <Ww>
-          <count>1</count>
-          <WinNumber>1</WinNumber>
-          <ItemText>returnValue</ItemText>
-        </Ww>
-      </WatchWindow1>
       <Tracepoint>
         <THDelay>0</THDelay>
       </Tracepoint>
       <DebugFlag>
         <trace>0</trace>
-        <periodic>1</periodic>
+        <periodic>0</periodic>
-        <aLwin>1</aLwin>
+        <aLwin>0</aLwin>
         <aCover>0</aCover>
         <aSer1>0</aSer1>
         <aSer2>0</aSer2>
         <aPa>0</aPa>
-        <viewmode>1</viewmode>
+        <viewmode>0</viewmode>
         <vrSel>0</vrSel>
         <aSym>0</aSym>
         <aTbox>0</aTbox>
@@ -472,12 +326,6 @@
       <pszMrulep></pszMrulep>
       <pSingCmdsp></pSingCmdsp>
       <pMultCmdsp></pMultCmdsp>
-      <SystemViewers>
-        <Entry>
-          <Name>System Viewer\USART1</Name>
-          <WinId>35905</WinId>
-        </Entry>
-      </SystemViewers>
       <DebugDescription>
         <Enable>1</Enable>
         <EnableFlashSeq>0</EnableFlashSeq>
@@ -506,18 +354,6 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
-    <File>
-      <GroupNumber>1</GroupNumber>
-      <FileNumber>2</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\implementation\remote.c</PathWithFileName>
-      <FilenameWithoutPath>remote.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
   </Group>
 
   <Group>
@@ -528,7 +364,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>3</FileNumber>
+      <FileNumber>2</FileNumber>
       <FileType>4</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -540,21 +376,9 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>4</FileNumber>
+      <FileNumber>3</FileNumber>
       <FileType>1</FileType>
-      <tvExp>1</tvExp>
+      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\driver\adc.c</PathWithFileName>
-      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
-    <File>
-      <GroupNumber>2</GroupNumber>
-      <FileNumber>5</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>1</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>..\driver\gpio.c</PathWithFileName>
@@ -564,7 +388,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>6</FileNumber>
+      <FileNumber>4</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -576,7 +400,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>7</FileNumber>
+      <FileNumber>5</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -586,6 +410,74 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>2</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\driver\adc.c</PathWithFileName>
+      <FilenameWithoutPath>adc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+  </Group>
+
+  <Group>
+    <GroupName>MesImplementations</GroupName>
+    <tvExp>1</tvExp>
+    <tvExpOptDlg>0</tvExpOptDlg>
+    <cbSel>0</cbSel>
+    <RteFlg>0</RteFlg>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>7</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\implementation\servo.c</PathWithFileName>
+      <FilenameWithoutPath>servo.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>8</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\implementation\motoreducteur.c</PathWithFileName>
+      <FilenameWithoutPath>motoreducteur.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>9</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\implementation\rtc.c</PathWithFileName>
+      <FilenameWithoutPath>rtc.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>3</GroupNumber>
+      <FileNumber>10</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\implementation\remote.c</PathWithFileName>
+      <FilenameWithoutPath>remote.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>
@@ -598,7 +490,7 @@
 
   <Group>
     <GroupName>::Device</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>1</RteFlg>

keilproject/voilier.uvprojx

@@ -10,8 +10,7 @@
       <TargetName>Simulé</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pArmCC>5060960::V5.06 update 7 (build 960)::.\ARM_Compiler_5.06u7</pArmCC>
+      <pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
-      <pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARM_Compiler_5.06u7</pCCUsed>
       <uAC6>0</uAC6>
       <TargetOption>
         <TargetCommonOption>
@@ -340,7 +339,7 @@
               <MiscControls></MiscControls>
               <Define></Define>
               <Undefine></Undefine>
-              <IncludePath>.\Include</IncludePath>
+              <IncludePath>.\Include;..\driver;..\implementation</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -389,11 +388,6 @@
               <FileType>1</FileType>
               <FilePath>.\Source\Principale.c</FilePath>
             </File>
-            <File>
-              <FileName>remote.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\implementation\remote.c</FilePath>
-            </File>
           </Files>
         </Group>
         <Group>
@@ -404,11 +398,6 @@
               <FileType>4</FileType>
               <FilePath>..\driver\Lib_Com_Periph_2022.lib</FilePath>
             </File>
-            <File>
-              <FileName>adc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\driver\adc.c</FilePath>
-            </File>
             <File>
               <FileName>gpio.c</FileName>
               <FileType>1</FileType>
@@ -424,6 +413,36 @@
               <FileType>1</FileType>
               <FilePath>..\driver\uart.c</FilePath>
             </File>
+            <File>
+              <FileName>adc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\driver\adc.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>MesImplementations</GroupName>
+          <Files>
+            <File>
+              <FileName>servo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\implementation\servo.c</FilePath>
+            </File>
+            <File>
+              <FileName>motoreducteur.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\implementation\motoreducteur.c</FilePath>
+            </File>
+            <File>
+              <FileName>rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\implementation\rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>remote.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\implementation\remote.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -562,11 +581,11 @@
             <RunIndependent>0</RunIndependent>
             <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
             <Capability>1</Capability>
-            <DriverSelection>-1</DriverSelection>
+            <DriverSelection>4096</DriverSelection>
           </Flash1>
           <bUseTDR>1</bUseTDR>
           <Flash2>BIN\UL2CM3.DLL</Flash2>
-          <Flash3></Flash3>
+          <Flash3>"" ()</Flash3>
           <Flash4></Flash4>
           <pFcarmOut></pFcarmOut>
           <pFcarmGrp></pFcarmGrp>
@@ -816,11 +835,6 @@
               <FileType>1</FileType>
               <FilePath>.\Source\Principale.c</FilePath>
             </File>
-            <File>
-              <FileName>remote.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\implementation\remote.c</FilePath>
-            </File>
           </Files>
         </Group>
         <Group>
@@ -831,11 +845,6 @@
               <FileType>4</FileType>
               <FilePath>..\driver\Lib_Com_Periph_2022.lib</FilePath>
             </File>
-            <File>
-              <FileName>adc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\driver\adc.c</FilePath>
-            </File>
             <File>
               <FileName>gpio.c</FileName>
               <FileType>1</FileType>
@@ -851,6 +860,36 @@
               <FileType>1</FileType>
               <FilePath>..\driver\uart.c</FilePath>
             </File>
+            <File>
+              <FileName>adc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\driver\adc.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>MesImplementations</GroupName>
+          <Files>
+            <File>
+              <FileName>servo.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\implementation\servo.c</FilePath>
+            </File>
+            <File>
+              <FileName>motoreducteur.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\implementation\motoreducteur.c</FilePath>
+            </File>
+            <File>
+              <FileName>rtc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\implementation\rtc.c</FilePath>
+            </File>
+            <File>
+              <FileName>remote.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\implementation\remote.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>