From 5505a712602b0e0625be4be933d2fc59cc06e6d1 Mon Sep 17 00:00:00 2001 From: EFeru Date: Sun, 5 Jun 2022 14:50:29 +0200 Subject: [PATCH] Minor styling --- Inc/config.h | 12 ++++++------ Src/main.c | 23 +++++++++-------------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/Inc/config.h b/Inc/config.h index 1631003..3b839d2 100644 --- a/Inc/config.h +++ b/Inc/config.h @@ -527,14 +527,14 @@ // #define MULTI_MODE_DRIVE #ifdef MULTI_MODE_DRIVE - #define MULTI_MODE_DRIVE_M1_MAX 175 - #define MULTI_MODE_DRIVE_M1_RATE 175 + #define MULTI_MODE_DRIVE_M1_MAX 175 + #define MULTI_MODE_DRIVE_M1_RATE 175 - #define MULTI_MODE_DRIVE_M2_MAX 500 - #define MULTI_MODE_DRIVE_M2_RATE 300 + #define MULTI_MODE_DRIVE_M2_MAX 500 + #define MULTI_MODE_DRIVE_M2_RATE 300 - #define MULTI_MODE_DRIVE_M3_MAX 1000 - #define MULTI_MODE_DRIVE_M3_RATE 450 + #define MULTI_MODE_DRIVE_M3_MAX 1000 + #define MULTI_MODE_DRIVE_M3_RATE 450 #endif #endif diff --git a/Src/main.c b/Src/main.c index 6b2274e..ccfa2ab 100644 --- a/Src/main.c +++ b/Src/main.c @@ -214,26 +214,21 @@ int main(void) { int16_t board_temp_adcFilt = adc_buffer.temp; #ifdef MULTI_MODE_DRIVE - if(adc_buffer.l_rx2 >= input1[0].min){ + if (adc_buffer.l_rx2 >= input1[0].min) { drive_mode = 0; max_speed = MULTI_MODE_DRIVE_M1_MAX; rate = MULTI_MODE_DRIVE_M1_RATE; - } else if(adc_buffer.l_tx2 >= input2[0].min){ + } else if (adc_buffer.l_tx2 >= input2[0].min) { drive_mode = 2; max_speed = MULTI_MODE_DRIVE_M3_MAX; rate = MULTI_MODE_DRIVE_M3_RATE; - } else{ + } else { drive_mode = 1; max_speed = MULTI_MODE_DRIVE_M2_MAX; rate = MULTI_MODE_DRIVE_M2_RATE; } - printf( - "Drive mode %i selected: max_speed:%i acc_rate:%i \r\n", - drive_mode, - max_speed, - rate - ); + printf("Drive mode %i selected: max_speed:%i acc_rate:%i \r\n", drive_mode, max_speed, rate); #endif // Loop until button is released @@ -311,8 +306,8 @@ int main(void) { #endif // ####### LOW-PASS FILTER ####### - rateLimiter16(input1[inIdx].cmd , rate, &steerRateFixdt); - rateLimiter16(input2[inIdx].cmd , rate, &speedRateFixdt); + rateLimiter16(input1[inIdx].cmd, rate, &steerRateFixdt); + rateLimiter16(input2[inIdx].cmd, rate, &speedRateFixdt); filtLowPass32(steerRateFixdt >> 4, FILTER, &steerFixdt); filtLowPass32(speedRateFixdt >> 4, FILTER, &speedFixdt); steer = (int16_t)(steerFixdt >> 16); // convert fixed-point to integer @@ -323,9 +318,9 @@ int main(void) { if (inIdx == CONTROL_ADC) { // Only use use implementation below if pedals are in use (ADC input) #ifdef MULTI_MODE_DRIVE - if(speed >= max_speed){ - speed = max_speed; - } + if (speed >= max_speed) { + speed = max_speed; + } #endif if (!MultipleTapBrake.b_multipleTap) { // Check driving direction