Various Fixes (#41)

* Various Fixes
* Fix Linter

.vscode/settings.json

@@ -96,5 +96,6 @@
         "sht3x_sensor_device.h": "c",
         "scd4x_sensor_device.h": "c"
     },
-    "C_Cpp.errorSquiggles": "disabled"
+    "C_Cpp.errorSquiggles": "disabled",
+    "editor.formatOnSave": true
 }

CMakeLists.txt

@@ -3,16 +3,11 @@ cmake_minimum_required(VERSION 3.5)
 set(SDKCONFIG "${CMAKE_BINARY_DIR}/sdkconfig")
 
 # Sensor 1
-#set(BUILD_DIR build-sensor1)
 set(SDKCONFIG_DEFAULTS "sdkconfig.defaults;sdkconfig.sensor1")
 
 # Sensor 2
-#set(BUILD_DIR build-sensor2)
-#set(CMAKE_BINARY_DIR build-sensor2)
 #set(SDKCONFIG_DEFAULTS "sdkconfig.defaults;sdkconfig.sensor2")
 
-#idf_build_set_property(BUILD_DIR "build-sensor2")
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
 #LVGL custom config file setup

dependencies.lock

@@ -21,7 +21,7 @@ dependencies:
     component_hash: null
     source:
       type: idf
-    version: 5.1.0
+    version: 5.1.1
 manifest_hash: 9275a596616c0a70cfe5b167d7bb0650aa90eb700c5b2ebe12470c3274692aa7
 target: esp32s3
 version: 1.0.0

main/homekit/homekit_integration.cpp

@@ -133,16 +133,24 @@ void homekit_integration::homekit_task_ftn()
                         auto iter = chars1_.find(id);
                         if (iter != chars1_.end())
                         {
-                            hap_val_t h_value{};
-                            h_value.f = get_sensor_value(id);
-                            hap_char_update_val(iter->second, &h_value);
+                            const auto value = get_sensor_value(id);
+                            if (!std::isnan(value))
+                            {
+                                hap_val_t h_value{};
+                                h_value.f = get_sensor_value(id);
+                                hap_char_update_val(iter->second, &h_value);
+                            }
                         }
 
                         if (id == air_quality_sensor_id)
                         {
-                            hap_val_t h_value{};
-                            h_value.u = get_air_quality();
-                            hap_char_update_val(air_quality_char, &h_value);
+                            const auto value = get_air_quality();
+                            if (value.has_value())
+                            {
+                                hap_val_t h_value{};
+                                h_value.u = value.value();
+                                hap_char_update_val(air_quality_char, &h_value);
+                            }
                         }
                     }
                 }
@@ -202,8 +210,9 @@ void homekit_integration::create_sensor_services_and_chars()
             service = iter->second;
         }
 
-        auto sensor_char = hap_char_float_create(const_cast<char *>(definition.get_cha_type_uuid().data()), HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV,
-                                                 get_sensor_value(definition.get_sensor()));
+        const auto sensor_value = get_sensor_value(definition.get_sensor());
+        auto sensor_char =
+            hap_char_float_create(const_cast<char *>(definition.get_cha_type_uuid().data()), HAP_CHAR_PERM_PR | HAP_CHAR_PERM_EV, sensor_value);
         CHECK_NULL_RESULT(service);
 
         const auto sensor_def = get_sensor_definition(definition.get_sensor());
@@ -219,7 +228,7 @@ void homekit_integration::create_sensor_services_and_chars()
         CHECK_HAP_RESULT(hap_serv_add_char(service, sensor_char));
     }
 
-    air_quality_char = hap_char_air_quality_create(get_air_quality());
+    air_quality_char = hap_char_air_quality_create(get_air_quality().value_or(0));
     CHECK_NULL_RESULT(air_quality_char);
     static_assert(homekit_definitions[0].get_sensor() == air_quality_sensor_id);
     CHECK_HAP_RESULT(hap_serv_add_char(services_[homekit_definitions[0].get_service_type_uuid()], air_quality_char));
@@ -230,19 +239,18 @@ void homekit_integration::create_sensor_services_and_chars()
     }
 }
 
-uint8_t homekit_integration::get_air_quality()
+std::optional<uint8_t> homekit_integration::get_air_quality()
 {
     const auto value = homekit_integration::get_instance().hardware_.get_sensor(air_quality_sensor_id).get_value();
 
-    if (!std::isnan(value))
+    if (std::isnan(value))
     {
-        return 0; // unknown
+        return std::nullopt;
     }
     else
     {
         const auto sensor_def = get_sensor_definition(air_quality_sensor_id);
         auto level = sensor_def.calculate_level(value);
-
         return static_cast<uint8_t>(level);
     }
 }

main/homekit/homekit_integration.h

@@ -7,6 +7,7 @@
 #include "util/task_wrapper.h"
 #include <hap.h>
 #include <map>
+#include <optional>
 
 class config;
 class hardware;
@@ -58,7 +59,7 @@ class homekit_integration : public esp32::singleton<homekit_integration>
     void generate_password();
     static int sensor_read(hap_char_t *hc, hap_status_t *status_code, void *serv_priv, void *read_priv);
     float get_sensor_value(sensor_id_index index);
-    static uint8_t get_air_quality();
+    static std::optional<uint8_t> get_air_quality();
 
     constexpr static uint32_t task_notify_restarting_bit = BIT(total_sensors + 1);
 };