diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-01-20 16:48:50 +0100 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-01-20 16:48:50 +0100 |
| commit | a3dbd817dc2de17078f69768861e9474e5f024ce (patch) | |
| tree | e6b1f1574b5ebebb3243aab78190138b0f30c957 | |
| parent | 08099818003d0e5861dd312ff44674a61c0e6bc3 (diff) | |
| parent | c58b68d3773e4c2ad38b052d36a132439e32d59b (diff) | |
| download | px4-firmware-a3dbd817dc2de17078f69768861e9474e5f024ce.tar.gz px4-firmware-a3dbd817dc2de17078f69768861e9474e5f024ce.tar.bz2 px4-firmware-a3dbd817dc2de17078f69768861e9474e5f024ce.zip | |
Merge branch 'master' into beta
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.logging | 2 | ||||
| -rw-r--r-- | src/drivers/px4io/px4io.cpp | 1 | ||||
| -rw-r--r-- | src/modules/sensors/sensors.cpp | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.logging b/ROMFS/px4fmu_common/init.d/rc.logging index 13c3c80fb..dcf5bbced 100644 --- a/ROMFS/px4fmu_common/init.d/rc.logging +++ b/ROMFS/px4fmu_common/init.d/rc.logging @@ -1,6 +1,6 @@ #!nsh # -# Initialise logging services. +# Initialize logging services. # if [ -d /fs/microsd ] diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index dede5976d..c8f77a611 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -1302,6 +1302,7 @@ PX4IO::io_handle_battery(uint16_t vbatt, uint16_t ibatt) /* voltage is scaled to mV */ battery_status.voltage_v = vbatt / 1000.0f; + battery_status.voltage_filtered_v = vbatt / 1000.0f; /* ibatt contains the raw ADC count, as 12 bit ADC diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp index 57f145e6c..5e8c5edbc 100644 --- a/src/modules/sensors/sensors.cpp +++ b/src/modules/sensors/sensors.cpp @@ -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; |