From a69393b191ce41cbd4945d67c69eac586dc79c08 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Fri, 6 May 2016 11:11:29 +0200 Subject: [PATCH] commander: fix shadowing errors --- src/modules/commander/commander.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index 0c645b5e22..11daf70d1e 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -256,7 +256,7 @@ bool handle_command(struct vehicle_status_s *status, const struct safety_s *safe int commander_thread_main(int argc, char *argv[]); void control_status_leds(vehicle_status_s *status_local, const actuator_armed_s *actuator_armed, bool changed, - battery_status_s *battery, const cpuload_s *cpuload_local); + battery_status_s *battery_local, const cpuload_s *cpuload_local); void get_circuit_breaker_params(); @@ -2873,7 +2873,7 @@ check_valid(hrt_abstime timestamp, hrt_abstime timeout, bool valid_in, bool *val } void -control_status_leds(vehicle_status_s *status_local, const actuator_armed_s *actuator_armed, bool changed, battery_status_s *battery, const cpuload_s *cpuload_local) +control_status_leds(vehicle_status_s *status_local, const actuator_armed_s *actuator_armed, bool changed, battery_status_s *battery_local, const cpuload_s *cpuload_local) { /* driving rgbled */ if (changed) { @@ -2906,9 +2906,9 @@ control_status_leds(vehicle_status_s *status_local, const actuator_armed_s *actu /* set color */ if (status.failsafe) { rgbled_set_color(RGBLED_COLOR_PURPLE); - } else if (battery_status->warning == battery_status_s::BATTERY_WARNING_LOW) { + } else if (battery_local->warning == battery_status_s::BATTERY_WARNING_LOW) { rgbled_set_color(RGBLED_COLOR_AMBER); - } else if (battery_status->warning == battery_status_s::BATTERY_WARNING_CRITICAL) { + } else if (battery_local->warning == battery_status_s::BATTERY_WARNING_CRITICAL) { rgbled_set_color(RGBLED_COLOR_RED); } else { if (status_flags.condition_home_position_valid && status_flags.condition_global_position_valid) {