fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 02:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'adc_fix' into paul_estimator_mavlink2

Browse Source
This commit is contained in:
Lorenz Meier
2014-03-17 16:55:02 +01:00
parent 45cc0262eb 4e6e40e5d8
commit 541e8362cf
14 changed files with 96 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/topics/sensor_combined.h
+2 -1
View File
@@ -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 */