diff --git a/driver/uart.c b/driver/uart.c index ff29c1a..051c3fa 100644 --- a/driver/uart.c +++ b/driver/uart.c @@ -161,4 +161,3 @@ void USART3_IRQHandler(void) UART1.Wstop = stop1b; // nombre bit de stop (stop1b, stop2b) MyUART_Init(&UART1); // initialisation */ - diff --git a/implementation/motoreducteur.c b/implementation/motoreducteur.c index b081215..bd443f7 100644 --- a/implementation/motoreducteur.c +++ b/implementation/motoreducteur.c @@ -2,7 +2,7 @@ #include "timer.h" #include "gpio.h" -void MyMotor_Init() +void MyMotor_Init(void) { MyTimer_Struct_Typedef Timer; MyGPIO_Struct_TypeDef Pin_Direction; diff --git a/implementation/motoreducteur.h b/implementation/motoreducteur.h index a7c9db0..1e71aa5 100644 --- a/implementation/motoreducteur.h +++ b/implementation/motoreducteur.h @@ -5,7 +5,7 @@ #define HORAIRE 0x1 #define ANTIHOR 0x0 -void MyMotor_Init(); +void MyMotor_Init(void); void MyMotor_ChangeSpeed(unsigned int DC); void MyMotor_ChangeDirection(uint8_t Sens); diff --git a/implementation/rtc.c b/implementation/rtc.c index 86e15b4..44e25a5 100644 --- a/implementation/rtc.c +++ b/implementation/rtc.c @@ -6,7 +6,7 @@ void plantage_i2C(void) { void (*IT_I2C_Err) (void) = plantage_i2C; -void MyRTC_Init() +void MyRTC_Init(void) { MyI2C_Init(I2C1, 15, IT_I2C_Err); } @@ -34,4 +34,4 @@ void MyRTC_GetTime(int* sec, int* min, int* hour, int* day, int* date, int* mont *month = ((regCopy >> 4) & 0x01) * 10 + (regCopy & 0x0F); MyI2C_GetString(I2C1, 0x06, &data); *year = ((regCopy >> 4) & 0xF0) * 10 + (regCopy & 0x0F) + 2000; -} \ No newline at end of file +} diff --git a/implementation/rtc.h b/implementation/rtc.h index caaa6ba..dde573c 100644 --- a/implementation/rtc.h +++ b/implementation/rtc.h @@ -1,9 +1,9 @@ -#ifndef GPIODRIVER_H -#define GPIODRIVER_H +#ifndef MYRTC_H +#define MYRTC_H #include "stm32f10x.h" #include "MyI2C.h" -void MyRTC_Init(); +void MyRTC_Init(void); void MyRTC_GetTime(int* sec, int* min, int* hour, int* day, int* date, int* month, int* year); #endif diff --git a/implementation/servo.c b/implementation/servo.c index cf41537..b88ee3a 100644 --- a/implementation/servo.c +++ b/implementation/servo.c @@ -1,7 +1,7 @@ #include "servo.h" #include "timer.h" -void MyServo_Init() +void MyServo_Init(void) { MyTimer_Struct_Typedef Timer; diff --git a/implementation/servo.h b/implementation/servo.h index bc9f4f7..4f1b982 100644 --- a/implementation/servo.h +++ b/implementation/servo.h @@ -7,7 +7,7 @@ 0 correspond à 90° */ -void MyServo_Init(); +void MyServo_Init(void); void MyServo_ChangeAngle(uint8_t Angle); #endif diff --git a/keilproject/Source/Principale.c b/keilproject/Source/Principale.c index 1806698..4737fad 100644 --- a/keilproject/Source/Principale.c +++ b/keilproject/Source/Principale.c @@ -1,38 +1,25 @@ #include "stm32f10x.h" -<<<<<<< HEAD +#include "gpio.h" #include "servo.h" #include "motoreducteur.h" #include "rtc.h" +#include "remote.h" int main (void) { MyServo_Init(); MyServo_ChangeAngle(179); + 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 //MyMotor_Init(); //MyMotor_ChangeSpeed(2000); //MyMotor_ChangeDirection(HORAIRE); - - MyRTC_Init(); - MyRTC_GetTime(); - - while(1){}; -} -======= -#include "MyI2C.h" -#include "MySPI.h" -#include "remote.h" -#include "gpio.h" - -int main (void) -{ - 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 - initRemote(); testRemote(); - while(1){ - }; - } ->>>>>>> origin/yohan + MyRTC_Init(); +// MyRTC_GetTime(); + + while(1){}; +} diff --git a/keilproject/voilier.uvoptx b/keilproject/voilier.uvoptx index 483ef5b..a1e9b69 100644 --- a/keilproject/voilier.uvoptx +++ b/keilproject/voilier.uvoptx @@ -26,305 +26,9 @@ 0x4 ARM-ADS - 8000000 + 12000000 - 1 - 1 - 0 - 1 - 0 - - - 1 - 65535 - 0 - 0 - 0 - - - 79 - 66 - 8 - .\Listings\ - - - 1 - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 0 - 0 - 0 - 0 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 0 - - - 1 - 0 - 0 - - 18 - - 1 - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 1 - 1 - 1 - 1 - 0 - 0 - 1 - 0 - 0 - 0 - - - - - - - - - - - BIN\UL2CM3.DLL - - - - 0 - ARMRTXEVENTFLAGS - -L70 -Z18 -C0 -M0 -T1 - - - 0 - DLGDARM - (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) - - - 0 - ARMDBGFLAGS - -T0 - - - 0 - UL2CM3 - UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)) - - - - - 0 - 0 -<<<<<<< HEAD - 13 - 1 -
0
-======= - 29 - 1 -
134219444
->>>>>>> origin/yohan - 0 - 0 - 0 - 0 - 0 - 0 - .\Source\Principale.c - -<<<<<<< HEAD - -======= - \\cool_Simule\Source/Principale.c\29 ->>>>>>> origin/yohan - - - 1 - 0 -<<<<<<< HEAD - 12 -======= - 28 ->>>>>>> origin/yohan - 1 -
134219442
- 0 - 0 - 0 - 0 - 0 - 1 - .\Source\Principale.c - - \\cool_Simule\Source/Principale.c\28 - - - 2 - 0 -<<<<<<< HEAD - 15 - 1 -
134218740
- 0 - 0 - 0 - 0 - 0 - 1 - .\Source\Principale.c - - \\cool_Simule\Source/Principale.c\15 - - - 3 - 0 - 19 - 1 -
0
- 0 - 0 - 0 - 0 - 0 - 0 - .\Source\Principale.c - - - - - 4 - 0 - 7 - 1 -
0
- 0 - 0 - 0 - 0 - 0 - 0 - .\Source\Principale.c - - - - - 5 - 0 -======= ->>>>>>> origin/yohan - 8 - 1 -
134219308
- 0 - 0 - 0 - 0 - 0 - 1 - .\Source\Principale.c - - \\cool_Simule\Source/Principale.c\8 - - - - - 0 - 1 - voyons - - - 1 - 1 - returnValue - - - - 0 - - - 0 - 1 - 1 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - - 0 - 0 - 0 - - - - - - - - - - 1 - 1 - 0 - 2 - 10000000 - - - - - - Réel - 0x4 - ARM-ADS - - 8000000 - - 1 + 0 1 0 1 @@ -399,7 +103,7 @@ 1 0 0 - 6 + 0 @@ -410,155 +114,28 @@ - STLink\ST-LINKIII-KEIL_SWO.dll + BIN\UL2CM3.DLL - - 0 - DLGTARM - (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0) - - - 0 - DLGUARM - (105=-1,-1,-1,-1,0) - - - 0 - ST-LINKIII-KEIL_SWO - -U066AFF504955857567212155 -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 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM) - - - 0 - ARMRTXEVENTFLAGS - -L70 -Z18 -C0 -M0 -T1 - - - 0 - DLGDARM - (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0) - - - 0 - ARMDBGFLAGS - -T0 - 0 UL2CM3 UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)) - - - 0 - 0 -<<<<<<< HEAD - 24 - 1 -
134219864
-======= - 10 - 1 -
134219708
->>>>>>> origin/yohan - 0 - 0 - 0 - 0 - 0 - 1 -<<<<<<< HEAD - C:\Users\alixc\Desktop\Scolarité\INSA\Cours\Microcontroleur\voilier-team-1\implementation\rtc.c - - \\cool_reel\../implementation/rtc.c\24 -======= - ..\implementation\remote.c - - \\cool_reel\../implementation/remote.c\10 ->>>>>>> origin/yohan - - - 1 - 0 -<<<<<<< HEAD - 25 - 1 -
134219874
- 0 - 0 - 0 - 0 - 0 - 1 - C:\Users\alixc\Desktop\Scolarité\INSA\Cours\Microcontroleur\voilier-team-1\implementation\rtc.c - - \\cool_reel\../implementation/rtc.c\25 - - - 2 - 0 - 16 - 1 -
134221212
- 0 - 0 - 0 - 0 - 0 - 1 - C:\Users\alixc\Desktop\Scolarité\INSA\Cours\Microcontroleur\voilier-team-1\keilproject\Source\Principale.c - - \\cool_reel\Source/Principale.c\16 - - - 3 - 0 - 23 -======= - 9 ->>>>>>> origin/yohan - 1 -
0
- 0 - 0 - 0 - 0 - 0 - 0 -<<<<<<< HEAD - ..\implementation\rtc.c -======= - ..\implementation\remote.c ->>>>>>> origin/yohan - - - - - - - 0 - 1 - quelquechose - - - 1 - 1 - returnValue - - + 0 0 - 1 - 1 + 0 + 0 0 0 0 0 - 1 + 0 0 0 0 @@ -589,15 +166,9 @@ - - - System Viewer\USART1 - 35905 - - 1 - 0 + 1 0 2 10000000 @@ -605,6 +176,147 @@ + + Réel + 0x4 + ARM-ADS + + 12000000 + + 0 + 1 + 1 + 0 + 0 + + + 1 + 65535 + 0 + 0 + 0 + + + 79 + 66 + 8 + .\Listings\ + + + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + + + 0 + 0 + 0 + + 18 + + 1 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + -1 + + + + + + + + + + + + + + + 0 + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + 0 + 0 + 0 + + + + + + + + + + + MesSources 1 @@ -623,18 +335,6 @@ 0 0 - - 1 - 2 - 1 - 0 - 0 - 0 - ..\implementation\remote.c - remote.c - 0 - 0 - @@ -645,7 +345,7 @@ 0 2 - 3 + 2 4 0 0 @@ -657,27 +357,9 @@ 2 -<<<<<<< HEAD 3 1 - 0 -======= - 4 - 1 1 - 0 - 0 - ..\driver\adc.c - adc.c - 0 - 0 - - - 2 - 5 - 1 - 1 ->>>>>>> origin/yohan 0 0 ..\driver\gpio.c @@ -687,11 +369,7 @@ 2 -<<<<<<< HEAD 4 -======= - 6 ->>>>>>> origin/yohan 1 0 0 @@ -703,11 +381,7 @@ 2 -<<<<<<< HEAD 5 -======= - 7 ->>>>>>> origin/yohan 1 0 0 @@ -717,7 +391,6 @@ 0 0 -<<<<<<< HEAD 2 6 @@ -766,7 +439,7 @@ 3 9 1 - 0 + 1 0 0 ..\implementation\rtc.c @@ -774,8 +447,18 @@ 0 0 -======= ->>>>>>> origin/yohan + + 3 + 10 + 1 + 0 + 0 + 0 + ..\implementation\remote.c + remote.c + 0 + 0 + diff --git a/keilproject/voilier.uvprojx b/keilproject/voilier.uvprojx index fdc3f2a..5c95e4a 100644 --- a/keilproject/voilier.uvprojx +++ b/keilproject/voilier.uvprojx @@ -438,6 +438,11 @@ 1 ..\implementation\rtc.c + + remote.c + 1 + ..\implementation\remote.c + @@ -880,6 +885,11 @@ 1 ..\implementation\rtc.c + + remote.c + 1 + ..\implementation\remote.c +