Skip to content

Commit bc43d1a

Browse files
committed
Merge branch 'haoran_flowchart' of https://github.com/CMU-Robotics-Club/RoboBuggy into haoran_flowchart
2 parents 792d032 + b3b61be commit bc43d1a

File tree

5 files changed

+3431
-1799
lines changed

5 files changed

+3431
-1799
lines changed

Electrical/Transistor/code/radio_buggy_mega/main.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,12 @@ RadioReceiver g_auton_rx;
147147
StatusLights lights_rc(STATUS_LIGHT_PINN_GREEN,
148148
&STATUS_LIGHT_PORT_GREEN,
149149
&STATUS_LIGHT_DDR_GREEN);
150-
StatusLights lights_auton(STATUS_LIGHT_PINN_RED,
151-
&STATUS_LIGHT_PORT_RED,
152-
&STATUS_LIGHT_DDR_RED);
153-
StatusLights lights_battery(STATUS_LIGHT_PINN_BLUE,
154-
&STATUS_LIGHT_PORT_BLUE,
155-
&STATUS_LIGHT_DDR_BLUE);
150+
StatusLights lights_auton(STATUS_LIGHT_PINN_BLUE,
151+
&STATUS_LIGHT_PORT_BLUE,
152+
&STATUS_LIGHT_DDR_BLUE);
153+
StatusLights lights_battery(STATUS_LIGHT_PINN_RED,
154+
&STATUS_LIGHT_PORT_RED,
155+
&STATUS_LIGHT_DDR_RED);
156156
Rotary g_encoder_distance;
157157
Quadrature g_encoder_steering;
158158

@@ -431,6 +431,7 @@ int main(void) {
431431
// prepare uart2 (because servo conflicts with uart1) for debug output
432432
uart2_init(UART_BAUD_SELECT(BAUD, F_CPU));
433433
uart2_fdevopen(&g_uart_debug);
434+
434435
// map stdio for printf
435436
stdin = stdout = stderr = &g_uart_debug;
436437

0 commit comments

Comments
 (0)