Merge branch 'master' into improve-pm

Author: timoschilling

fs_src/script.js

@@ -726,8 +726,19 @@ function updateComponent(cd) {
       if (cd.type == Component_Type.kLightBulb) {
         if (cd.bulb_type == LightBulbController_BulbType.kCCT) {
           headText = "CCT";
+          if (lastInfo.model == "ShellyRGBW2") {
+            if (cd.id == 1) {
+              headText += " R/G";
+            } else {
+              headText += " B/W";
+            }
+          }
         } else if (cd.bulb_type == LightBulbController_BulbType.kRGBW) {
-          headText = "RGB";
+          if (lastInfo.sys_mode == 4) {
+            headText = "RGBW";
+          } else {
+            headText = "RGB";
+          }
         } else {
           headText = "Light";
         }

src/shelly_switch.cpp

@@ -370,8 +370,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();
@@ -382,8 +382,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();