add: new washer type 223

config.schema.json

@@ -115,6 +115,10 @@
             "title": "Enable program finished trigger?",
             "type": "boolean"
           },
+          "washer_tub_clean": {
+            "title": "Enable Tub Clean Event",
+            "type": "boolean"
+          },
           "washer_trigger": {
             "title": "Enable program finished trigger?",
             "type": "boolean"
@@ -304,10 +308,11 @@
               "expanded": false,
               "items": [
                 "devices[].washer_trigger",
+                "devices[].washer_tub_clean",
                 "devices[].washer_door_lock"
               ],
               "condition": {
-                "functionBody": "return model.devices && model.devices[arrayIndices] && ['WASHER','WASHER_NEW', 'WASH_TOWER', 'DRYER'].includes(model.devices[arrayIndices].type);"
+                "functionBody": "return model.devices && model.devices[arrayIndices] && ['WASHER','WASHER_NEW', 'WASH_TOWER', 'DRYER', 'WASH_TOWER_2'].includes(model.devices[arrayIndices].type);"
               }
             },
             {

src/devices/WasherDryer.ts

@@ -28,7 +28,6 @@ export default class WasherDryer extends baseDevice {
         OccupancySensor,
         LockMechanism,
         Valve,
-        StatelessProgrammableSwitch,
       },
       Characteristic,
       Characteristic: {
@@ -47,12 +46,6 @@ export default class WasherDryer extends baseDevice {
 
     this.serviceWasherDryer.getCharacteristic(Characteristic.Active)
       .onSet(this.setActive.bind(this))
-      .setProps({
-        perms: [
-          Perms.PAIRED_READ,
-          Perms.NOTIFY,
-        ],
-      })
       .updateValue(Characteristic.Active.INACTIVE);
     this.serviceWasherDryer.setCharacteristic(Characteristic.Name, device.name);
     this.serviceWasherDryer.setCharacteristic(Characteristic.ValveType, Characteristic.ValveType.WATER_FAUCET);
@@ -85,14 +78,15 @@ export default class WasherDryer extends baseDevice {
       accessory.removeService(this.serviceDoorLock);
     }
 
-    this.serviceEventFinished = accessory.getService(OccupancySensor);
+    this.serviceEventFinished = accessory.getService('Program Finished');
     if (this.config.washer_trigger as boolean) {
       if (!this.serviceEventFinished) {
         this.serviceEventFinished = accessory.addService(OccupancySensor, 'Program Finished', 'Program Finished');
         this.serviceEventFinished.addOptionalCharacteristic(Characteristic.ConfiguredName);
         this.serviceEventFinished.updateCharacteristic(Characteristic.ConfiguredName, 'Program Finished');
       }
 
+      this.serviceEventFinished.setCharacteristic(Characteristic.Name, 'Program Finished');
       // eslint-disable-next-line max-len
       this.serviceEventFinished.updateCharacteristic(Characteristic.OccupancyDetected, Characteristic.OccupancyDetected.OCCUPANCY_NOT_DETECTED);
     } else if (this.serviceEventFinished) {
@@ -101,18 +95,25 @@ export default class WasherDryer extends baseDevice {
 
     // tub clean coach
     this.serviceTubCleanMaintenance = accessory.getService('Tub Clean Coach');
-    if (!this.serviceTubCleanMaintenance) {
-      this.serviceTubCleanMaintenance = accessory.addService(StatelessProgrammableSwitch, 'Tub Clean Coach', 'Tub Clean Coach');
-      this.serviceTubCleanMaintenance.addOptionalCharacteristic(Characteristic.ConfiguredName);
-      this.serviceTubCleanMaintenance.updateCharacteristic(Characteristic.ConfiguredName, 'Tub Clean Coach');
-    }
+    if (this.config.washer_tub_clean as boolean) {
+      if (!this.serviceTubCleanMaintenance) {
+        this.serviceTubCleanMaintenance = accessory.addService(OccupancySensor, 'Tub Clean Coach', 'Tub Clean Coach');
+        this.serviceTubCleanMaintenance.addOptionalCharacteristic(Characteristic.ConfiguredName);
+        this.serviceTubCleanMaintenance.updateCharacteristic(Characteristic.ConfiguredName, 'Tub Clean Coach');
+      }
 
-    this.serviceTubCleanMaintenance.updateCharacteristic(Characteristic.Name, 'Tub Clean Coach');
-    this.serviceTubCleanMaintenance.getCharacteristic(Characteristic.ProgrammableSwitchEvent)
-      .setProps({
-        validValues: [0], // single press
-      });
-    this.serviceWasherDryer.addLinkedService(this.serviceTubCleanMaintenance);
+      this.serviceTubCleanMaintenance.setCharacteristic(Characteristic.Name, 'Tub Clean Coach');
+      // eslint-disable-next-line max-len
+      this.serviceTubCleanMaintenance.updateCharacteristic(Characteristic.OccupancyDetected, Characteristic.OccupancyDetected.OCCUPANCY_NOT_DETECTED);
+
+      this.serviceTubCleanMaintenance.setCharacteristic(Characteristic.Name, 'Tub Clean Coach');
+      this.serviceTubCleanMaintenance.getCharacteristic(Characteristic.ProgrammableSwitchEvent)
+        .setProps({
+          validValues: [0], // single press
+        });
+    } else if (this.serviceTubCleanMaintenance) {
+      accessory.removeService(this.serviceTubCleanMaintenance);
+    }
   }
 
   public get Status() {
@@ -123,15 +124,13 @@ export default class WasherDryer extends baseDevice {
     return Object.assign({}, {
       washer_trigger: false,
       washer_door_lock: false,
+      washer_tub_clean: false,
     }, super.config);
   }
 
   async setActive(value: CharacteristicValue) {
-    if (!this.Status.isRemoteStartEnable) {
-      return;
-    }
-
-    return;
+    // do nothing, revert back
+    this.updateAccessoryCharacteristic(this.accessory.context.device);
   }
 
   public updateAccessoryCharacteristic(device: Device) {
@@ -168,7 +167,6 @@ export default class WasherDryer extends baseDevice {
     const {
       Characteristic: {
         OccupancyDetected,
-        ProgrammableSwitchEvent,
       },
     } = this.platform;
 
@@ -196,17 +194,13 @@ export default class WasherDryer extends baseDevice {
       }
     }
 
-    if ('TCLCount' in washerDryer) {
+    if ('TCLCount' in washerDryer && this.serviceTubCleanMaintenance) {
       // detect if tub clean coach counter is reached
       if (this.Status.TCLCount >= 30) {
-        // trigger tub clean coach if not triggered yet
-        if (!this.isServiceTubCleanMaintenanceTriggered) {
-          this.serviceTubCleanMaintenance.updateCharacteristic(ProgrammableSwitchEvent, ProgrammableSwitchEvent.SINGLE_PRESS);
-          this.isServiceTubCleanMaintenanceTriggered = true;
-        }
+        this.serviceTubCleanMaintenance.updateCharacteristic(OccupancyDetected, OccupancyDetected.OCCUPANCY_DETECTED);
       } else {
         // reset tub clean coach trigger flag
-        this.isServiceTubCleanMaintenanceTriggered = false;
+        this.serviceTubCleanMaintenance.updateCharacteristic(OccupancyDetected, OccupancyDetected.OCCUPANCY_NOT_DETECTED);
       }
     }
   }

src/devices/WasherDryer2.ts

@@ -0,0 +1,14 @@
+import WasherDryer, {WasherDryerStatus} from './WasherDryer';
+
+export default class WasherDryer2 extends WasherDryer {
+  public get Status() {
+    return new WasherDryerStatus(this.accessory.context.device.snapshot?.washer, this.accessory.context.device.deviceModel);
+  }
+
+  public update(snapshot) {
+    // override washer to washerDryer
+    snapshot.washerDryer = snapshot.washer;
+
+    super.update(snapshot);
+  }
+}

src/helper.ts

@@ -13,6 +13,7 @@ import Styler from './devices/Styler';
 import RangeHood from './devices/RangeHood';
 import Oven from './devices/Oven';
 import Microwave from './devices/Microwave';
+import WasherDryer2 from './devices/WasherDryer2';
 
 /**
  * Platform Accessory
@@ -34,8 +35,9 @@ export class Helper {
       case 'WASHER':
       case 'WASHER_NEW':
       case 'WASH_TOWER':
+      case 'DRYER':
         return WasherDryer;
-      case 'DRYER': return WasherDryer;
+      case 'WASH_TOWER_2': return WasherDryer2; // new kind of washer
       case 'DISHWASHER': return Dishwasher;
       case 'DEHUMIDIFIER': return Dehumidifier;
       case 'AC': return AirConditioner;

src/lib/ThinQ.ts

@@ -106,6 +106,11 @@ export class ThinQ {
       await this.persist.setItem(device.id, deviceModel);
     }
 
+    const modelVersion = parseFloat(deviceModel.Info?.version);
+    if (modelVersion && modelVersion >= 3 && deviceModel.Info?.defaultTargetDeviceRoot) {
+      deviceModel = deviceModel[deviceModel.Info.defaultTargetDeviceRoot];
+    }
+
     return this.deviceModel[device.id] = device.deviceModel = new DeviceModel(deviceModel);
   }
 

src/lib/constants.ts

@@ -20,6 +20,7 @@ export enum DeviceType {
   WASHER = 201,
   WASHER_NEW = 221,
   WASH_TOWER = 222,
+  WASH_TOWER_2 = 223,
   DRYER = 202,
   STYLER = 203,
   DISHWASHER = 204,