diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-17 17:02:24 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-17 17:02:24 +0100 |
| commit | 7a3873cdf2336d235dc826b77ced6775749f39bc (patch) | |
| tree | 727452cada921db13986c8d7f70b6fe8ac8d0de5 /src/modules/uORB/topics/sensor_combined.h | |
| parent | 541e8362cff00ed411b7e3f85a1c347caf6ddec0 (diff) | |
| parent | d940bdf7f64268d46503cf4b0b996bec3036603e (diff) | |
| download | px4-firmware-7a3873cdf2336d235dc826b77ced6775749f39bc.tar.gz px4-firmware-7a3873cdf2336d235dc826b77ced6775749f39bc.tar.bz2 px4-firmware-7a3873cdf2336d235dc826b77ced6775749f39bc.zip | |
Merge branch 'adc_fix' into paul_estimator_mavlink2
Diffstat (limited to 'src/modules/uORB/topics/sensor_combined.h')
| -rw-r--r-- | src/modules/uORB/topics/sensor_combined.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/uORB/topics/sensor_combined.h b/src/modules/uORB/topics/sensor_combined.h index a02b6a02c..628977656 100644 --- a/src/modules/uORB/topics/sensor_combined.h +++ b/src/modules/uORB/topics/sensor_combined.h @@ -98,8 +98,8 @@ struct sensor_combined_s { float baro_pres_mbar; /**< Barometric pressure, already temp. comp. */ float baro_alt_meter; /**< Altitude, already temp. comp. */ float baro_temp_celcius; /**< Temperature in degrees celsius */ - float adc_voltage_v[9]; /**< ADC voltages of ADC Chan 10/11/12/13 or -1 */ - unsigned adc_mapping[9]; /**< Channel indices of each of these values */ + float adc_voltage_v[10]; /**< ADC voltages of ADC Chan 10/11/12/13 or -1 */ + unsigned adc_mapping[10]; /**< Channel indices of each of these values */ float mcu_temp_celcius; /**< Internal temperature measurement of MCU */ uint64_t baro_timestamp; /**< Barometer timestamp */ |