Merge pull request #873 from fablabbcn/enhancement/sht-sensor-consolidation

Enhancement/sht sensor consolidation

Author: thebentern

meshtastic/admin.proto

@@ -666,6 +666,11 @@ message SensorConfig {
    * SCD30 CO2 Sensor configuration
    */
   SCD30_config scd30_config = 3;
+
+  /*
+   * SHTXX temperature and relative humidity sensor configuration
+   */
+  SHTXX_config shtxx_config = 4;
 }
 
 message SCD4X_config {
@@ -748,3 +753,10 @@ message SCD30_config {
    */
   optional bool soft_reset = 6;
 }
+
+message SHTXX_config {
+  /*
+   * Accuracy mode (0 = low, 1 = medium, 2 = high)
+   */
+  optional uint32 set_accuracy = 1;
+}

meshtastic/telemetry.proto

@@ -653,7 +653,7 @@ enum TelemetrySensorType {
   BMP280 = 6;
 
   /*
-   * High accuracy temperature and humidity
+   * TODO - REMOVE High accuracy temperature and humidity
    */
   SHTC3 = 7;
 
@@ -678,7 +678,7 @@ enum TelemetrySensorType {
   QMC5883L = 11;
 
   /*
-   * High accuracy temperature and humidity
+   * TODO - REMOVE High accuracy temperature and humidity
    */
   SHT31 = 12;
 
@@ -703,7 +703,7 @@ enum TelemetrySensorType {
   RCWL9620 = 16;
 
   /*
-   * Sensirion High accuracy temperature and humidity
+   * TODO - REMOVE Sensirion High accuracy temperature and humidity
    */
   SHT4X = 17;
 
@@ -853,7 +853,7 @@ enum TelemetrySensorType {
   HDC1080 = 46;
 
   /*
-   * STH21 Temperature and R. Humidity sensor
+   * TODO - REMOVE STH21 Temperature and R. Humidity sensor
    */
   SHT21 = 47;
 
@@ -866,6 +866,11 @@ enum TelemetrySensorType {
    * SCD30 CO2, humidity, temperature sensor
    */
   SCD30 = 49;
+
+  /*
+   * SHT family of sensors for temperature and humidity
+   */
+  SHTXX = 50;
 }
 
 /*