diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-01 13:30:24 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-01-01 13:30:24 +0100 |
| commit | 4eb7df6ff5b0015a825ca07c1206dd545b4567b5 (patch) | |
| tree | 9e4582abfabb567fa250e44830c54e668c3e0921 /apps/uORB/topics/sensor_combined.h | |
| parent | d93fda20fd55746923d607e717f254bc92741eab (diff) | |
| download | px4-firmware-4eb7df6ff5b0015a825ca07c1206dd545b4567b5.tar.gz px4-firmware-4eb7df6ff5b0015a825ca07c1206dd545b4567b5.tar.bz2 px4-firmware-4eb7df6ff5b0015a825ca07c1206dd545b4567b5.zip | |
Introduced battery_status uORB topic, changed sensors app to publish to it, extended px4io driver to publish to it. Both do only so if the battery voltage is reasonably high, at 3.3V
Diffstat (limited to 'apps/uORB/topics/sensor_combined.h')
| -rw-r--r-- | apps/uORB/topics/sensor_combined.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/uORB/topics/sensor_combined.h b/apps/uORB/topics/sensor_combined.h index 0324500ac..1d25af35a 100644 --- a/apps/uORB/topics/sensor_combined.h +++ b/apps/uORB/topics/sensor_combined.h @@ -99,8 +99,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 battery_voltage_v; /**< Battery voltage in volts, filtered */ - float adc_voltage_v[3]; /**< ADC voltages of ADC Chan 11/12/13 or -1 */ + float adc_voltage_v[4]; /**< ADC voltages of ADC Chan 10/11/12/13 or -1 */ + float mcu_temp_celcius; /**< Internal temperature measurement of MCU */ uint32_t baro_counter; /**< Number of raw baro measurements taken */ uint32_t battery_voltage_counter; /**< Number of voltage measurements taken */ bool battery_voltage_valid; /**< True if battery voltage can be measured */ |