Merge 75da417855 into 5f3b7f25d0

platformio.ini

@@ -126,6 +126,7 @@ build_flags =
   -D ENV_INCLUDE_BME280=1
   -D ENV_INCLUDE_BMP280=1
   -D ENV_INCLUDE_SHTC3=1
+  -D ENV_INCLUDE_SHT31=1
   -D ENV_INCLUDE_SHT4X=1
   -D ENV_INCLUDE_LPS22HB=1
   -D ENV_INCLUDE_INA3221=1
@@ -145,6 +146,7 @@ lib_deps =
   adafruit/Adafruit BME280 Library @ ^2.3.0
   adafruit/Adafruit BMP280 Library @ ^2.6.8
   adafruit/Adafruit SHTC3 Library @ ^1.0.1
+  adafruit/Adafruit SHT31 Library @ ^2.2.2
   sensirion/Sensirion I2C SHT4x @ ^1.1.2
   arduino-libraries/Arduino_LPS22HB @ ^1.0.2
   adafruit/Adafruit MLX90614 Library @ ^2.1.5

src/helpers/sensors/EnvironmentSensorManager.cpp

@@ -83,6 +83,12 @@ static Adafruit_BMP280 BMP280(TELEM_WIRE);
 static Adafruit_SHTC3 SHTC3;
 #endif
 
+#if ENV_INCLUDE_SHT31
+#define TELEM_SHT31_ADDRESS 0x44
+#include <Adafruit_SHT31.h>
+static Adafruit_SHT31 SHT31;
+#endif
+
 #if ENV_INCLUDE_SHT4X
 #ifndef TELEM_SHT4X_ADDRESS
 #define TELEM_SHT4X_ADDRESS 0x44
@@ -314,6 +320,16 @@ static void query_shtc3(uint8_t ch, uint8_t, CayenneLPP& lpp) {
 }
 #endif
 
+#if ENV_INCLUDE_SHT31
+static uint8_t init_sht31(TwoWire* wire, uint8_t addr) {
+  return SHT31.begin(addr) ? 1 : 0;
+}
+static void query_sht31(uint8_t ch, uint8_t, CayenneLPP& lpp) {
+  lpp.addTemperature(ch, SHT31.readTemperature());
+  lpp.addRelativeHumidity(ch, SHT31.readHumidity());
+}
+#endif
+
 #if ENV_INCLUDE_SHT4X
 static uint8_t init_sht4x(TwoWire* wire, uint8_t addr) {
   // SensirionI2cSht4x::begin() does not probe the hardware; use serialNumber()
@@ -570,6 +586,9 @@ static const SensorDef SENSOR_TABLE[] = {
 #if ENV_INCLUDE_SHTC3
   { 0x70,                  "SHTC3",        init_shtc3,    query_shtc3    },
 #endif
+#if ENV_INCLUDE_SHT31
+  { TELEM_SHT31_ADDRESS,   "SHT31",        init_sht31,    query_sht31    },
+#endif
 #if ENV_INCLUDE_SHT4X
   { TELEM_SHT4X_ADDRESS,   "SHT4X",        init_sht4x,    query_sht4x    },
 #endif