From 15c49aa9757fd09ecba18c1d538c1ab87b076343 Mon Sep 17 00:00:00 2001
From: Markus Kirberg <markus@flobby.net>
Date: Mon, 14 Oct 2024 19:23:12 +0200
Subject: [PATCH 1/5] adapt settings

---
 fs_src/index.html                     |  4 ++++
 fs_src/script.js                      |  2 ++
 mos.yml                               |  1 +
 src/shelly_hap_humidity_sensor.cpp    | 16 ++++++++++------
 src/shelly_hap_temperature_sensor.cpp | 17 +++++++++++------
 src/shelly_main.cpp                   |  3 +++
 6 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/fs_src/index.html b/fs_src/index.html
index a358a292..f19c8eab 100644
--- a/fs_src/index.html
+++ b/fs_src/index.html
@@ -767,6 +767,10 @@ <h1 id="head">Sensor</h1>
             <label for="update_interval">Update Interval:</label>
             <input type="number" id="update_interval" min="1" max="1000" class="short"><span>&nbsp; s</span>
           </div>
+          <div class="form-control">
+            <label for="offset">Offset (for calibration):</label>
+            <input type="text" id="offset">
+          </div>
           <div class="button-container">
             <button id="save_btn">
               <label><span id="save_spinner"></span>Save</label>
diff --git a/fs_src/script.js b/fs_src/script.js
index 625ecb67..c37ce38d 100644
--- a/fs_src/script.js
+++ b/fs_src/script.js
@@ -440,6 +440,7 @@ function tsSetConfig(c) {
     name: name,
     unit: parseInt(el(c, "unit").value),
     update_interval: parseInt(el(c, "update_interval").value),
+    offset: parseFloat(el(c, "offset").value),
   };
   setComponentConfig(c, cfg, el(c, "save_spinner"));
 }
@@ -794,6 +795,7 @@ function updateComponent(cd) {
       updateInnerText(el(c, "value"), v);
       selectIfNotModified(el(c, "unit"), cd.unit);
       setValueIfNotModified(el(c, "update_interval"), cd.update_interval);
+      setValueIfNotModified(el(c, "offset"), cd.offset);
       break;
     }
     case Component_Type.kStatelessSwitch:
diff --git a/mos.yml b/mos.yml
index 9d3b0b9e..5ccb6816 100644
--- a/mos.yml
+++ b/mos.yml
@@ -43,6 +43,7 @@ config_schema:
   - ["ts.name", "s", "", {title: "Name of the sensor"}]
   - ["ts.unit", "i", 0, {title: "Display unit of the Sensor"}] # 0 - Celsius, 1 - Farenheit
   - ["ts.update_interval", "i", 1, {title: "Update Interval of the sensor in seconds, minimum 1s"}]
+  - ["ts.offset", "f", 0, {title: "Offset value can be used for calibration"}]
 
   - ["sw", "o", {title: "Switch settings", abstract: true}]
   - ["sw.name", "s", "", {title: "Name of the switch"}]
diff --git a/src/shelly_hap_humidity_sensor.cpp b/src/shelly_hap_humidity_sensor.cpp
index d6607e48..21ccf224 100644
--- a/src/shelly_hap_humidity_sensor.cpp
+++ b/src/shelly_hap_humidity_sensor.cpp
@@ -58,8 +58,8 @@ Status HumiditySensor::SetConfig(const std::string &config_json,
   struct mgos_config_ts cfg = *cfg_;
   cfg.name = nullptr;
   json_scanf(config_json.c_str(), config_json.size(),
-             "{name: %Q, unit: %d, update_interval: %d", &cfg.name, &cfg.unit,
-             &cfg.update_interval);
+             "{name: %Q, unit: %d, update_interval: %d, offset: %f}", &cfg.name,
+             &cfg.unit, &cfg.update_interval, &cfg.offset);
 
   mgos::ScopedCPtr name_owner((void *) cfg.name);
   // Validation.
@@ -81,9 +81,13 @@ Status HumiditySensor::SetConfig(const std::string &config_json,
   if (cfg_->unit != cfg.unit) {
     cfg_->unit = cfg.unit;
   }
+  if (cfg_->offset != cfg.offset) {
+    cfg_->offset = cfg.offset;
+  }
   if (cfg_->update_interval != cfg.update_interval) {
     cfg_->update_interval = cfg.update_interval;
-    hum_sensor_->StartUpdating(cfg_->update_interval * 1000);
+    // update interval is set via temperature sensor
+    // hum_sensor_->StartUpdating(cfg_->update_interval * 1000);
   }
   return Status::OK();
 }
@@ -114,7 +118,7 @@ Status HumiditySensor::Init() {
           return kHAPError_Busy;
         }
         float temp = static_cast<float>(tempval.ValueOrDie());
-        *value = truncf(temp * 10) / 10;
+        *value = truncf((temp + cfg_->offset) * 10) / 10;
         return kHAPError_None;
       },
 
@@ -137,8 +141,8 @@ StatusOr<std::string> HumiditySensor::GetInfo() const {
 StatusOr<std::string> HumiditySensor::GetInfoJSON() const {
   std::string res = mgos::JSONPrintStringf(
       "{id: %d, type: %d, name: %Q, unit: %d, "
-      "update_interval: %d, ",
-      id(), type(), cfg_->name, 2, cfg_->update_interval);
+      "update_interval: %d, offset: %f, ",
+      id(), type(), cfg_->name, 2, cfg_->update_interval, cfg_->offset);
   auto tempval = hum_sensor_->GetHumidity();
   if (tempval.ok()) {
     mgos::JSONAppendStringf(&res, "value: %.1f", tempval.ValueOrDie());
diff --git a/src/shelly_hap_temperature_sensor.cpp b/src/shelly_hap_temperature_sensor.cpp
index 923c9890..52528652 100644
--- a/src/shelly_hap_temperature_sensor.cpp
+++ b/src/shelly_hap_temperature_sensor.cpp
@@ -57,8 +57,8 @@ Status TemperatureSensor::SetConfig(const std::string &config_json,
   struct mgos_config_ts cfg = *cfg_;
   cfg.name = nullptr;
   json_scanf(config_json.c_str(), config_json.size(),
-             "{name: %Q, unit: %d, update_interval: %d", &cfg.name, &cfg.unit,
-             &cfg.update_interval);
+             "{name: %Q, unit: %d, update_interval: %d, offset: %f}", &cfg.name,
+             &cfg.unit, &cfg.update_interval, &cfg.offset);
 
   mgos::ScopedCPtr name_owner((void *) cfg.name);
   // Validation.
@@ -84,6 +84,9 @@ Status TemperatureSensor::SetConfig(const std::string &config_json,
     cfg_->update_interval = cfg.update_interval;
     temp_sensor_->StartUpdating(cfg_->update_interval * 1000);
   }
+  if (cfg_->offset != cfg.offset) {
+    cfg_->offset = cfg.offset;
+  }
   return Status::OK();
 }
 
@@ -113,7 +116,7 @@ Status TemperatureSensor::Init() {
           return kHAPError_Busy;
         }
         float temp = static_cast<float>(tempval.ValueOrDie());
-        *value = truncf(temp * 10) / 10;
+        *value = truncf((temp + cfg_->offset) * 10) / 10;
         return kHAPError_None;
       },
 
@@ -149,11 +152,13 @@ StatusOr<std::string> TemperatureSensor::GetInfo() const {
 StatusOr<std::string> TemperatureSensor::GetInfoJSON() const {
   std::string res = mgos::JSONPrintStringf(
       "{id: %d, type: %d, name: %Q, unit: %d, "
-      "update_interval: %d, ",
-      id(), type(), cfg_->name, cfg_->unit, cfg_->update_interval);
+      "update_interval: %d, offset: %f",
+      id(), type(), cfg_->name, cfg_->unit, cfg_->update_interval,
+      cfg_->offset);
   auto tempval = temp_sensor_->GetTemperature();
   if (tempval.ok()) {
-    mgos::JSONAppendStringf(&res, "value: %.1f", tempval.ValueOrDie());
+    mgos::JSONAppendStringf(&res, "value: %.1f",
+                            tempval.ValueOrDie() + cfg_->offset);
   } else {
     mgos::JSONAppendStringf(&res, "error: %.1f", tempval.ValueOrDie());
   }
diff --git a/src/shelly_main.cpp b/src/shelly_main.cpp
index e428de7a..717fb1df 100644
--- a/src/shelly_main.cpp
+++ b/src/shelly_main.cpp
@@ -193,8 +193,11 @@ void CreateHAPSensors(std::vector<std::unique_ptr<TempSensor>> *sensors,
 
     if (ts->getType() == TS_HUM) {  // can only be one shares config, as same
                                     // update interval but no unit settable
+      i++;
+      ts_cfg = ts_cfgs[i];
       shelly::hap::CreateHAPHumiditySensor(j++, (HumidityTempSensor *) ts,
                                            ts_cfg, comps, accs, svr);
+      break;  // max 1 DHT sensor
     }
   }
 }

From a50ee933583ff7b1b8b4b9d0339e8bd5e9f8961b Mon Sep 17 00:00:00 2001
From: Markus Kirberg <markus@flobby.net>
Date: Tue, 15 Oct 2024 15:36:23 +0000
Subject: [PATCH 2/5] fixes

---
 fs_src/index.html                     | 4 ++--
 fs_src/script.js                      | 4 ++--
 mos.yml                               | 2 +-
 src/shelly_hap_garage_door_opener.cpp | 2 +-
 src/shelly_hap_humidity_sensor.cpp    | 8 ++++----
 src/shelly_hap_temperature_sensor.cpp | 8 ++++----
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/fs_src/index.html b/fs_src/index.html
index f19c8eab..de203e10 100644
--- a/fs_src/index.html
+++ b/fs_src/index.html
@@ -768,8 +768,8 @@ <h1 id="head">Sensor</h1>
             <input type="number" id="update_interval" min="1" max="1000" class="short"><span>&nbsp; s</span>
           </div>
           <div class="form-control">
-            <label for="offset">Offset (for calibration):</label>
-            <input type="text" id="offset">
+            <label for="offset">Offset:</label>
+            <input type="text" id="offset" class="short">
           </div>
           <div class="button-container">
             <button id="save_btn">
diff --git a/fs_src/script.js b/fs_src/script.js
index c37ce38d..f0336422 100644
--- a/fs_src/script.js
+++ b/fs_src/script.js
@@ -440,7 +440,7 @@ function tsSetConfig(c) {
     name: name,
     unit: parseInt(el(c, "unit").value),
     update_interval: parseInt(el(c, "update_interval").value),
-    offset: parseFloat(el(c, "offset").value),
+    offset: Math.round(parseFloat(el(c, "offset").value * 100)),
   };
   setComponentConfig(c, cfg, el(c, "save_spinner"));
 }
@@ -795,7 +795,7 @@ function updateComponent(cd) {
       updateInnerText(el(c, "value"), v);
       selectIfNotModified(el(c, "unit"), cd.unit);
       setValueIfNotModified(el(c, "update_interval"), cd.update_interval);
-      setValueIfNotModified(el(c, "offset"), cd.offset);
+      setValueIfNotModified(el(c, "offset"), cd.offset / 100.0);
       break;
     }
     case Component_Type.kStatelessSwitch:
diff --git a/mos.yml b/mos.yml
index 5ccb6816..cc4fc3a4 100644
--- a/mos.yml
+++ b/mos.yml
@@ -43,7 +43,7 @@ config_schema:
   - ["ts.name", "s", "", {title: "Name of the sensor"}]
   - ["ts.unit", "i", 0, {title: "Display unit of the Sensor"}] # 0 - Celsius, 1 - Farenheit
   - ["ts.update_interval", "i", 1, {title: "Update Interval of the sensor in seconds, minimum 1s"}]
-  - ["ts.offset", "f", 0, {title: "Offset value can be used for calibration"}]
+  - ["ts.offset", "i", 0, {title: "Offset value can be used for calibration in unit*100 e.g. centigrade"}]
 
   - ["sw", "o", {title: "Switch settings", abstract: true}]
   - ["sw.name", "s", "", {title: "Name of the switch"}]
diff --git a/src/shelly_hap_garage_door_opener.cpp b/src/shelly_hap_garage_door_opener.cpp
index 9c90c2e8..069a0683 100644
--- a/src/shelly_hap_garage_door_opener.cpp
+++ b/src/shelly_hap_garage_door_opener.cpp
@@ -420,7 +420,7 @@ void CreateHAPGDO(int id, Input *in_close, Input *in_open, Output *out_close,
                   Output *out_open, const struct mgos_config_gdo *gdo_cfg,
                   std::vector<std::unique_ptr<Component>> *comps,
                   std::vector<std::unique_ptr<mgos::hap::Accessory>> *accs,
-                  HAPAccessoryServerRef *svr, bool to_pri_acc) {
+                  HAPAccessoryServerRef *svr UNUSED_ARG, bool to_pri_acc) {
   struct mgos_config_gdo *gdo2_cfg = (struct mgos_config_gdo *) gdo_cfg;
 
   if (gdo_cfg->sensor_swap) {
diff --git a/src/shelly_hap_humidity_sensor.cpp b/src/shelly_hap_humidity_sensor.cpp
index 21ccf224..3c1f216b 100644
--- a/src/shelly_hap_humidity_sensor.cpp
+++ b/src/shelly_hap_humidity_sensor.cpp
@@ -58,7 +58,7 @@ Status HumiditySensor::SetConfig(const std::string &config_json,
   struct mgos_config_ts cfg = *cfg_;
   cfg.name = nullptr;
   json_scanf(config_json.c_str(), config_json.size(),
-             "{name: %Q, unit: %d, update_interval: %d, offset: %f}", &cfg.name,
+             "{name: %Q, unit: %d, update_interval: %d, offset: %d", &cfg.name,
              &cfg.unit, &cfg.update_interval, &cfg.offset);
 
   mgos::ScopedCPtr name_owner((void *) cfg.name);
@@ -118,7 +118,7 @@ Status HumiditySensor::Init() {
           return kHAPError_Busy;
         }
         float temp = static_cast<float>(tempval.ValueOrDie());
-        *value = truncf((temp + cfg_->offset) * 10) / 10;
+        *value = truncf((temp + cfg_->offset / 100) * 10) / 10;
         return kHAPError_None;
       },
 
@@ -141,11 +141,11 @@ StatusOr<std::string> HumiditySensor::GetInfo() const {
 StatusOr<std::string> HumiditySensor::GetInfoJSON() const {
   std::string res = mgos::JSONPrintStringf(
       "{id: %d, type: %d, name: %Q, unit: %d, "
-      "update_interval: %d, offset: %f, ",
+      "update_interval: %d, offset: %d, ",
       id(), type(), cfg_->name, 2, cfg_->update_interval, cfg_->offset);
   auto tempval = hum_sensor_->GetHumidity();
   if (tempval.ok()) {
-    mgos::JSONAppendStringf(&res, "value: %.1f", tempval.ValueOrDie());
+    mgos::JSONAppendStringf(&res, "value: %.1f", tempval.ValueOrDie() + cfg_->offset / 100);
   } else {
     mgos::JSONAppendStringf(&res, "error: %.1f", tempval.ValueOrDie());
   }
diff --git a/src/shelly_hap_temperature_sensor.cpp b/src/shelly_hap_temperature_sensor.cpp
index 52528652..e64f41cb 100644
--- a/src/shelly_hap_temperature_sensor.cpp
+++ b/src/shelly_hap_temperature_sensor.cpp
@@ -57,7 +57,7 @@ Status TemperatureSensor::SetConfig(const std::string &config_json,
   struct mgos_config_ts cfg = *cfg_;
   cfg.name = nullptr;
   json_scanf(config_json.c_str(), config_json.size(),
-             "{name: %Q, unit: %d, update_interval: %d, offset: %f}", &cfg.name,
+             "{name: %Q, unit: %d, update_interval: %d, offset: %d", &cfg.name,
              &cfg.unit, &cfg.update_interval, &cfg.offset);
 
   mgos::ScopedCPtr name_owner((void *) cfg.name);
@@ -116,7 +116,7 @@ Status TemperatureSensor::Init() {
           return kHAPError_Busy;
         }
         float temp = static_cast<float>(tempval.ValueOrDie());
-        *value = truncf((temp + cfg_->offset) * 10) / 10;
+        *value = truncf((temp + cfg_->offset / 100) * 10) / 10;
         return kHAPError_None;
       },
 
@@ -152,13 +152,13 @@ StatusOr<std::string> TemperatureSensor::GetInfo() const {
 StatusOr<std::string> TemperatureSensor::GetInfoJSON() const {
   std::string res = mgos::JSONPrintStringf(
       "{id: %d, type: %d, name: %Q, unit: %d, "
-      "update_interval: %d, offset: %f",
+      "update_interval: %d, offset: %d, ",
       id(), type(), cfg_->name, cfg_->unit, cfg_->update_interval,
       cfg_->offset);
   auto tempval = temp_sensor_->GetTemperature();
   if (tempval.ok()) {
     mgos::JSONAppendStringf(&res, "value: %.1f",
-                            tempval.ValueOrDie() + cfg_->offset);
+                            tempval.ValueOrDie() + cfg_->offset / 100);
   } else {
     mgos::JSONAppendStringf(&res, "error: %.1f", tempval.ValueOrDie());
   }

From 8b3b2eeecdd7b2dc121ca6a3df5e624054701deb Mon Sep 17 00:00:00 2001
From: Markus Kirberg <markus@flobby.net>
Date: Wed, 16 Oct 2024 06:31:50 +0000
Subject: [PATCH 3/5] fixes

---
 src/shelly_hap_humidity_sensor.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/shelly_hap_humidity_sensor.cpp b/src/shelly_hap_humidity_sensor.cpp
index 3c1f216b..1f79f0ea 100644
--- a/src/shelly_hap_humidity_sensor.cpp
+++ b/src/shelly_hap_humidity_sensor.cpp
@@ -145,7 +145,8 @@ StatusOr<std::string> HumiditySensor::GetInfoJSON() const {
       id(), type(), cfg_->name, 2, cfg_->update_interval, cfg_->offset);
   auto tempval = hum_sensor_->GetHumidity();
   if (tempval.ok()) {
-    mgos::JSONAppendStringf(&res, "value: %.1f", tempval.ValueOrDie() + cfg_->offset / 100);
+    mgos::JSONAppendStringf(&res, "value: %.1f",
+                            tempval.ValueOrDie() + cfg_->offset / 100);
   } else {
     mgos::JSONAppendStringf(&res, "error: %.1f", tempval.ValueOrDie());
   }

From f0448f713e06e105d3548268c13793938a690b46 Mon Sep 17 00:00:00 2001
From: Markus Kirberg <markus@flobby.net>
Date: Fri, 18 Oct 2024 14:03:51 +0000
Subject: [PATCH 4/5] hide update interval for dht humidity

---
 fs_src/index.html                  | 2 +-
 fs_src/script.js                   | 2 ++
 src/shelly_hap_humidity_sensor.cpp | 4 +---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fs_src/index.html b/fs_src/index.html
index de203e10..9566da54 100644
--- a/fs_src/index.html
+++ b/fs_src/index.html
@@ -763,7 +763,7 @@ <h1 id="head">Sensor</h1>
               <option id="unit_2" value="2">&percnt;</option>
             </select>
           </div>
-          <div class="form-control">
+          <div class="form-control" id="update_interval_container">
             <label for="update_interval">Update Interval:</label>
             <input type="number" id="update_interval" min="1" max="1000" class="short"><span>&nbsp; s</span>
           </div>
diff --git a/fs_src/script.js b/fs_src/script.js
index f0336422..e48e8fca 100644
--- a/fs_src/script.js
+++ b/fs_src/script.js
@@ -794,6 +794,8 @@ function updateComponent(cd) {
       }
       updateInnerText(el(c, "value"), v);
       selectIfNotModified(el(c, "unit"), cd.unit);
+      el("update_interval_container").style.display =
+          (cd.unit == 2) ? "none" : "block";
       setValueIfNotModified(el(c, "update_interval"), cd.update_interval);
       setValueIfNotModified(el(c, "offset"), cd.offset / 100.0);
       break;
diff --git a/src/shelly_hap_humidity_sensor.cpp b/src/shelly_hap_humidity_sensor.cpp
index 1f79f0ea..f6ea3752 100644
--- a/src/shelly_hap_humidity_sensor.cpp
+++ b/src/shelly_hap_humidity_sensor.cpp
@@ -86,8 +86,7 @@ Status HumiditySensor::SetConfig(const std::string &config_json,
   }
   if (cfg_->update_interval != cfg.update_interval) {
     cfg_->update_interval = cfg.update_interval;
-    // update interval is set via temperature sensor
-    // hum_sensor_->StartUpdating(cfg_->update_interval * 1000);
+    // update interval is set via temperature sensor on DHT
   }
   return Status::OK();
 }
@@ -126,7 +125,6 @@ Status HumiditySensor::Init() {
       kHAPCharacteristicDebugDescription_CurrentRelativeHumidity);
   AddChar(current_humidity_characteristic_);
 
-  hum_sensor_->StartUpdating(cfg_->update_interval * 1000);
   return Status::OK();
 }
 

From da4db793f6ec0363c161b1cc88253624190364c4 Mon Sep 17 00:00:00 2001
From: Markus Kirberg <markus@flobby.net>
Date: Fri, 18 Oct 2024 14:06:25 +0000
Subject: [PATCH 5/5] fix shellyu/u25 building

---
 src/shelly_main.cpp   | 30 +++++++++++++++---------------
 src/shelly_output.cpp |  2 ++
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/shelly_main.cpp b/src/shelly_main.cpp
index 717fb1df..79534c57 100644
--- a/src/shelly_main.cpp
+++ b/src/shelly_main.cpp
@@ -761,28 +761,28 @@ void InitApp() {
 
   // Initialize accessory server.
   HAPAccessoryServerOptions server_options = {
-      .maxPairings = kHAPPairingStorage_MinElements,
+    .maxPairings = kHAPPairingStorage_MinElements,
 #if HAP_IP
-      .ip =
-          {
-              .transport = &kHAPAccessoryServerTransport_IP,
+    .ip =
+        {
+            .transport = &kHAPAccessoryServerTransport_IP,
 #ifndef __clang__
-              .available = 0,
+            .available = 0,
 #endif
-              .accessoryServerStorage = &s_ip_storage,
-          },
+            .accessoryServerStorage = &s_ip_storage,
+        },
 #endif
 #if HAP_BLE
-      .ble =
-          {
-              .transport = nullptr,
+    .ble =
+        {
+            .transport = nullptr,
 #ifndef __clang__
-              .available = 0,
+            .available = 0,
 #endif
-              .accessoryServerStorage = nullptr,
-              .preferredAdvertisingInterval = 0,
-              .preferredNotificationDuration = 0,
-          },
+            .accessoryServerStorage = nullptr,
+            .preferredAdvertisingInterval = 0,
+            .preferredNotificationDuration = 0,
+        },
 #endif
   };
   static struct HAPPlatformMFiTokenAuth s_mfi_auth;
diff --git a/src/shelly_output.cpp b/src/shelly_output.cpp
index a5c42e6b..d2e6cefb 100644
--- a/src/shelly_output.cpp
+++ b/src/shelly_output.cpp
@@ -83,6 +83,8 @@ Status OutputPin::SetStatePWM(float duty, const char *source) {
   }
   return Status::OK();
 #else
+  (void) duty;
+  (void) source;
   return Status::UNIMPLEMENTED();
 #endif
 }