DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the issue of inconsistent I2C usage in the environmental sensor.

Browse Source
This commit is contained in:
Quency-D
2026-01-23 10:45:13 +08:00
parent 616eb57b16
commit fc61018d4d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/helpers/sensors/EnvironmentSensorManager.cpp
View File

@@ -42,7 +42,7 @@ static Adafruit_BME280 BME280;
#endif #endif
#define TELEM_BMP280_SEALEVELPRESSURE_HPA (1013.25) // Athmospheric pressure at sea level #define TELEM_BMP280_SEALEVELPRESSURE_HPA (1013.25) // Athmospheric pressure at sea level
#include <Adafruit_BMP280.h> #include <Adafruit_BMP280.h>
static Adafruit_BMP280 BMP280; static Adafruit_BMP280 BMP280(TELEM_WIRE);
#endif #endif
#if ENV_INCLUDE_SHTC3 #if ENV_INCLUDE_SHTC3
@@ -58,6 +58,7 @@ static SensirionI2cSht4x SHT4X;
#if ENV_INCLUDE_LPS22HB #if ENV_INCLUDE_LPS22HB
#include <Arduino_LPS22HB.h> #include <Arduino_LPS22HB.h>
LPS22HBClass LPS22HB(*TELEM_WIRE);
#endif #endif
#if ENV_INCLUDE_INA3221 #if ENV_INCLUDE_INA3221
@@ -218,7 +219,7 @@ bool EnvironmentSensorManager::begin() {
#endif #endif
#if ENV_INCLUDE_SHTC3 #if ENV_INCLUDE_SHTC3
if (SHTC3.begin()) { if (SHTC3.begin(TELEM_WIRE)) {
MESH_DEBUG_PRINTLN("Found sensor: SHTC3"); MESH_DEBUG_PRINTLN("Found sensor: SHTC3");
SHTC3_initialized = true; SHTC3_initialized = true;
} else { } else {
@@ -243,7 +244,7 @@ bool EnvironmentSensorManager::begin() {
#endif #endif
#if ENV_INCLUDE_LPS22HB #if ENV_INCLUDE_LPS22HB
if (BARO.begin()) { if (LPS22HB.begin()) {
MESH_DEBUG_PRINTLN("Found sensor: LPS22HB"); MESH_DEBUG_PRINTLN("Found sensor: LPS22HB");
LPS22HB_initialized = true; LPS22HB_initialized = true;
} else { } else {
@@ -407,8 +408,8 @@ bool EnvironmentSensorManager::querySensors(uint8_t requester_permissions, Cayen
#if ENV_INCLUDE_LPS22HB #if ENV_INCLUDE_LPS22HB
if (LPS22HB_initialized) { if (LPS22HB_initialized) {
telemetry.addTemperature(TELEM_CHANNEL_SELF, BARO.readTemperature()); telemetry.addTemperature(TELEM_CHANNEL_SELF, LPS22HB.readTemperature());
telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, BARO.readPressure() * 10); // convert kPa to hPa telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, LPS22HB.readPressure() * 10); // convert kPa to hPa
} }
#endif #endif