Merge branch 'refactor2'

This commit is contained in:
Andre Basche
2023-06-22 00:03:07 +02:00
11 changed files with 291 additions and 122 deletions

View File

@ -4,7 +4,7 @@ class ApplianceBase:
def attributes(self, data):
program_name = "No Program"
if program := int(data["parameters"].get("prCode", "0")):
if program := int(str(data.get("parameters", {}).get("prCode", "0"))):
if start_cmd := self.parent.settings.get("startProgram.program"):
if ids := start_cmd.ids:
program_name = ids.get(program, program_name)

View File

@ -5,6 +5,6 @@ class Appliance(ApplianceBase):
def attributes(self, data):
data = super().attributes(data)
if data.get("lastConnEvent", {}).get("category", "") == "DISCONNECTED":
data["parameters"]["machMode"] = "0"
data["parameters"]["machMode"].value = "0"
data["active"] = bool(data.get("activity"))
return data

View File

@ -5,10 +5,10 @@ class Appliance(ApplianceBase):
def attributes(self, data):
data = super().attributes(data)
if data.get("lastConnEvent", {}).get("category", "") == "DISCONNECTED":
data["parameters"]["temp"] = "0"
data["parameters"]["onOffStatus"] = "0"
data["parameters"]["remoteCtrValid"] = "0"
data["parameters"]["remainingTimeMM"] = "0"
data["parameters"]["temp"].value = "0"
data["parameters"]["onOffStatus"].value = "0"
data["parameters"]["remoteCtrValid"].value = "0"
data["parameters"]["remainingTimeMM"].value = "0"
data["active"] = data["parameters"]["onOffStatus"] == "1"

View File

@ -6,7 +6,7 @@ class Appliance(ApplianceBase):
def attributes(self, data):
data = super().attributes(data)
if data.get("lastConnEvent", {}).get("category", "") == "DISCONNECTED":
data["parameters"]["machMode"] = "0"
data["parameters"]["machMode"].value = "0"
data["active"] = bool(data.get("activity"))
data["pause"] = data["parameters"]["machMode"] == "3"
return data

View File

@ -5,7 +5,7 @@ class Appliance(ApplianceBase):
def attributes(self, data):
data = super().attributes(data)
if data.get("lastConnEvent", {}).get("category", "") == "DISCONNECTED":
data["parameters"]["machMode"] = "0"
data["parameters"]["machMode"].value = "0"
data["active"] = bool(data.get("activity"))
data["pause"] = data["parameters"]["machMode"] == "3"
return data

View File

@ -5,7 +5,7 @@ class Appliance(ApplianceBase):
def attributes(self, data):
data = super().attributes(data)
if data.get("lastConnEvent", {}).get("category", "") == "DISCONNECTED":
data["parameters"]["machMode"] = "0"
data["parameters"]["machMode"].value = "0"
data["active"] = bool(data.get("activity"))
data["pause"] = data["parameters"]["machMode"] == "3"
return data