diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-17 16:55:02 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-17 16:55:02 +0100 |
| commit | 541e8362cff00ed411b7e3f85a1c347caf6ddec0 (patch) | |
| tree | 2c921d65251245b0b23fbd704953093928103dd2 /src/modules/uORB | |
| parent | 45cc0262ebbd95d10d7298eb0bf4e00b5bab3455 (diff) | |
| parent | 4e6e40e5d850f737b25d657630ac89ad1d54e67c (diff) | |
| download | px4-firmware-541e8362cff00ed411b7e3f85a1c347caf6ddec0.tar.gz px4-firmware-541e8362cff00ed411b7e3f85a1c347caf6ddec0.tar.bz2 px4-firmware-541e8362cff00ed411b7e3f85a1c347caf6ddec0.zip | |
Merge branch 'adc_fix' into paul_estimator_mavlink2
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/topics/sensor_combined.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/uORB/topics/sensor_combined.h b/src/modules/uORB/topics/sensor_combined.h index 92812efd4..a02b6a02c 100644 --- a/src/modules/uORB/topics/sensor_combined.h +++ b/src/modules/uORB/topics/sensor_combined.h @@ -98,7 +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[4]; /**< ADC voltages of ADC Chan 10/11/12/13 or -1 */ + 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 mcu_temp_celcius; /**< Internal temperature measurement of MCU */ uint64_t baro_timestamp; /**< Barometer timestamp */ |