homebridge-nest-accfactory 0.0.6 → 0.2.0

package/dist/thermostat.js

@@ -1,7 +1,7 @@
 // Nest Thermostat
 // Part of homebridge-nest-accfactory
 //
-// Code version 12/9/2024
+// Code version 3/10/2024
 // Mark Hulskamp
 'use strict';
 
@@ -204,19 +204,35 @@ export default class NestThermostat extends HomeKitDevice {
       if (this.fanService === undefined) {
         this.fanService = this.accessory.addService(this.hap.Service.Fanv2, '', 1);
       }
+      if (this.fanService.testCharacteristic(this.hap.Characteristic.RotationSpeed) === false) {
+        this.fanService.addCharacteristic(this.hap.Characteristic.RotationSpeed);
+      }
+      this.fanService.getCharacteristic(this.hap.Characteristic.RotationSpeed).setProps({
+        minStep: 100 / this.deviceData.fan_max_speed,
+      });
+
       this.thermostatService.addLinkedService(this.fanService);
 
       this.fanService.getCharacteristic(this.hap.Characteristic.Active).onSet((value) => {
-        this.setFan(value);
+        this.setFan(
+          value,
+          value === this.hap.Characteristic.Active.ACTIVE ? (this.deviceData.fan_timer_speed / this.deviceData.fan_max_speed) * 100 : 0,
+        );
+      });
+      this.fanService.getCharacteristic(this.hap.Characteristic.RotationSpeed).onSet((value) => {
+        this.setFan(value !== 0 ? this.hap.Characteristic.Active.ACTIVE : this.hap.Characteristic.Active.INACTIVE, value);
       });
       this.fanService.getCharacteristic(this.hap.Characteristic.Active).onGet(() => {
         return this.deviceData.fan_state === true ? this.hap.Characteristic.Active.ACTIVE : this.hap.Characteristic.Active.INACTIVE;
       });
+      this.fanService.getCharacteristic(this.hap.Characteristic.RotationSpeed).onGet(() => {
+        return (this.deviceData.fan_timer_speed / this.deviceData.fan_max_speed) * 100;
+      });
     }
     if (this.deviceData?.has_fan === false && this.fanService !== undefined) {
       // No longer have a Fan configured and service present, so removed it
       this.accessory.removeService(this.fanService);
-      this.fanService === undefined;
+      this.fanService = undefined;
     }
 
     // Setup dehumifider service if supported by the thermostat and not already present on the accessory
@@ -313,20 +329,33 @@ export default class NestThermostat extends HomeKitDevice {
     return postSetupDetails;
   }
 
-  setFan(fanState) {
-    this.set({ fan_state: fanState === this.hap.Characteristic.Active.ACTIVE ? true : false });
-    this.fanService.updateCharacteristic(this.hap.Characteristic.Active, fanState);
+  setFan(fanState, speed) {
+    if (
+      fanState !== this.fanService.getCharacteristic(this.hap.Characteristic.Active).value ||
+      speed !== this.fanService.getCharacteristic(this.hap.Characteristic.RotationSpeed).value
+    ) {
+      this.set({
+        uuid: this.deviceData.nest_google_uuid,
+        fan_state: fanState === this.hap.Characteristic.Active.ACTIVE ? true : false,
+        fan_timer_speed: Math.round((speed / 100) * this.deviceData.fan_max_speed),
+      });
+      this.fanService.updateCharacteristic(this.hap.Characteristic.Active, fanState);
+      this.fanService.updateCharacteristic(this.hap.Characteristic.RotationSpeed, speed);
 
-    this?.log?.info &&
-      this.log.info(
-        'Set fan on thermostat "%s" to "%s"',
-        this.deviceData.description,
-        fanState === this.hap.Characteristic.Active.ACTIVE ? 'On with initial fan speed of ' + this.deviceData.fan_current_speed : 'Off',
-      );
+      this?.log?.info &&
+        this.log.info(
+          'Set fan on thermostat "%s" to "%s"',
+          this.deviceData.description,
+          fanState === this.hap.Characteristic.Active.ACTIVE ? 'On with fan speed of ' + speed + '%' : 'Off',
+        );
+    }
   }
 
   setDehumidifier(dehumidiferState) {
-    this.set({ dehumidifer_State: dehumidiferState === this.hap.Characteristic.Active.ACTIVE ? true : false });
+    this.set({
+      uuid: this.deviceData.nest_google_uuid,
+      dehumidifer_State: dehumidiferState === this.hap.Characteristic.Active.ACTIVE ? true : false,
+    });
     this.dehumidifierService.updateCharacteristic(this.hap.Characteristic.Active, dehumidiferState);
 
     this?.log?.info &&
@@ -340,7 +369,10 @@ export default class NestThermostat extends HomeKitDevice {
   }
 
   setDisplayUnit(temperatureUnit) {
-    this.set({ temperature_scale: temperatureUnit === this.hap.Characteristic.TemperatureDisplayUnits.CELSIUS ? 'C' : 'F' });
+    this.set({
+      uuid: this.deviceData.nest_google_uuid,
+      temperature_scale: temperatureUnit === this.hap.Characteristic.TemperatureDisplayUnits.CELSIUS ? 'C' : 'F',
+    });
     this.thermostatService.updateCharacteristic(this.hap.Characteristic.TemperatureDisplayUnits, temperatureUnit);
 
     this?.log?.info &&
@@ -412,7 +444,7 @@ export default class NestThermostat extends HomeKitDevice {
         mode = 'range';
       }
 
-      this.set({ hvac_mode: mode });
+      this.set({ uuid: this.deviceData.nest_google_uuid, hvac_mode: mode });
 
       this?.log?.info && this.log.info('Set mode on "%s" to "%s"', this.deviceData.description, mode);
     }
@@ -448,7 +480,7 @@ export default class NestThermostat extends HomeKitDevice {
         this.thermostatService.getCharacteristic(this.hap.Characteristic.TargetHeatingCoolingState).value !==
           this.hap.Characteristic.TargetHeatingCoolingState.AUTO
       ) {
-        this.set({ target_temperature: temperature });
+        this.set({ uuid: this.deviceData.nest_google_uuid, target_temperature: temperature });
 
         this?.log?.info &&
           this.log.info(
@@ -467,7 +499,7 @@ export default class NestThermostat extends HomeKitDevice {
         this.thermostatService.getCharacteristic(this.hap.Characteristic.TargetHeatingCoolingState).value ===
           this.hap.Characteristic.TargetHeatingCoolingState.AUTO
       ) {
-        this.set({ target_temperature_low: temperature });
+        this.set({ uuid: this.deviceData.nest_google_uuid, target_temperature_low: temperature });
 
         this?.log?.info &&
           this.log.info(
@@ -482,7 +514,7 @@ export default class NestThermostat extends HomeKitDevice {
         this.thermostatService.getCharacteristic(this.hap.Characteristic.TargetHeatingCoolingState).value ===
           this.hap.Characteristic.TargetHeatingCoolingState.AUTO
       ) {
-        this.set({ target_temperature_high: temperature });
+        this.set({ uuid: this.deviceData.nest_google_uuid, target_temperature_high: temperature });
 
         this?.log?.info &&
           this.log.info(
@@ -533,7 +565,10 @@ export default class NestThermostat extends HomeKitDevice {
     if (value === this.hap.Characteristic.LockPhysicalControls.CONTROL_LOCK_DISABLED) {
       // Clear pin hash????
     }
-    this.set({ temperature_lock: value === this.hap.Characteristic.LockPhysicalControls.CONTROL_LOCK_ENABLED ? true : false });
+    this.set({
+      uuid: this.deviceData.nest_google_uuid,
+      temperature_lock: value === this.hap.Characteristic.LockPhysicalControls.CONTROL_LOCK_ENABLED ? true : false,
+    });
 
     this?.log?.info &&
       this.log.info(
@@ -639,6 +674,13 @@ export default class NestThermostat extends HomeKitDevice {
       if (deviceData.has_fan === true && this.deviceData.has_fan === false && this.fanService === undefined) {
         // Fan has been added
         this.fanService = this.accessory.addService(this.hap.Service.Fanv2, '', 1);
+
+        if (this.fanService.testCharacteristic(this.hap.Characteristic.RotationSpeed) === false) {
+          this.fanService.addCharacteristic(this.hap.Characteristic.RotationSpeed);
+        }
+        this.fanService.getCharacteristic(this.hap.Characteristic.RotationSpeed).setProps({
+          minStep: 100 / this.deviceData.fan_max_speed,
+        });
         this.thermostatService.addLinkedService(this.fanService);
 
         this.fanService.getCharacteristic(this.hap.Characteristic.Active).onSet((value) => {
@@ -868,8 +910,12 @@ export default class NestThermostat extends HomeKitDevice {
           this.externalFan.off();
         }
       }
-      //this.fanService.updateCharacteristic(this.hap.Characteristic.RotationSpeed,
-      //  (deviceData.fan_state === true ? (deviceData.fan_current_speed / deviceData.fan_max_speed) * 100 : 0));
+
+      this.fanService.updateCharacteristic(
+        this.hap.Characteristic.RotationSpeed,
+        deviceData.fan_state === true ? (deviceData.fan_timer_speed / deviceData.fan_max_speed) * 100 : 0,
+      );
+
       this.fanService.updateCharacteristic(
         this.hap.Characteristic.Active,
         deviceData.fan_state === true ? this.hap.Characteristic.Active.ACTIVE : this.hap.Characteristic.Active.INACTIVE,
@@ -883,7 +929,7 @@ export default class NestThermostat extends HomeKitDevice {
         this.externalDehumidifier !== undefined
       ) {
         // Dehumidifier mode was switched on and external dehumidifier external code is being used
-        // Start dehumidifier via dehumidifiern external code
+        // Start dehumidifier via dehumidifier external code
         if (typeof this.externalDehumidifier.dehumififier === 'function') {
           this.externalDehumidifier.dehumififier(0);
         }
@@ -1013,13 +1059,13 @@ export default class NestThermostat extends HomeKitDevice {
     }
 
     if (typeof EveHomeSetData?.vacation === 'boolean') {
-      this.set({ vacation_mode: EveHomeSetData.vacation.status });
+      this.set({ uuid: this.deviceData.nest_google_uuid, vacation_mode: EveHomeSetData.vacation.status });
     }
     if (typeof EveHomeSetData?.programs === 'object') {
-      /* EveHomeSetData.programs.forEach((day) => {
-                // Convert into Nest thermostat schedule format and set. Need to work this out
-                //this.set({'days' : {6 : { 'temp' : 17 , 'time' : 13400, touched_at: Date.now()}} });
-            }); */
+      //EveHomeSetData.programs.forEach((day) => {
+      // Convert into Nest thermostat schedule format and set. Need to work this out
+      //  this.set({ uuid: this.deviceData.nest_google_uuid, days: { 6: { temp: 17, time: 13400, touched_at: Date.now() } } });
+      //});
     }
   }
 }