pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-07-31 02:45:41 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fmt

Browse Source
This commit is contained in:
Thomas Göttgens 2023-05-05 18:11:44 +02:00
parent 10f41e376c
commit 46e29402a6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/Telemetry/Sensor/BME680Sensor.cpp
View File

@ -26,7 +26,6 @@ int32_t BME680Sensor::runOnce()
status = 0; status = 0;
} }
return initI2CSensor(); return initI2CSensor();
} }
@ -37,7 +36,8 @@ bool BME680Sensor::getMetrics(meshtastic_Telemetry *measurement)
bme680.run(); bme680.run();
#ifdef USE_BSEC2 #ifdef USE_BSEC2
measurement->variant.environment_metrics.temperature = bme680.getData(BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_TEMPERATURE).signal; 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.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; measurement->variant.environment_metrics.gas_resistance = bme680.getData(BSEC_OUTPUT_RAW_GAS).signal / 1000.0;
#else #else

6
src/modules/Telemetry/Sensor/BME680Sensor.h
View File

@ -19,11 +19,11 @@ const uint8_t Default_H2S_NonH2S_config[] = {
class BME680Sensor : virtual public TelemetrySensor class BME680Sensor : virtual public TelemetrySensor
{ {
private: private:
#ifdef USE_BSEC2 #ifdef USE_BSEC2
Bsec2 bme680; Bsec2 bme680;
#else #else
Bsec bme680; Bsec bme680;
#endif // USE_BSEC2 #endif // USE_BSEC2
protected: protected:
virtual void setup() override; virtual void setup() override;