Skip to content

Commit f03fa96

Browse files
format
1 parent af25911 commit f03fa96

File tree

1 file changed

+25
-24
lines changed

1 file changed

+25
-24
lines changed

Core/Src/pedals.c

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,12 @@ void send_pedal_data(void *arg)
287287
pedal_data_t *pedal_vals = (pedal_data_t *)arg;
288288

289289
can_msg_t pedals_volts_msg = { .id = CANID_PEDALS_VOLTS_MSG,
290-
.len = 8,
291-
.data = { 0 } };
292-
293-
can_msg_t pedals_norm_msg = { .id = CAN_ID_PEDALS_NORM_MSG,
294-
.len = 4,
295-
.data = { 0 }};
290+
.len = 8,
291+
.data = { 0 } };
292+
293+
can_msg_t pedals_norm_msg = { .id = CAN_ID_PEDALS_NORM_MSG,
294+
.len = 4,
295+
.data = { 0 } };
296296

297297
struct __attribute__((__packed__)) {
298298
uint16_t accel_1;
@@ -301,31 +301,32 @@ void send_pedal_data(void *arg)
301301
uint16_t brake_2;
302302
} pedal_volts_data;
303303

304-
struct __attribute((__packed__))
305-
{
304+
struct __attribute((__packed__)) {
306305
uint16_t accel_norm;
307306
uint16_t brake_norm;
308307
} pedal_norm_data;
309308

310-
pedal_volts_data.accel_1 =
311-
(uint16_t)(pedal_vals->accel1_volts * 100);
312-
pedal_volts_data.accel_2 =
313-
(uint16_t)(pedal_vals->accel2_volts * 100);
314-
pedal_volts_data.brake_1 =
315-
(uint16_t)(pedal_vals->brake1_volts * 100);
316-
pedal_volts_data.brake_2 =
317-
(uint16_t)(pedal_vals->brake2_volts * 100);
309+
pedal_volts_data.accel_1 = (uint16_t)(pedal_vals->accel1_volts * 100);
310+
pedal_volts_data.accel_2 = (uint16_t)(pedal_vals->accel2_volts * 100);
311+
pedal_volts_data.brake_1 = (uint16_t)(pedal_vals->brake1_volts * 100);
312+
pedal_volts_data.brake_2 = (uint16_t)(pedal_vals->brake2_volts * 100);
318313

319-
endian_swap(&pedal_volts_data.accel_1, sizeof(pedal_volts_data.accel_1));
320-
endian_swap(&pedal_volts_data.accel_2, sizeof(pedal_volts_data.accel_2));
321-
endian_swap(&pedal_volts_data.brake_1, sizeof(pedal_volts_data.brake_1));
322-
endian_swap(&pedal_volts_data.brake_2, sizeof(pedal_volts_data.brake_2));
314+
endian_swap(&pedal_volts_data.accel_1,
315+
sizeof(pedal_volts_data.accel_1));
316+
endian_swap(&pedal_volts_data.accel_2,
317+
sizeof(pedal_volts_data.accel_2));
318+
endian_swap(&pedal_volts_data.brake_1,
319+
sizeof(pedal_volts_data.brake_1));
320+
endian_swap(&pedal_volts_data.brake_2,
321+
sizeof(pedal_volts_data.brake_2));
323322

324323
pedal_norm_data.accel_norm = (uint16_t)(pedal_vals->accel_norm * 100);
325324
pedal_norm_data.brake_norm = (uint16_t)(pedal_vals->brake_norm * 100);
326325

327-
endian_swap(&pedal_norm_data.accel_norm, sizeof(pedal_norm_data.accel_norm));
328-
endian_swap(&pedal_norm_data.brake_norm, sizeof(pedal_norm_data.brake_norm));
326+
endian_swap(&pedal_norm_data.accel_norm,
327+
sizeof(pedal_norm_data.accel_norm));
328+
endian_swap(&pedal_norm_data.brake_norm,
329+
sizeof(pedal_norm_data.brake_norm));
329330

330331
memcpy(pedals_volts_msg.data, &pedal_volts_data, pedals_volts_msg.len);
331332
queue_can_msg(pedals_volts_msg);
@@ -599,8 +600,8 @@ void vProcessPedals(void *pv_params)
599600
pedal_data_t pedal_data;
600601

601602
uint32_t adc_data[4];
602-
osTimerId_t send_pedal_data_timer =
603-
osTimerNew(&send_pedal_data, osTimerPeriodic, &pedal_data, NULL);
603+
osTimerId_t send_pedal_data_timer = osTimerNew(
604+
&send_pedal_data, osTimerPeriodic, &pedal_data, NULL);
604605

605606
/* Send CAN messages with raw pedal readings, we do not care if it fails*/
606607
osTimerStart(send_pedal_data_timer, 100);

0 commit comments

Comments
 (0)