aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-01-20 13:10:37 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-01-20 13:10:37 +0100
commit1e6d83fc9ea1c33b6a76623cc86a7889dc4f6c49 (patch)
tree2aa14b0f1f4259be37435037b2436e44479415ed
parentdd9df7b1b0974a9838d3e21842a0d90f3eff54d9 (diff)
downloadpx4-firmware-1e6d83fc9ea1c33b6a76623cc86a7889dc4f6c49.tar.gz
px4-firmware-1e6d83fc9ea1c33b6a76623cc86a7889dc4f6c49.tar.bz2
px4-firmware-1e6d83fc9ea1c33b6a76623cc86a7889dc4f6c49.zip
Hotfix for IO battery voltage
-rw-r--r--src/drivers/px4io/px4io.cpp1
-rw-r--r--src/modules/sensors/sensors.cpp4
2 files changed, 3 insertions, 2 deletions
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 ff6c5882e..9903a90a0 100644
--- a/src/modules/sensors/sensors.cpp
+++ b/src/modules/sensors/sensors.cpp
@@ -1548,8 +1548,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;