Heat Index Feature

Sensors.c

@@ -79,7 +79,8 @@ const Interface SPI = {
 static const SensorType* sensorTypes[] = {&DHT11,  &DHT12_SW,  &DHT20,      &DHT21,    &DHT22,
                                           &Dallas, &AM2320_SW, &AM2320_I2C, &HTU21x,   &AHT10,
                                           &SHT30,  &GXHT30,    &LM75,       &HDC1080,  &BMP180,
-                                          &BMP280, &BME280,    &BME680,     &MAX31855, &MAX6675};
+                                          &BMP280, &BME280,    &BME680,     &MAX31855, &MAX6675,
+                                          &SCD30};
 
 const SensorType* unitemp_sensors_getTypeFromInt(uint8_t index) {
     if(index > SENSOR_TYPES_COUNT) return NULL;
@@ -627,11 +628,14 @@ UnitempStatus unitemp_sensor_updateData(Sensor* sensor) {
         UNITEMP_DEBUG("Sensor %s update status %d", sensor->name, sensor->status);
     }
 
-    if(app->settings.temp_unit == UT_TEMP_FAHRENHEIT && sensor->status == UT_SENSORSTATUS_OK) {
-        uintemp_celsiumToFarengate(sensor);
-    }
-
     if(sensor->status == UT_SENSORSTATUS_OK) {
+        if(app->settings.heat_index && ((sensor->type->datatype & (UT_TEMPERATURE | UT_HUMIDITY)) == (UT_TEMPERATURE | UT_HUMIDITY))) {
+            unitemp_calculate_heat_index(sensor);
+        }
+        if(app->settings.temp_unit == UT_TEMP_FAHRENHEIT) {
+            uintemp_celsiumToFarengate(sensor);
+        }
+
         sensor->temp += sensor->temp_offset / 10.f;
         if(app->settings.pressure_unit == UT_PRESSURE_MM_HG) {
             unitemp_pascalToMmHg(sensor);

Sensors.h

@@ -24,13 +24,15 @@
 #define UT_TEMPERATURE 0b00000001
 #define UT_HUMIDITY 0b00000010
 #define UT_PRESSURE 0b00000100
+#define UT_CO2 0b00001000
 
 //Статусы опроса датчика
 typedef enum {
     UT_DATA_TYPE_TEMP = UT_TEMPERATURE,
     UT_DATA_TYPE_TEMP_HUM = UT_TEMPERATURE | UT_HUMIDITY,
     UT_DATA_TYPE_TEMP_PRESS = UT_TEMPERATURE | UT_PRESSURE,
     UT_DATA_TYPE_TEMP_HUM_PRESS = UT_TEMPERATURE | UT_HUMIDITY | UT_PRESSURE,
+    UT_DATA_TYPE_TEMP_HUM_CO2 = UT_TEMPERATURE | UT_HUMIDITY | UT_CO2,
 } SensorDataType;
 
 //Типы возвращаемых данных
@@ -117,10 +119,13 @@ typedef struct Sensor {
     char* name;
     //Температура
     float temp;
+    float heat_index;
     //Относительная влажность
     float hum;
     //Атмосферное давление
     float pressure;
+    // Концентрация CO2
+    float co2;
     //Тип датчика
     const SensorType* type;
     //Статус последнего опроса датчика
@@ -329,4 +334,5 @@ const GPIO*
 #include "./sensors/HDC1080.h"
 #include "./sensors/MAX31855.h"
 #include "./sensors/MAX6675.h"
+#include "./sensors/SCD30.h"
 #endif