aboutsummaryrefslogtreecommitdiff
path: root/apps/sensors/sensors.cpp
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2013-03-04 14:21:49 +0100
committerThomas Gubler <thomasgubler@gmail.com>2013-03-04 14:21:49 +0100
commitc149361f1535eccb8f077052fb67c5cd56db7169 (patch)
treec8f67a15ee5abbf37cdd240a2a01854c754c5d86 /apps/sensors/sensors.cpp
parente27481826c72d71c28740b3ecfa3ea9471b8687d (diff)
downloadpx4-firmware-c149361f1535eccb8f077052fb67c5cd56db7169.tar.gz
px4-firmware-c149361f1535eccb8f077052fb67c5cd56db7169.tar.bz2
px4-firmware-c149361f1535eccb8f077052fb67c5cd56db7169.zip
scale the saved adc values to get voltage
Diffstat (limited to 'apps/sensors/sensors.cpp')
-rw-r--r--apps/sensors/sensors.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/sensors/sensors.cpp b/apps/sensors/sensors.cpp
index b5badec71..becd32f7d 100644
--- a/apps/sensors/sensors.cpp
+++ b/apps/sensors/sensors.cpp
@@ -998,16 +998,16 @@ Sensors::adc_poll(struct sensor_combined_s &raw)
/* read all channels available */
int ret = read(_fd_adc, &buf_adc, sizeof(buf_adc));
- /* look for battery channel */
-
for (unsigned i = 0; i < sizeof(buf_adc) / sizeof(buf_adc[0]); i++) {
if (ret >= (int)sizeof(buf_adc[0])) {
+ /* Save raw voltage values */
if (i < (sizeof(raw.adc_voltage_v)) / sizeof(raw.adc_voltage_v[0])) {
- raw.adc_voltage_v[i] = buf_adc[i].am_data;
+ raw.adc_voltage_v[i] = buf_adc[i].am_data / (4096.0f / 3.3f);
}
+ /* look for specific channels and process the raw voltage to measurement data */
if (ADC_BATTERY_VOLTAGE_CHANNEL == buf_adc[i].am_channel) {
/* Voltage in volts */
float voltage = (buf_adc[i].am_data * _parameters.battery_voltage_scaling);