Extend tumble dryer support

custom_components/candy/client/model.py

@@ -10,7 +10,8 @@ class MachineState(Enum):
     DELAYED_START_SELECTION = 4
     DELAYED_START_PROGRAMMED = 5
     ERROR = 6
-    FINISHED = 7
+    FINISHED1 = 7
+    FINISHED2 = 8
 
     def __str__(self):
         if self == MachineState.IDLE:
@@ -25,7 +26,7 @@ def __str__(self):
             return "Delayed start programmed"
         elif self == MachineState.ERROR:
             return "Error"
-        elif self == MachineState.FINISHED:
+        elif self == MachineState.FINISHED1 or self == MachineState.FINISHED2:
             return "Finished"
         else:
             return "%s" % self
@@ -73,12 +74,13 @@ def __str__(self):
 
 class DryerProgramState(Enum):
     STOPPED = 0
-
-    # TODO: values
+    RUNNING = 2
 
     def __str__(self):
         if self == DryerProgramState.STOPPED:
             return "Stopped"
+        elif self == DryerProgramState.RUNNING:
+            return "Running"
         else:
             return "%s" % self
 
@@ -115,15 +117,28 @@ class TumbleDryerStatus:
     program: int
     remaining_minutes: int
     remote_control: bool
+    dry_level: int
+    refresh: bool
+    need_clean_filter: bool
+    full_water_tank: bool
+    drylevel_selected: int
+    door_close: bool
 
     @classmethod
     def from_json(cls, json):
         return cls(
             machine_state=MachineState(int(json["StatoTD"])),  # TODO?
             program_state=DryerProgramState(int(json["PrPh"])),
             program=int(json["Pr"]),
-            remaining_minutes=int(json["RemTime"]),  # TODO: minutes or seconds?
+            remaining_minutes=int(json["RemTime"]),
             remote_control=json["StatoWiFi"] == "1",
+            dry_level=int(json["DryLev"]),
+            refresh=json["Refresh"] == "1",
+            need_clean_filter=json["CleanFilter"] == "1",
+            full_water_tank=json["WaterTankFull"] == "1",
+            drylevel_selected=int(json["DryingManagerLevel"]),
+            door_close=json["DoorState"] == "1",
+
         )
 
 

custom_components/candy/const.py

@@ -12,6 +12,9 @@
 UNIQUE_ID_WASH_CYCLE_STATUS = "{0}-wash_cycle_status"
 UNIQUE_ID_WASH_REMAINING_TIME = "{0}-wash_remaining_time"
 UNIQUE_ID_TUMBLE_DRYER = "{0}-tumble_dryer"
+UNIQUE_ID_TUMBLE_CYCLE_STATUS = "{0}-tumble_cycle_status"
+UNIQUE_ID_TUMBLE_REMAINING_TIME = "{0}-tumble_remaining_time"
+
 UNIQUE_ID_OVEN = "{0}-oven"
 UNIQUE_ID_OVEN_TEMP = "{0}-oven-temp"
 

custom_components/candy/sensor.py

@@ -27,7 +27,9 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
         ])
     elif type(coordinator.data) is TumbleDryerStatus:
         async_add_entities([
-            CandyTumbleDryerSensor(coordinator, config_id)
+            CandyTumbleDryerSensor(coordinator, config_id),
+            CandyTumbleStatusSensor(coordinator, config_id),
+            CandyTumbleRemainingTimeSensor(coordinator, config_id)
         ])
     elif type(coordinator.data) is OvenStatus:
         async_add_entities([
@@ -197,11 +199,76 @@ def extra_state_attributes(self) -> Mapping[str, Any]:
             "program": status.program,
             "remaining_minutes": status.remaining_minutes,
             "remote_control": status.remote_control,
+            "dry_level": status.dry_level,
+            "dry_level_now": status.drylevel_selected,
+            "refresh": status.refresh,
+            "need_clean_filter": status.need_clean_filter,
+            "watertank_full": status.full_water_tank,
+            "door_close": status.door_close,
         }
 
         return attributes
 
 
+class CandyTumbleStatusSensor(CandyBaseSensor):
+
+    def device_name(self) -> str:
+        return DEVICE_NAME_TUMBLE_DRYER
+
+    def suggested_area(self) -> str:
+        return SUGGESTED_AREA_BATHROOM
+
+    @property
+    def name(self) -> str:
+        return "Dryer cycle status"
+
+    @property
+    def unique_id(self) -> str:
+        return UNIQUE_ID_TUMBLE_CYCLE_STATUS.format(self.config_id)
+
+    @property
+    def state(self) -> StateType:
+        status: TumbleDryerStatus = self.coordinator.data
+        return str(status.program_state)
+
+    @property
+    def icon(self) -> str:
+        return "mdi:tumble-dryer"
+
+
+class CandyTumbleRemainingTimeSensor(CandyBaseSensor):
+
+    def device_name(self) -> str:
+        return DEVICE_NAME_TUMBLE_DRYER
+
+    def suggested_area(self) -> str:
+        return SUGGESTED_AREA_BATHROOM
+
+    @property
+    def name(self) -> str:
+        return "Dryer cycle remaining time"
+
+    @property
+    def unique_id(self) -> str:
+        return UNIQUE_ID_TUMBLE_REMAINING_TIME.format(self.config_id)
+
+    @property
+    def state(self) -> StateType:
+        status: TumbleDryerStatus = self.coordinator.data
+        if status.machine_state in [MachineState.RUNNING, MachineState.PAUSED]:
+            return status.remaining_minutes
+        else:
+            return 0
+
+    @property
+    def unit_of_measurement(self) -> str:
+        return TIME_MINUTES
+
+    @property
+    def icon(self) -> str:
+        return "mdi:progress-clock"
+
+
 class CandyOvenSensor(CandyBaseSensor):
 
     def device_name(self) -> str:

custom_components/candy/translations/it.json

@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Il dispositivo è già configurato"
+        },
+        "error": {
+            "unknown": "Errore sconosciuto"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "Indirizzo IP del dispositivo",
+                    "password": "Chiave di crittografia",
+                    "use_encryption": "Utilizza chiave di crittografia"
+                }
+            }
+        }
+    },
+    "title": "Candy"
+}

custom_components/candy/translations/sensor.it.json

@@ -0,0 +1,24 @@
+{
+  "state": {
+    "_": {
+      "Idle": "Inattiva",
+      "Running": "In corso",
+      "Paused": "In pausa",
+      "Delayed start selection": "Partenza ritardata scelta",
+      "Delayed start programmed": "Partenza ritardata programmata",
+      "Error": "Errore",
+      "Finished": "Completato",
+      "Stopped": "Fermato",
+      "Pre-wash": "Pre-lavaggio",
+      "Wash": "In lavaggio",
+      "Rinse": "Sto risciacquando",
+      "Last rinse": "Ultimo risciacquo",
+      "End": "Finito",
+      "Drying": "Asciugo",
+      "Steam": "In vapore",
+      "Spin - Good Night": "In centrifuga - Modalità Notte",
+      "Spin": "In centrifuga",
+      "Heating": "Sto riscaldando"
+    }
+  }
+}

tests/test_sensor_tumble_dryer.py

@@ -18,6 +18,12 @@ async def test_main_sensor_idle(hass: HomeAssistant, aioclient_mock: AiohttpClie
         'program': 1,
         'remaining_minutes': 150,
         'remote_control': True,
+        'dry_level': 2,
+        'dry_level_now': 1,
+        'refresh': False,
+        'need_clean_filter': False,
+        'watertank_full': False,
+        'door_close': True,
         'friendly_name': 'Tumble dryer',
         'icon': 'mdi:tumble-dryer'
     }