Fix

dk307 · Aug 11, 2023 · aaf29ea · aaf29ea
1 parent 0834c52
commit aaf29ea
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 22 deletions.
diff --git a/main/hardware/sensors/scd30_sensor_device.cpp b/main/hardware/sensors/scd30_sensor_device.cpp
@@ -38,9 +38,6 @@ std::array<std::tuple<sensor_id_index, float>, 4> scd30_sensor_device::read()
             auto err = scd30_read_measurement(&scd30_sensor_, &co2, &temperatureC, &humidity);
             if (err == ESP_OK)
             {
-// #ifdef CONFIG_SCD30_SENSOR_TEMPERATURE_OFFSET
-//                 temperatureC -= CONFIG_SCD30_SENSOR_TEMPERATURE_OFFSET / 100; // offset for the heat generated by sensor itself.
-// #endif
                 temperatureF = (temperatureC * 1.8) + 32;
                 ESP_LOGI(SENSOR_SCD30_TAG, "Read SCD30 sensor values:%g ppm %g F, %g C  %g %%", co2, temperatureF, temperatureC, humidity);
             }

diff --git a/main/hardware/sensors/scd4x_sensor_device.cpp b/main/hardware/sensors/scd4x_sensor_device.cpp
@@ -27,7 +27,7 @@ void scd4x_sensor_device::init()
     {
         CHECK_THROW_ESP2(ESP_FAIL, "SCD4x Self Test Failed");
     }
-#ifdef CONFIG_SCD4x_SENSOR_TEMPERATURE_OFFSET    
+#ifdef CONFIG_SCD4x_SENSOR_TEMPERATURE_OFFSET
     CHECK_THROW_ESP(scd4x_set_temperature_offset(&scd4x_sensor_, CONFIG_SCD4x_SENSOR_TEMPERATURE_OFFSET / 100));
 #endif
     CHECK_THROW_ESP(scd4x_set_automatic_self_calibration(&scd4x_sensor_, true));
@@ -55,9 +55,6 @@ std::array<std::tuple<sensor_id_index, float>, 4> scd4x_sensor_device::read()
             if (err == ESP_OK)
             {
                 co2 = co2_int;
-// #ifdef CONFIG_SCD4x_SENSOR_TEMPERATURE_OFFSET
-//                 temperatureC -= CONFIG_SCD4x_SENSOR_TEMPERATURE_OFFSET / 100; // offset for the heat generated by sensor itself.
-// #endif
                 temperatureF = (temperatureC * 1.8) + 32;
                 ESP_LOGI(SENSOR_SCD4x_TAG, "Read SCD40 sensor values:%g ppm %g F, %g C  %g %%", co2, temperatureF, temperatureC, humidity);
             }

diff --git a/main/hardware/sensors/sensor.h b/main/hardware/sensors/sensor.h
@@ -277,19 +277,20 @@ constexpr std::array<sensor_definition_display, 6> co2_definition_display{
 
 #endif
 
-constexpr std::array<sensor_definition, total_sensors> sensor_definitions{
+constexpr std::array<sensor_definition, total_sensors> sensor_definitions
+{
     sensor_definition{"PM 2.5", "µg/m³", pm_2_5_definition_display.data(), pm_2_5_definition_display.size(), 0, 1000, 1},
-    sensor_definition{"Temperature", "°F", no_level.data(), no_level.size(), -40, 140, 1},
-    sensor_definition{"Temperature", "°C", no_level.data(), no_level.size(), -40, 70, 0.1},
-    sensor_definition{"Humidity", "⁒", no_level.data(), no_level.size(), 0, 100, 1},
+        sensor_definition{"Temperature", "°F", no_level.data(), no_level.size(), -40, 140, 1},
+        sensor_definition{"Temperature", "°C", no_level.data(), no_level.size(), -40, 70, 0.1},
+        sensor_definition{"Humidity", "⁒", no_level.data(), no_level.size(), 0, 100, 1},
 #if defined CONFIG_SCD30_SENSOR_ENABLE || defined CONFIG_SCD4x_SENSOR_ENABLE
-    sensor_definition{"CO2", "ppm", co2_definition_display.data(), co2_definition_display.size(), 0, 2000, 1},
+        sensor_definition{"CO2", "ppm", co2_definition_display.data(), co2_definition_display.size(), 0, 2000, 1},
 #endif
-    sensor_definition{"PM 1", "µg/m³", no_level.data(), no_level.size(), 0, 1000, 1},
-    sensor_definition{"PM 4", "µg/m³", no_level.data(), no_level.size(), 0, 1000, 1},
-    sensor_definition{"PM 10", "µg/m³", pm_10_definition_display.data(), pm_10_definition_display.size(), 0, 1000, 1},
-    sensor_definition{"Typical Particle Size", "µg", no_level.data(), no_level.size(), 0, 10, 0.1},
-    sensor_definition{"Light Intensity", "lux", no_level.data(), no_level.size(), 0, 65535, 1},
+        sensor_definition{"PM 1", "µg/m³", no_level.data(), no_level.size(), 0, 1000, 1},
+        sensor_definition{"PM 4", "µg/m³", no_level.data(), no_level.size(), 0, 1000, 1},
+        sensor_definition{"PM 10", "µg/m³", pm_10_definition_display.data(), pm_10_definition_display.size(), 0, 1000, 1},
+        sensor_definition{"Typical Particle Size", "µg", no_level.data(), no_level.size(), 0, 10, 0.1},
+        sensor_definition{"Light Intensity", "lux", no_level.data(), no_level.size(), 0, 65535, 1},
 };
 
 constexpr auto &&get_sensor_definition(sensor_id_index id)

diff --git a/main/homekit/homekit_definitions.h b/main/homekit/homekit_definitions.h
@@ -43,12 +43,14 @@ struct homekit_definition
 
 constexpr auto homekit_definitions = std::to_array<homekit_definition>({
     homekit_definition{sensor_id_index::pm_2_5, HAP_SERV_UUID_AIR_QUALITY_SENSOR, HAP_CHAR_UUID_PM_2_5_DENSITY, std::string_view()},
-    homekit_definition{sensor_id_index::temperatureC, HAP_SERV_UUID_TEMPERATURE_SENSOR, HAP_CHAR_UUID_CURRENT_TEMPERATURE, HAP_CHAR_UNIT_CELSIUS},
-    homekit_definition{sensor_id_index::humidity, HAP_SERV_UUID_HUMIDITY_SENSOR, HAP_CHAR_UUID_CURRENT_RELATIVE_HUMIDITY, HAP_CHAR_UNIT_PERCENTAGE},
-    homekit_definition{sensor_id_index::pm_10, HAP_SERV_UUID_AIR_QUALITY_SENSOR, HAP_CHAR_UUID_PM_10_DENSITY, std::string_view()},
-    homekit_definition{sensor_id_index::light_intensity, HAP_SERV_UUID_LIGHT_SENSOR, HAP_CHAR_UUID_CURRENT_AMBIENT_LIGHT_LEVEL, HAP_CHAR_UNIT_LUX},
+        homekit_definition{sensor_id_index::temperatureC, HAP_SERV_UUID_TEMPERATURE_SENSOR, HAP_CHAR_UUID_CURRENT_TEMPERATURE, HAP_CHAR_UNIT_CELSIUS},
+        homekit_definition{sensor_id_index::humidity, HAP_SERV_UUID_HUMIDITY_SENSOR, HAP_CHAR_UUID_CURRENT_RELATIVE_HUMIDITY,
+                           HAP_CHAR_UNIT_PERCENTAGE},
+        homekit_definition{sensor_id_index::pm_10, HAP_SERV_UUID_AIR_QUALITY_SENSOR, HAP_CHAR_UUID_PM_10_DENSITY, std::string_view()},
+        homekit_definition{sensor_id_index::light_intensity, HAP_SERV_UUID_LIGHT_SENSOR, HAP_CHAR_UUID_CURRENT_AMBIENT_LIGHT_LEVEL,
+                           HAP_CHAR_UNIT_LUX},
 #if defined CONFIG_SCD30_SENSOR_ENABLE || defined CONFIG_SCD4x_SENSOR_ENABLE
-    homekit_definition{sensor_id_index::CO2, HAP_SERV_UUID_AIR_QUALITY_SENSOR, HAP_CHAR_UUID_CARBON_DIOXIDE_LEVEL, std::string_view()},
+        homekit_definition{sensor_id_index::CO2, HAP_SERV_UUID_AIR_QUALITY_SENSOR, HAP_CHAR_UUID_CARBON_DIOXIDE_LEVEL, std::string_view()},
 #endif
 });