dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #158 from PX4/battery_status_cleanup 

Removed last bogus references to battery voltage from sensor combined topic
This commit is contained in:
px4dev 2013-01-13 15:58:50 -08:00
parent 0fdf962356 5ad8e645f4
commit 532993c281
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/commander/commander.c
View File

@ -1321,7 +1321,7 @@ int commander_thread_main(int argc, char *argv[])
/* Initialize to 0.0V */ /* Initialize to 0.0V */
float battery_voltage = 0.0f; float battery_voltage = 0.0f;
bool battery_voltage_valid = true; bool battery_voltage_valid = false;
bool low_battery_voltage_actions_done = false; bool low_battery_voltage_actions_done = false;
bool critical_battery_voltage_actions_done = false; bool critical_battery_voltage_actions_done = false;
uint8_t low_voltage_counter = 0; uint8_t low_voltage_counter = 0;
@ -1411,9 +1411,6 @@ int commander_thread_main(int argc, char *argv[])
if (new_data) { if (new_data) {
orb_copy(ORB_ID(sensor_combined), sensor_sub, &sensors); orb_copy(ORB_ID(sensor_combined), sensor_sub, &sensors);
} else {
sensors.battery_voltage_valid = false;
} }
orb_check(cmd_sub, &new_data); orb_check(cmd_sub, &new_data);

1
apps/sensors/sensors.cpp
View File

@ -1014,7 +1014,6 @@ Sensors::adc_poll(struct sensor_combined_s &raw)
} }
} }
raw.battery_voltage_counter++;
_last_adc = hrt_absolute_time(); _last_adc = hrt_absolute_time();
break; break;
} }

2
apps/uORB/topics/sensor_combined.h
View File

@ -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 adc_voltage_v[4]; /**< ADC voltages of ADC Chan 10/11/12/13 or -1 */
float mcu_temp_celcius; /**< Internal temperature measurement of MCU */ float mcu_temp_celcius; /**< Internal temperature measurement of MCU */
uint32_t baro_counter; /**< Number of raw baro measurements taken */ 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 */
}; };