diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-14 00:42:20 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-14 00:42:20 +0100 |
| commit | 5ad8e645f40a4e6dabb810e3f2cca2603c989cda (patch) | |
| tree | 56c7431e3750bb370e8ee0e51787a0fa6f552f29 /apps | |
| parent | 0fdf9623561225940189ce4f419b4347f29e11a1 (diff) | |
| download | px4-firmware-5ad8e645f40a4e6dabb810e3f2cca2603c989cda.tar.gz px4-firmware-5ad8e645f40a4e6dabb810e3f2cca2603c989cda.tar.bz2 px4-firmware-5ad8e645f40a4e6dabb810e3f2cca2603c989cda.zip | |
Removed last bogus references to battery voltage from sensor combined topic
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/commander/commander.c | 5 | ||||
| -rw-r--r-- | apps/sensors/sensors.cpp | 1 | ||||
| -rw-r--r-- | apps/uORB/topics/sensor_combined.h | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/apps/commander/commander.c b/apps/commander/commander.c index 86f5ac106..f3568ee8d 100644 --- a/apps/commander/commander.c +++ b/apps/commander/commander.c @@ -1321,7 +1321,7 @@ int commander_thread_main(int argc, char *argv[]) /* Initialize to 0.0V */ float battery_voltage = 0.0f; - bool battery_voltage_valid = true; + bool battery_voltage_valid = false; bool low_battery_voltage_actions_done = false; bool critical_battery_voltage_actions_done = false; uint8_t low_voltage_counter = 0; @@ -1411,9 +1411,6 @@ int commander_thread_main(int argc, char *argv[]) if (new_data) { orb_copy(ORB_ID(sensor_combined), sensor_sub, &sensors); - - } else { - sensors.battery_voltage_valid = false; } orb_check(cmd_sub, &new_data); diff --git a/apps/sensors/sensors.cpp b/apps/sensors/sensors.cpp index c0f802e67..2697cf3d9 100644 --- a/apps/sensors/sensors.cpp +++ b/apps/sensors/sensors.cpp @@ -1014,7 +1014,6 @@ Sensors::adc_poll(struct sensor_combined_s &raw) } } - raw.battery_voltage_counter++; _last_adc = hrt_absolute_time(); break; } diff --git a/apps/uORB/topics/sensor_combined.h b/apps/uORB/topics/sensor_combined.h index 1d25af35a..961ee8b4a 100644 --- a/apps/uORB/topics/sensor_combined.h +++ b/apps/uORB/topics/sensor_combined.h @@ -102,8 +102,6 @@ struct sensor_combined_s { float adc_voltage_v[4]; /**< ADC voltages of ADC Chan 10/11/12/13 or -1 */ float mcu_temp_celcius; /**< Internal temperature measurement of MCU */ uint32_t baro_counter; /**< Number of raw baro measurements taken */ - uint32_t battery_voltage_counter; /**< Number of voltage measurements taken */ - bool battery_voltage_valid; /**< True if battery voltage can be measured */ }; |