diff options
| author | Lorenz Meier <lm@qgroundcontrol.org> | 2014-10-31 10:53:15 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@qgroundcontrol.org> | 2014-10-31 10:53:15 +0100 |
| commit | ddf57813f4a571a274c9080bc9ef04c86dd70e63 (patch) | |
| tree | 67a6e97b1dbeba069bd7e55165e4edfb876e4302 | |
| parent | 9f3c3529593033d9acc94fb978a2aa6e34a3d1d9 (diff) | |
| parent | c7a3a0db5230d1506c81c5f15254002b64cddf32 (diff) | |
| download | px4-firmware-ddf57813f4a571a274c9080bc9ef04c86dd70e63.tar.gz px4-firmware-ddf57813f4a571a274c9080bc9ef04c86dd70e63.tar.bz2 px4-firmware-ddf57813f4a571a274c9080bc9ef04c86dd70e63.zip | |
Merge pull request #1416 from sjwilks/calibrate_usb
Don't go into an error state if we are temporarily powering via USB on the bench
| -rw-r--r-- | src/modules/commander/commander.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index b72ebcc50..46caddd46 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -1407,8 +1407,8 @@ int commander_thread_main(int argc, char *argv[]) last_idle_time = system_load.tasks[0].total_runtime; /* check if board is connected via USB */ - //struct stat statbuf; - //on_usb_power = (stat("/dev/ttyACM0", &statbuf) == 0); + struct stat statbuf; + on_usb_power = (stat("/dev/ttyACM0", &statbuf) == 0); } /* if battery voltage is getting lower, warn using buzzer, etc. */ @@ -1418,7 +1418,7 @@ int commander_thread_main(int argc, char *argv[]) status.battery_warning = VEHICLE_BATTERY_WARNING_LOW; status_changed = true; - } else if (status.condition_battery_voltage_valid && status.battery_remaining < 0.09f + } else if (!on_usb_power && status.condition_battery_voltage_valid && status.battery_remaining < 0.09f && !critical_battery_voltage_actions_done && low_battery_voltage_actions_done) { /* critical battery voltage, this is rather an emergency, change state machine */ critical_battery_voltage_actions_done = true; |