rebase onto current master

Author: markirb

fs_src/index.html

@@ -454,6 +454,7 @@ <h1 id="head">Switch</h1>
             <label for="power_stats_total">Total:</label>
             <span id="power_stats_total"></span>
           </div>
+        </div>
         <div>
           <div class="form-control">
             <label for="name">Name:</label>

fs_src/script.js

@@ -691,6 +691,11 @@ function updateComponent(cd) {
       setValueIfNotModified(el(c, "name"), cd.name);
       el(c, "state").checked = cd.state;
       updatePowerStats(c, cd);
+      if (cd.type == Component_Type.kSwitch ||
+          cd.type == Component_Type.kOutlet) {
+        el(c, "hk_state_inverted_container").style.display = "block";
+        checkIfNotModified(el(c, "hk_state_inverted"), cd.hk_state_inverted);
+      }
       if (cd.type == Component_Type.kLightBulb) {
         checkIfNotModified(el(c, "svc_hidden"), cd.svc_hidden);
         if (cd.hap_optional !== undefined && cd.hap_optional == 0) {

src/shelly_switch.cpp

@@ -384,8 +384,8 @@ void ShellySwitch::AddPowerMeter(uint16_t *iid) {
   // Power
   power_char_ = new mgos::hap::FloatCharacteristic(
       (*iid)++, &kHAPCharacteristic_EveConsumption, 0.0f, 65535.0f, 0.1f,
-      [this](HAPAccessoryServerRef *,
-             const HAPFloatCharacteristicReadRequest *, float *value) {
+      [this](HAPAccessoryServerRef *, const HAPFloatCharacteristicReadRequest *,
+             float *value) {
         auto power = out_pm_->GetPowerW();
         if (!power.ok()) return kHAPError_Busy;
         *value = power.ValueOrDie();
@@ -396,8 +396,8 @@ void ShellySwitch::AddPowerMeter(uint16_t *iid) {
   // Energy
   total_power_char_ = new mgos::hap::FloatCharacteristic(
       (*iid)++, &kHAPCharacteristic_EveTotalConsumption, 0.0f, 65535.0f, 0.1f,
-      [this](HAPAccessoryServerRef *,
-             const HAPFloatCharacteristicReadRequest *, float *value) {
+      [this](HAPAccessoryServerRef *, const HAPFloatCharacteristicReadRequest *,
+             float *value) {
         auto energy = out_pm_->GetEnergyWH();
         if (!energy.ok()) return kHAPError_Busy;
         *value = energy.ValueOrDie() / 1000.0f;
@@ -414,15 +414,15 @@ void ShellySwitch::PowerMeterTimerCB() {
   auto current_power = out_pm_->GetPowerW();
   auto current_total_power = out_pm_->GetEnergyWH();
 
-  // if (current_power.ok() && current_power.ValueOrDie() != last_power_) {
-    // last_power_ = current_power.ValueOrDie();
+  if (current_power.ok() && current_power.ValueOrDie() != last_power_) {
+    last_power_ = current_power.ValueOrDie();
     power_char_->RaiseEvent();
-  // }
-  // if (current_total_power.ok() &&
-  //     current_total_power.ValueOrDie() != last_total_power_) {
-    // last_total_power_ = current_total_power.ValueOrDie();
+  }
+  if (current_total_power.ok() &&
+      current_total_power.ValueOrDie() != last_total_power_) {
+    last_total_power_ = current_total_power.ValueOrDie();
     total_power_char_->RaiseEvent();
-  // }
+  }
 }
 
 }  // namespace shelly