aboutsummaryrefslogtreecommitdiff
path: root/apps/commander/commander.c
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-01-12 00:38:49 +0100
committerLorenz Meier <lm@inf.ethz.ch>2013-01-12 00:38:49 +0100
commitdad7f9f436e38fa1cae185156bb13c7920ae29da (patch)
tree34224ee6c5a323233f2611b17f3652749ea38cea /apps/commander/commander.c
parent2f94a7a2b71b569361bf4772638fc2c6aa7faef0 (diff)
downloadpx4-firmware-dad7f9f436e38fa1cae185156bb13c7920ae29da.tar.gz
px4-firmware-dad7f9f436e38fa1cae185156bb13c7920ae29da.tar.bz2
px4-firmware-dad7f9f436e38fa1cae185156bb13c7920ae29da.zip
Selected adjustments / fixes to make old apps compatible with new-style ADC driver
Diffstat (limited to 'apps/commander/commander.c')
-rw-r--r--apps/commander/commander.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/commander/commander.c b/apps/commander/commander.c
index c05948402..86f5ac106 100644
--- a/apps/commander/commander.c
+++ b/apps/commander/commander.c
@@ -1319,8 +1319,8 @@ int commander_thread_main(int argc, char *argv[])
uint16_t counter = 0;
uint8_t flight_env;
- /* Initialize to 3.0V to make sure the low-pass loads below valid threshold */
- float battery_voltage = 12.0f;
+ /* Initialize to 0.0V */
+ float battery_voltage = 0.0f;
bool battery_voltage_valid = true;
bool low_battery_voltage_actions_done = false;
bool critical_battery_voltage_actions_done = false;
@@ -1473,8 +1473,8 @@ int commander_thread_main(int argc, char *argv[])
last_local_position_time = local_position.timestamp;
}
+ /* update battery status */
orb_check(battery_sub, &new_data);
-
if (new_data) {
orb_copy(ORB_ID(battery_status), battery_sub, &battery);
battery_voltage = battery.voltage_v;