aboutsummaryrefslogtreecommitdiff
path: root/src/drivers/px4io/px4io.cpp
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-01-23 07:49:18 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-01-23 07:49:18 +0100
commitba19a1ba15a7dfde5aeafa68b98530e6c6a18436 (patch)
treedf88c4ad8464c59108dcbe79a856f94344f581d8 /src/drivers/px4io/px4io.cpp
parent5bc61c3c57164a7d2d118d3f7399a2a24e7199cd (diff)
parent6c23e2f159b226fec394cca506e55b9b1d77365e (diff)
downloadpx4-firmware-ba19a1ba15a7dfde5aeafa68b98530e6c6a18436.tar.gz
px4-firmware-ba19a1ba15a7dfde5aeafa68b98530e6c6a18436.tar.bz2
px4-firmware-ba19a1ba15a7dfde5aeafa68b98530e6c6a18436.zip
Merge branch 'master' of github.com:PX4/Firmware into rssi
Diffstat (limited to 'src/drivers/px4io/px4io.cpp')
-rw-r--r--src/drivers/px4io/px4io.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp
index 8e080c043..27ee1fb42 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