guldenst/projet_voilier
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed indentation on all files

Browse source
This commit is contained in:
Jasper Güldenstein 2020-11-15 18:21:34 +01:00
parent 3b3b35d537
commit 642a5ebfdc
18 changed files with 459 additions and 484 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
keil_project/MDK-ARM/Project.uvoptx
View file

@ -402,22 +402,6 @@
<Bp> <Bp>
<Number>0</Number> <Number>0</Number>
<Type>0</Type> <Type>0</Type>
<LineNumber>40</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134223706</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>..\Services\RFInput.c</Filename>
<ExecCommand></ExecCommand>
<Expression>\\NUCLEO_F103RB\../Services/RFInput.c\40</Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
<LineNumber>71</LineNumber> <LineNumber>71</LineNumber>
<EnabledFlag>1</EnabledFlag> <EnabledFlag>1</EnabledFlag>
<Address>0</Address> <Address>0</Address>
@ -432,7 +416,7 @@
<Expression></Expression> <Expression></Expression>
</Bp> </Bp>
<Bp> <Bp>
<Number>2</Number> <Number>1</Number>
<Type>0</Type> <Type>0</Type>
<LineNumber>46</LineNumber> <LineNumber>46</LineNumber>
<EnabledFlag>1</EnabledFlag> <EnabledFlag>1</EnabledFlag>
@ -628,7 +612,7 @@
<GroupNumber>2</GroupNumber> <GroupNumber>2</GroupNumber>
<FileNumber>7</FileNumber> <FileNumber>7</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\Services\Accelerometer.c</PathWithFileName> <PathWithFileName>..\Services\Accelerometer.c</PathWithFileName>

1
keil_project/Services/Alimentation.c
View file

@ -32,7 +32,6 @@ void ALIMENTATION_Init(void){
adcReg.ContinuousMode = LL_ADC_REG_CONV_SINGLE; adcReg.ContinuousMode = LL_ADC_REG_CONV_SINGLE;
adcReg.DMATransfer = LL_ADC_REG_DMA_TRANSFER_NONE; adcReg.DMATransfer = LL_ADC_REG_DMA_TRANSFER_NONE;
LL_ADC_REG_Init(ADC1, &adcReg); LL_ADC_REG_Init(ADC1, &adcReg);
LL_ADC_Enable(ADC1); LL_ADC_Enable(ADC1);
} }

3
keil_project/Services/IncrEncoder.c
View file

@ -80,15 +80,12 @@ void INCR_ENCODER_Init(void){
// enable interrupt from exti in NVIC // enable interrupt from exti in NVIC
NVIC_SetPriority(EXTI9_5_IRQn, 12); // prio?? NVIC_SetPriority(EXTI9_5_IRQn, 12); // prio??
NVIC_EnableIRQ(EXTI9_5_IRQn); NVIC_EnableIRQ(EXTI9_5_IRQn);
} }
void EXTI9_5_IRQHandler(void){ void EXTI9_5_IRQHandler(void){
index_passed = 1; index_passed = 1;
// reset counter = encoder position to 0 position // reset counter = encoder position to 0 position
LL_TIM_WriteReg(TIM3,CNT,0); LL_TIM_WriteReg(TIM3,CNT,0);
// clear pending (EXTI necessary ?) // clear pending (EXTI necessary ?)
LL_EXTI_ClearFlag_0_31(LL_EXTI_LINE_5); LL_EXTI_ClearFlag_0_31(LL_EXTI_LINE_5);
NVIC_ClearPendingIRQ(EXTI9_5_IRQn); NVIC_ClearPendingIRQ(EXTI9_5_IRQn);

1
keil_project/Services/RFInput.c
View file

@ -34,7 +34,6 @@ void RF_INPUT_Init(void)
LL_TIM_Init(TIM4, &tim4_init_struct); LL_TIM_Init(TIM4, &tim4_init_struct);
// setup channel 1 to capture period of pwm // setup channel 1 to capture period of pwm
LL_TIM_IC_InitTypeDef tim4_ic_conf; LL_TIM_IC_InitTypeDef tim4_ic_conf;
tim4_ic_conf.ICPolarity= LL_TIM_IC_POLARITY_RISING; tim4_ic_conf.ICPolarity= LL_TIM_IC_POLARITY_RISING;

7
keil_project/Services/RFOutput.c
View file

@ -9,11 +9,9 @@ char RF_OUTPUT_buf[100];
void RF_OUTPUT_Init(void){ void RF_OUTPUT_Init(void){
LL_USART_InitTypeDef My_LL_Usart_Init_Struct;
LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_USART1); LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_USART1);
LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_GPIOA); LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_GPIOA);
LL_GPIO_InitTypeDef tx; LL_GPIO_InitTypeDef tx;
tx.Mode = LL_GPIO_MODE_ALTERNATE; tx.Mode = LL_GPIO_MODE_ALTERNATE;
tx.OutputType = LL_GPIO_OUTPUT_PUSHPULL; tx.OutputType = LL_GPIO_OUTPUT_PUSHPULL;
@ -30,6 +28,7 @@ void RF_OUTPUT_Init(void){
LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_GPIOA); LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_GPIOA);
LL_USART_InitTypeDef My_LL_Usart_Init_Struct;
My_LL_Usart_Init_Struct.BaudRate = 9600; My_LL_Usart_Init_Struct.BaudRate = 9600;
My_LL_Usart_Init_Struct.DataWidth = LL_USART_DATAWIDTH_8B ; My_LL_Usart_Init_Struct.DataWidth = LL_USART_DATAWIDTH_8B ;
My_LL_Usart_Init_Struct.HardwareFlowControl = LL_USART_HWCONTROL_NONE; My_LL_Usart_Init_Struct.HardwareFlowControl = LL_USART_HWCONTROL_NONE;
@ -40,11 +39,9 @@ void RF_OUTPUT_Init(void){
LL_USART_Init(USART1,&My_LL_Usart_Init_Struct); LL_USART_Init(USART1,&My_LL_Usart_Init_Struct);
LL_USART_Enable(USART1); LL_USART_Enable(USART1);
} }
void RF_OUTPUT_SendBytes(char* buf, int len){ void RF_OUTPUT_SendBytes(char* buf, int len){
LL_GPIO_SetOutputPin(GPIOA,LL_GPIO_PIN_11); LL_GPIO_SetOutputPin(GPIOA,LL_GPIO_PIN_11);
for(int i = 0; i < len; i++){ for(int i = 0; i < len; i++){
LL_USART_TransmitData8(USART1, buf[i]); LL_USART_TransmitData8(USART1, buf[i]);

1
keil_project/Services/Servo.c
View file

@ -46,7 +46,6 @@ void SERVO_Init(void){
LL_TIM_EnableCounter(TIM1); LL_TIM_EnableCounter(TIM1);
} }
void SERVO_SetAngle(int angle){ void SERVO_SetAngle(int angle){