diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2013-03-03 23:43:17 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-03-03 23:56:11 +0100 |
| commit | e27481826c72d71c28740b3ecfa3ea9471b8687d (patch) | |
| tree | a01ec0e831798628caea8bb8d200d4a770388bf0 /apps | |
| parent | 433c9548589ebdc1ed40ab9f478b00f531b7bb47 (diff) | |
| download | px4-firmware-e27481826c72d71c28740b3ecfa3ea9471b8687d.tar.gz px4-firmware-e27481826c72d71c28740b3ecfa3ea9471b8687d.tar.bz2 px4-firmware-e27481826c72d71c28740b3ecfa3ea9471b8687d.zip | |
write adc values to sensors combined and log them
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/sdlog/sdlog.c | 2 | ||||
| -rw-r--r-- | apps/sdlog/sdlog_ringbuffer.h | 4 | ||||
| -rw-r--r-- | apps/sensors/sensors.cpp | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/apps/sdlog/sdlog.c b/apps/sdlog/sdlog.c index 4fd5fea1b..df8745d9f 100644 --- a/apps/sdlog/sdlog.c +++ b/apps/sdlog/sdlog.c @@ -683,7 +683,7 @@ int sdlog_thread_main(int argc, char *argv[]) .vbat = buf.batt.voltage_v, .bat_current = buf.batt.current_a, .bat_discharged = buf.batt.discharged_mah, - .adc = {buf.raw.adc_voltage_v[0], buf.raw.adc_voltage_v[1], buf.raw.adc_voltage_v[2]}, + .adc = {buf.raw.adc_voltage_v[0], buf.raw.adc_voltage_v[1], buf.raw.adc_voltage_v[2], buf.raw.adc_voltage_v[3]}, .local_position = {buf.local_pos.x, buf.local_pos.y, buf.local_pos.z}, .gps_raw_position = {buf.gps_pos.lat, buf.gps_pos.lon, buf.gps_pos.alt}, .attitude = {buf.att.pitch, buf.att.roll, buf.att.yaw}, diff --git a/apps/sdlog/sdlog_ringbuffer.h b/apps/sdlog/sdlog_ringbuffer.h index f7fc0d450..b65916459 100644 --- a/apps/sdlog/sdlog_ringbuffer.h +++ b/apps/sdlog/sdlog_ringbuffer.h @@ -56,7 +56,7 @@ struct sdlog_sysvector { float vbat; /**< battery voltage in [volt] */ float bat_current; /**< battery discharge current */ float bat_discharged; /**< discharged energy in mAh */ - float adc[3]; /**< remaining auxiliary ADC ports [volt] */ + float adc[4]; /**< ADC ports [volt] */ float local_position[3]; /**< tangent plane mapping into x,y,z [m] */ int32_t gps_raw_position[3]; /**< latitude [degrees] north, longitude [degrees] east, altitude above MSL [millimeter] */ float attitude[3]; /**< roll, pitch, yaw [rad] */ @@ -88,4 +88,4 @@ void sdlog_logbuffer_write(struct sdlog_logbuffer *lb, const struct sdlog_sysvec int sdlog_logbuffer_read(struct sdlog_logbuffer *lb, struct sdlog_sysvector *elem); -#endif
\ No newline at end of file +#endif diff --git a/apps/sensors/sensors.cpp b/apps/sensors/sensors.cpp index 6a4cf0c65..b5badec71 100644 --- a/apps/sensors/sensors.cpp +++ b/apps/sensors/sensors.cpp @@ -1004,6 +1004,10 @@ Sensors::adc_poll(struct sensor_combined_s &raw) if (ret >= (int)sizeof(buf_adc[0])) { + if (i < (sizeof(raw.adc_voltage_v)) / sizeof(raw.adc_voltage_v[0])) { + raw.adc_voltage_v[i] = buf_adc[i].am_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); |