diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-10-15 21:50:52 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-02 12:28:22 +0100 |
| commit | f5b6b831617632dfb237f8331e29242774b7c0c1 (patch) | |
| tree | 6e4b20471aa07d4d05e65d2d6b0a9c9042abb1a0 /src/modules/uORB/topics | |
| parent | 08297db39a909df9b024867eeb23720532f5625f (diff) | |
| download | px4-firmware-f5b6b831617632dfb237f8331e29242774b7c0c1.tar.gz px4-firmware-f5b6b831617632dfb237f8331e29242774b7c0c1.tar.bz2 px4-firmware-f5b6b831617632dfb237f8331e29242774b7c0c1.zip | |
Added 2nd baro to sensor combined topic
Diffstat (limited to 'src/modules/uORB/topics')
| -rw-r--r-- | src/modules/uORB/topics/sensor_combined.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/modules/uORB/topics/sensor_combined.h b/src/modules/uORB/topics/sensor_combined.h index 06dfcdab3..583a39ded 100644 --- a/src/modules/uORB/topics/sensor_combined.h +++ b/src/modules/uORB/topics/sensor_combined.h @@ -122,15 +122,25 @@ 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[10]; /**< ADC voltages of ADC Chan 10/11/12/13 or -1 */ + uint64_t baro_timestamp; /**< Barometer timestamp */ + + float baro1_pres_mbar; /**< Barometric pressure, already temp. comp. */ + float baro1_alt_meter; /**< Altitude, already temp. comp. */ + float baro1_temp_celcius; /**< Temperature in degrees celsius */ + uint64_t baro1_timestamp; /**< Barometer timestamp */ + + 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 */ - float differential_pressure_pa; /**< Airspeed sensor differential pressure */ - uint64_t differential_pressure_timestamp; /**< Last measurement timestamp */ + float differential_pressure_pa; /**< Airspeed sensor differential pressure */ + uint64_t differential_pressure_timestamp; /**< Last measurement timestamp */ float differential_pressure_filtered_pa; /**< Low pass filtered airspeed sensor differential pressure reading */ + float differential_pressure1_pa; /**< Airspeed sensor differential pressure */ + uint64_t differential_pressure1_timestamp; /**< Last measurement timestamp */ + float differential_pressure1_filtered_pa; /**< Low pass filtered airspeed sensor differential pressure reading */ + }; /** |