homebridge-easy-mqtt 1.4.0-beta.1 → 1.4.0-beta.10

package/config.schema.json

@@ -21,8 +21,8 @@
           "type": {
             "type": "string",
             "title": "${config.title.type}",
-            "enum": [ "CarbonMonoxideSensor", "CarbonDioxideSensor", "ContactSensor", "HeaterCooler", "HumiditySensor", "LeakSensor", "Lightbulb", "LockMechanism", "MotionSensor", "OccupancySensor", "Outlet", "SecuritySystem", "SmokeSensor", "Switch", "TemperatureSensor", "Thermostat"],
-            "enumNames": ["${config.enumNames.carbonMonoxideSensor}", "${config.enumNames.carbonDioxideSensor}", "${config.enumNames.contactSensor}", "${config.enumNames.heaterCooler}", "${config.enumNames.humiditySensor}", "${config.enumNames.leakSensor}", "${config.enumNames.lightbulb}", "${config.enumNames.lockMechanism}", "${config.enumNames.motionSensor}", "${config.enumNames.occupancySensor}", "${config.enumNames.outlet}", "${config.enumNames.securitySystem}", "${config.enumNames.smokeSensor}", "${config.enumNames.switch}",  "${config.enumNames.temperatureSensor}", "${config.enumNames.thermostat}"],
+            "enum": [ "AirPurifier", "CarbonMonoxideSensor", "CarbonDioxideSensor", "ContactSensor", "HeaterCooler", "HumiditySensor", "LeakSensor", "Lightbulb", "LightSensor", "LockMechanism", "MotionSensor", "OccupancySensor", "Outlet", "SecuritySystem", "SmokeSensor", "Switch", "TemperatureSensor", "Thermostat", "Valve"],
+            "enumNames": ["${config.enumNames.airPurifier}", "${config.enumNames.carbonMonoxideSensor}", "${config.enumNames.carbonDioxideSensor}", "${config.enumNames.contactSensor}", "${config.enumNames.heaterCooler}", "${config.enumNames.humiditySensor}", "${config.enumNames.leakSensor}", "${config.enumNames.lightbulb}", "${config.enumNames.lightSensor}", "${config.enumNames.lockMechanism}", "${config.enumNames.motionSensor}", "${config.enumNames.occupancySensor}", "${config.enumNames.outlet}", "${config.enumNames.securitySystem}", "${config.enumNames.smokeSensor}", "${config.enumNames.switch}",  "${config.enumNames.temperatureSensor}", "${config.enumNames.thermostat}", "${config.enumNames.valve}"],
             "required": true
           },
           "group": {
@@ -53,8 +53,9 @@
           "broker": {
             "type": "string",
             "title": "${config.title.broker}",
+            "description": "${config.description.broker}",
             "placeholder": "mqtts://192.168.0.1:1883",
-            "required": true
+            "pattern": "^(https?|mqtts?|wss?|ftp):\\/\\/([\\w.-]+)(:\\d+)?(\\/.*)?$"
           },
           "username": {
             "type": "string",
@@ -68,7 +69,22 @@
             "type": "string",
             "title": "${config.title.options}",
             "description": "${config.description.options}",
-            "placeholder": "{ \"protocolVersion\": \"4\", \"clientId\": \"my-client-id\", \"rejectUnauthorized\": true }"
+            "placeholder": "{ \"protocolVersion\": \"4\", \"clientId\": \"my-client-id\", \"rejectUnauthorized\": true }",
+            "pattern": "^\\{\\s*(?:\"[^\"\\\\\\r\\n]*\"\\s*:\\s*(?:\"[^\"\\\\\\r\\n]*\"|[0-9.+-eE]+|true|false|null)\\s*,\\s*)*(?:\"[^\"\\\\\\r\\n]*\"\\s*:\\s*(?:\"[^\"\\\\\\r\\n]*\"|[0-9.+-eE]+|true|false|null)\\s*)?\\}$"
+          },
+          "onConnect": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "properties": {
+                "topic": {
+                  "type": "string"
+                },
+                "message": {
+                  "type": "string"
+                }
+              }
+            }
           }
         }
       },
@@ -108,9 +124,16 @@
             },
             "temperatureUnits": {
               "type": "string",
+              "title": "${config.title.sourceUnits}",
               "enum": ["C", "F"],
               "enumNames": ["${config.enumNames.celsius}", "${config.enumNames.fahrenheit}"]
             },
+            "valveType": {
+              "type": "string",
+              "title": "${config.title.valveType}",
+              "enum": ["GENERIC_VALVE", "IRRIGATION", "SHOWER_HEAD", "WATER_FAUCET"],
+              "enumNames": ["${config.enumNames.valveGeneric}", "${config.enumNames.valveIrrigation}", "${config.enumNames.valveShower}", "${config.enumNames.valveFaucet}"]
+            },
             "topicGetBatteryLevel": {
               "type": "string",
               "title": "${config.title.topicGetBatteryLevel}"
@@ -235,6 +258,10 @@
               "type": "string",
               "title": "${config.title.topicGetLeakDetected}"
             },
+            "topicGetCurrentAmbientLightLevel": {
+              "type": "string",
+              "title": "${config.title.topicGetCurrentAmbientLightLevel}"
+            },
             "topicGetMotionDetected": {
               "type": "string",
               "title": "${config.title.topicGetMotionDetected}"
@@ -339,6 +366,62 @@
               "type": "string",
               "title": "${config.title.topicSetTargetHeaterCoolerState}"
             },
+            "topicGetValveActive": {
+              "type": "string",
+              "title": "${config.title.topicGetValveActive}"
+            },
+            "topicSetValveActive": {
+              "type": "string",
+              "title": "${config.title.topicSetValveActive}"
+            },
+            "topicGetValveInUse": {
+              "type": "string",
+              "title": "${config.title.topicGetValveInUse}"
+            },
+            "topicGetValveIsConfigured": {
+              "type": "string",
+              "title": "${config.title.topicGetValveIsConfigured}"
+            },
+            "topicSetValveIsConfigured": {
+              "type": "string",
+              "title": "${config.title.topicSetValveIsConfigured}"
+            },
+            "topicGetValveRemainingDuration": {
+              "type": "string",
+              "title": "${config.title.topicGetValveRemainingDuration}"
+            },
+            "topicGetValveSetDuration": {
+              "type": "string",
+              "title": "${config.title.topicGetValveSetDuration}"
+            },
+            "topicSetValveSetDuration": {
+              "type": "string",
+              "title": "${config.title.topicSetValveSetDuration}"
+            },
+            "topicGetCurrentPurifierState": {
+              "type": "string",
+              "title": "${config.title.topicGetCurrentPurifierState}"
+            },
+            "topicGetTargetPurifierState": {
+              "type": "string",
+              "title": "${config.title.topicGetTargetPurifierState}"
+            },
+            "topicSetTargetPurifierState": {
+              "type": "string",
+              "title": "${config.title.topicSetTargetPurifierState}"
+            },
+            "topicGetFilterChangeIndication": {
+              "type": "string",
+              "title": "${config.title.topicGetFilterChangeIndication}"
+            },
+            "topicGetFilterLifeLevel": {
+              "type": "string",
+              "title": "${config.title.topicGetFilterLifeLevel}"
+            },
+            "topicResetFilterIndication": {
+              "type": "string",
+              "title": "${config.title.topicResetFilterIndication}"
+            },
             "valueBatteryLow": {
               "type": "string",
               "title": "${config.title.valueBatteryLow}"
@@ -475,11 +558,564 @@
               "type": "string",
               "title": "${config.title.valueSwingDisabled}"
             },
+            "valueActive": {
+              "type": "string",
+              "title": "${config.title.valueActive}"
+            },
+            "valueConfigured": {
+              "type": "string",
+              "title": "${config.title.valueConfigured}"
+            },
+            "valueNotConfigured": {
+              "type": "string",
+              "title": "${config.title.valueNotConfigured}"
+            },
+            "valueInUse": {
+              "type": "string",
+              "title": "${config.title.valueInUse}"
+            },
+            "valueInactive": {
+              "type": "string",
+              "title": "${config.title.valueInactive}"
+            },
+            "valueModeManual": {
+              "type": "string",
+              "title": "${config.title.valueModeManual}"
+            },
+            "valueModePurifying": {
+              "type": "string",
+              "title": "${config.title.valueModePurifying}"
+            },
+            "valueFilterChange": {
+              "type": "string",
+              "title": "${config.title.valueFilterChange}"
+            },
+            "valueFilterReset": {
+              "type": "string",
+              "title": "${config.title.valueFilterReset}"
+            },
             "disableLogging": {
               "type": "boolean",
               "title": "${config.title.disableLogging}"
             }
-          }
+          },
+          "allOf": [
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "enum": ["Lightbulb", "Outlet", "Switch"]
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetOn", "topicSetOn", "valueOn", "valueOff"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "CarbonDioxideSensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetCarbonDioxideDetected", "valueCarbonDioxideDetected"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "CarbonMonoxideSensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetCarbonMonoxideDetected", "valueCarbonMonoxideDetected"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "ContactSensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetContactSensorState", "valueContactDetected"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "HumiditySensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetCurrentRelativeHumidity"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "LeakSensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetLeakDetected", "valueLeakDetected"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "LightSensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetCurrentAmbientLightLevel"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "MotionSensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetMotionDetected", "valueMotionDetected"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "OccupancySensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetOccupancyDetected", "valueOccupancyDetected"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "SmokeSensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetSmokeDetected", "valueSmokeDetected"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "TemperatureSensor"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetCurrentTemperature"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "AirPurifier"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetActive", "topicSetActive", "topicGetCurrentPurifierState", "topicGetTargetPurifierState", "topicSetTargetPurifierState", "valueStateActive", "valueStateInactive"],
+                "anyOf": [
+                  { "required": ["valueModeIdle"] },
+                  { "required": ["valueModeInactive"] },
+                  { "required": ["valueModePurifying"] }
+                ]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "AirPurifier"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "anyOf": [
+                  { "required": ["valueModeAuto"] },
+                  { "required": ["valueModeManual"] }
+                ]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "HeaterCooler"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetActive", "topicSetActive", "topicGetCurrentHeaterCoolerState", "topicGetCurrentTemperature", "topicGetTargetHeaterCoolerState", "topicSetTargetHeaterCoolerState", "valueStateActive", "valueStateInactive"],
+                "anyOf": [
+                  { "required": ["valueModeCool"] },
+                  { "required": ["valueModeHeat"] },
+                  { "required": ["valueModeIdle"] },
+                  { "required": ["valueModeInactive"] }
+                ]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "HeaterCooler"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "anyOf": [
+                  { "required": ["valueModeAuto"] },
+                  { "required": ["valueModeHeat"] },
+                  { "required": ["valueModeCool"] }
+                ]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "Thermostat"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetCurrentHeatingCoolingState", "topicGetTargetHeatingCoolingState", "topicSetTargetHeatingCoolingState", "topicGetCurrentTemperature", "topicGetTargetTemperature", "topicSetTargetTemperature"],
+                "anyOf": [
+                  { "required": ["valueModeCool"] },
+                  { "required": ["valueModeHeat"] },
+                  { "required": ["valueModeOff"] }
+                ]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "LockMechanism"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetCurrentLockState", "topicGetTargetLockState", "topicSetTargetLockState", "valueLockStateSecured", "valueLockStateUnsecured"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "SecuritySystem"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetCurrentSecurityState", "topicGetTargetSecurityState", "topicSetTargetSecurityState"],
+                "anyOf": [
+                  { "required": ["valueArmStay"] },
+                  { "required": ["valueArmAway"] },
+                  { "required": ["valueArmNight"] },
+                  { "required": ["valueDisarm"] }
+                ]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "info": {
+                    "properties": {
+                      "type" : {
+                        "const": "Valve"
+                      }
+                    }
+                  }
+                }
+              },
+              "then": {
+                "required": ["topicGetValveActive", "topicGetValveInUse", "topicSetValveActive", "valueActive", "valueInactive", "valueInUse"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetLockPhysicalControls": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetLockPhysicalControls"]
+              },
+              "then": {
+                "required": ["valueControlLock"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicSetLockPhysicalControls": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicSetLockPhysicalControls"]
+              },
+              "then": {
+                "required": ["valueControlLock", "valueControlUnlock"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetSwingMode": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetSwingMode"]
+              },
+              "then": {
+                "required": ["valueSwingEnabled"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicSetSwingMode": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicSetSwingMode"]
+              },
+              "then": {
+                "required": ["valueSwingEnabled", "valueSwingDisabled"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetBatteryLow": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetBatteryLow"]
+              },
+              "then": {
+                "required": ["valueBatteryLow"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetStatusActive": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetStatusActive"]
+              },
+              "then": {
+                "required": ["valueStatusActive"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetStatusFault": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetStatusFault"]
+              },
+              "then": {
+                "required": ["valueFault"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetStatusTampered": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetStatusTampered"]
+              },
+              "then": {
+                "required": ["valueTampered"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetOutletInUse": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetOutletInUse"]
+              },
+              "then": {
+                "required": ["valueOutletInUse"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetValveIsConfigured": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetValveIsConfigured"]
+              },
+              "then": {
+                "required": ["valueConfigured"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicSetValveIsConfigured": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicSetValveIsConfigured"]
+              },
+              "then": {
+                "required": ["valueConfigured", "valueNotConfigured"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetFilterChangeIndication": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetFilterChangeIndication"]
+              },
+              "then": {
+                "required": ["valueFilterChange"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicGetFilterLifeLevel": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicGetFilterLifeLevel"]
+              },
+              "then": {
+                "required": ["topicGetFilterChangeIndication"]
+              }
+            },
+            {
+              "if": {
+                "properties": {
+                  "topicResetFilterIndication": {
+                    "minLength": 1
+                  }
+                },
+                "required": ["topicResetFilterIndication"]
+              },
+              "then": {
+                "required": ["topicGetFilterChangeIndication", "valueFilterReset"]
+              }
+            }
+          ]
         },
         "default": []
       },
@@ -519,6 +1155,26 @@
                 }
               ]
             },
+            {
+              "type": "fieldset",
+              "notitle": true,
+              "condition": {
+                "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Valve';"
+              },
+              "items": [
+                {
+                  "type": "div",
+                  "displayFlex": true,
+                  "flex-direction": "row",
+                  "items": [
+                    {
+                      "key": "accessories[].valveType",
+                      "flex": "0 0 33%"
+                    }
+                  ]
+                }
+              ]
+            },
             "accessories[].mqtt.broker",
             {
               "type": "div",
@@ -558,7 +1214,87 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetCurrentLockState",
+                          "key": "accessories[].topicGetCurrentLockState",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetTargetLockState",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetTargetLockState",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Valve';"
+                  },
+                  "items": [
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetValveActive",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetValveActive",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetValveInUse",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetValveIsConfigured",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetValveIsConfigured",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetValveSetDuration",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicSetValveSetDuration",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -569,11 +1305,18 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetTargetLockState",
+                          "key": "accessories[].topicGetValveRemainingDuration",
                           "flex": "0 0 50%"
-                        },
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
                         {
-                          "key": "accessories[].topicSetTargetLockState",
+                          "key": "accessories[].topicGetStatusFault",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -831,7 +1574,7 @@
                   "type": "fieldset",
                   "notitle": true,
                   "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'HeaterCooler';"
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'AirPurifier';"
                   },
                   "items": [
                     {
@@ -840,13 +1583,8 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetCurrentTemperature",
+                          "key": "accessories[].topicGetCurrentPurifierState",
                           "flex": "0 0 50%"
-                        },
-                        {
-                          "key": "accessories[].temperatureUnits",
-                          "title": "${config.title.sourceUnits}",
-                          "flex": "0 0 25%"
                         }
                       ]
                     },
@@ -856,23 +1594,36 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetActive",
+                          "key": "accessories[].topicGetTargetPurifierState",
                           "flex": "0 0 50%"
                         },
                         {
-                          "key": "accessories[].topicSetActive",
+                          "key": "accessories[].topicSetTargetPurifierState",
                           "flex": "0 0 50%"
                         }
                       ]
-                    },
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'HeaterCooler';"
+                  },
+                  "items": [
                     {
                       "type": "div",
                       "displayFlex": true,
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetCurrentHeaterCoolerState",
+                          "key": "accessories[].topicGetCurrentTemperature",
                           "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].temperatureUnits",
+                          "flex": "0 0 25%"
                         }
                       ]
                     },
@@ -882,11 +1633,7 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetTargetHeaterCoolerState",
-                          "flex": "0 0 50%"
-                        },
-                        {
-                          "key": "accessories[].topicSetTargetHeaterCoolerState",
+                          "key": "accessories[].topicGetCurrentHeaterCoolerState",
                           "flex": "0 0 50%"
                         }
                       ]
@@ -897,30 +1644,48 @@
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetCoolingThresholdTemperature",
+                          "key": "accessories[].topicGetTargetHeaterCoolerState",
                           "flex": "0 0 50%"
                         },
                         {
-                          "key": "accessories[].topicSetCoolingThresholdTemperature",
+                          "key": "accessories[].topicSetTargetHeaterCoolerState",
                           "flex": "0 0 50%"
                         }
                       ]
-                    },
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return ['AirPurifier', 'HeaterCooler'].includes(model.accessories?.[arguments[1]]?.info?.type);"
+                  },
+                  "items": [
                     {
                       "type": "div",
                       "displayFlex": true,
                       "flex-direction": "row",
                       "items": [
                         {
-                          "key": "accessories[].topicGetHeatingThresholdTemperature",
+                          "key": "accessories[].topicGetActive",
                           "flex": "0 0 50%"
                         },
                         {
-                          "key": "accessories[].topicSetHeatingThresholdTemperature",
+                          "key": "accessories[].topicSetActive",
                           "flex": "0 0 50%"
                         }
                       ]
-                    },
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return ['AirPurifier', 'HeaterCooler'].includes(model.accessories?.[arguments[1]]?.info?.type);"
+                  },
+                  "items": [
                     {
                       "type": "div",
                       "displayFlex": true,
@@ -996,6 +1761,20 @@
                     }
                   ]
                 },
+                {
+                  "type": "div",
+                  "displayFlex": true,
+                  "flex-direction": "row",
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'LightSensor';"
+                  },
+                  "items": [
+                    {
+                      "key": "accessories[].topicGetCurrentAmbientLightLevel",
+                      "flex": "0 0 50%"
+                    }
+                  ]
+                },
                 {
                   "type": "div",
                   "displayFlex": true,
@@ -1052,7 +1831,6 @@
                     },
                     {
                       "key": "accessories[].temperatureUnits",
-                      "title": "${config.title.sourceUnits}",
                       "flex": "0 0 33%"
                     }
                   ]
@@ -1101,7 +1879,6 @@
                         },
                         {
                           "key": "accessories[].temperatureUnits",
-                          "title": "${config.title.sourceUnits}",
                           "flex": "0 0 25%"
                         }
                       ]
@@ -1147,7 +1924,16 @@
                           "flex": "0 0 50%"
                         }
                       ]
-                    },
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return ['HeaterCooler', 'Thermostat'].includes(model.accessories?.[arguments[1]]?.info?.type);"
+                  },
+                  "items": [
                     {
                       "type": "div",
                       "displayFlex": true,
@@ -1180,6 +1966,41 @@
                     }
                   ]
                 },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return ['AirPurifier', 'HeaterCooler', 'Thermostat'].includes(model.accessories?.[arguments[1]]?.info?.type);"
+                  },
+                  "items": [
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicGetFilterChangeIndication",
+                          "flex": "0 0 50%"
+                        },
+                        {
+                          "key": "accessories[].topicGetFilterLifeLevel",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].topicResetFilterIndication",
+                          "flex": "0 0 50%"
+                        }
+                      ]
+                    }
+                  ]
+                },
                 {
                   "type": "div",
                   "displayFlex": true,
@@ -1229,15 +2050,16 @@
             {
               "type": "fieldset",
               "title": "${config.title.values}",
+              "description": "${config.description.values}",
               "condition": {
                 "functionBody": "return model.accessories?.[arguments[1]]?.info?.type !== undefined;"
               },
               "items": [
-                  {
+                {
                   "type": "fieldset",
                   "notitle": true,
                   "condition": {
-                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'HeaterCooler';"
+                    "functionBody": "return ['AirPurifier', 'HeaterCooler'].includes(model.accessories?.[arguments[1]]?.info?.type);"
                   },
                   "items": [
                     {
@@ -1254,7 +2076,52 @@
                           "flex": "0 0 20%"
                         }
                       ]
-                    },
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'AirPurifier';"
+                  },
+                  "items": [
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].valueModeAuto",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueModeManual",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueModePurifying",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueModeIdle",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueModeInactive",
+                          "flex": "0 0 20%"
+                        }
+                      ]
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'HeaterCooler';"
+                  },
+                  "items": [
                     {
                       "type": "div",
                       "displayFlex": true,
@@ -1281,7 +2148,16 @@
                           "flex": "0 0 20%"
                         }
                       ]
-                    },
+                    }
+                  ]
+                },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return ['AirPurifier', 'HeaterCooler'].includes(model.accessories?.[arguments[1]]?.info?.type);"
+                  },
+                  "items": [
                     {
                       "type": "div",
                       "displayFlex": true,
@@ -1307,6 +2183,30 @@
                     }
                   ]
                 },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return ['AirPurifier', 'HeaterCooler', 'Thermostat'].includes(model.accessories?.[arguments[1]]?.info?.type);"
+                  },
+                  "items": [
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].valueFilterChange",
+                          "flex": "0 0 20%"
+                        },
+                        {
+                          "key": "accessories[].valueFilterReset",
+                          "flex": "0 0 20%"
+                        }
+                      ]
+                    }
+                  ]
+                },
                 {
                   "type": "div",
                   "displayFlex": true,
@@ -1329,6 +2229,53 @@
                     }
                   ]
                 },
+                {
+                  "type": "fieldset",
+                  "notitle": true,
+                  "condition": {
+                    "functionBody": "return model.accessories?.[arguments[1]]?.info?.type === 'Valve';"
+                  },
+                  "items": [
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].valueActive",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valueInactive",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valueInUse",
+                          "flex": "0 0 25%"
+                        }
+                      ]
+                    },
+                    {
+                      "type": "div",
+                      "displayFlex": true,
+                      "flex-direction": "row",
+                      "items": [
+                        {
+                          "key": "accessories[].valueConfigured",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valueNotConfigured",
+                          "flex": "0 0 25%"
+                        },
+                        {
+                          "key": "accessories[].valueFault",
+                          "flex": "0 0 25%"
+                        }
+                      ]
+                    }
+                  ]
+                },
                 {
                   "type": "div",
                   "displayFlex": true,