kopia lustrzana https://github.com/meshtastic/firmware
pull/2467/head
rodzic
10f41e376c
commit
46e29402a6
|
@ -26,7 +26,6 @@ int32_t BME680Sensor::runOnce()
|
|||
status = 0;
|
||||
}
|
||||
|
||||
|
||||
return initI2CSensor();
|
||||
}
|
||||
|
||||
|
@ -37,7 +36,8 @@ bool BME680Sensor::getMetrics(meshtastic_Telemetry *measurement)
|
|||
bme680.run();
|
||||
#ifdef USE_BSEC2
|
||||
measurement->variant.environment_metrics.temperature = bme680.getData(BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_TEMPERATURE).signal;
|
||||
measurement->variant.environment_metrics.relative_humidity = bme680.getData(BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY).signal;
|
||||
measurement->variant.environment_metrics.relative_humidity =
|
||||
bme680.getData(BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY).signal;
|
||||
measurement->variant.environment_metrics.barometric_pressure = bme680.getData(BSEC_OUTPUT_RAW_PRESSURE).signal / 100.0F;
|
||||
measurement->variant.environment_metrics.gas_resistance = bme680.getData(BSEC_OUTPUT_RAW_GAS).signal / 1000.0;
|
||||
#else
|
||||
|
|
|
@ -19,11 +19,11 @@ const uint8_t Default_H2S_NonH2S_config[] = {
|
|||
class BME680Sensor : virtual public TelemetrySensor
|
||||
{
|
||||
private:
|
||||
#ifdef USE_BSEC2
|
||||
#ifdef USE_BSEC2
|
||||
Bsec2 bme680;
|
||||
#else
|
||||
#else
|
||||
Bsec bme680;
|
||||
#endif // USE_BSEC2
|
||||
#endif // USE_BSEC2
|
||||
|
||||
protected:
|
||||
virtual void setup() override;
|
||||
|
|
Ładowanie…
Reference in New Issue