aboutsummaryrefslogtreecommitdiff
path: root/apps/sensors/sensors.cpp
diff options
context:
space:
mode:
authorjgoppert <james.goppert@gmail.com>2013-01-14 11:58:21 -0500
committerjgoppert <james.goppert@gmail.com>2013-01-14 11:58:21 -0500
commit940d43cb9c1bf9eca8220633a8ddb01dc0316b6d (patch)
treececc515e8d17a02ab704686b9225fa6af19f89da /apps/sensors/sensors.cpp
parentf2d2aafb8d340bdad7e75e9df27b8fd002da1344 (diff)
parent9faf348cf5948c508a4a9b85e2ce5f6e51d48a2f (diff)
downloadpx4-firmware-940d43cb9c1bf9eca8220633a8ddb01dc0316b6d.tar.gz
px4-firmware-940d43cb9c1bf9eca8220633a8ddb01dc0316b6d.tar.bz2
px4-firmware-940d43cb9c1bf9eca8220633a8ddb01dc0316b6d.zip
Merge branch 'master' of git://github.com/PX4/Firmware into fault_detection
Diffstat (limited to 'apps/sensors/sensors.cpp')
-rw-r--r--apps/sensors/sensors.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/sensors/sensors.cpp b/apps/sensors/sensors.cpp
index c0f802e67..2697cf3d9 100644
--- a/apps/sensors/sensors.cpp
+++ b/apps/sensors/sensors.cpp
@@ -1014,7 +1014,6 @@ Sensors::adc_poll(struct sensor_combined_s &raw)
}
}
- raw.battery_voltage_counter++;
_last_adc = hrt_absolute_time();
break;
}