Merge branch 'master' into beta

This commit is contained in:
Anton Babushkin
2014-01-20 16:48:50 +01:00
3 changed files with 4 additions and 3 deletions

View File

@@ -1546,8 +1546,8 @@ Sensors::task_main()
raw.adc_voltage_v[3] = 0.0f;
memset(&_battery_status, 0, sizeof(_battery_status));
_battery_status.voltage_v = 0.0f;
_battery_status.voltage_filtered_v = 0.0f;
_battery_status.voltage_v = -1.0f;
_battery_status.voltage_filtered_v = -1.0f;
_battery_status.current_a = -1.0f;
_battery_status.discharged_mah = -1.0f;