homebridge-ac-freedom 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "homebridge-ac-freedom",
-  "version": "1.0.0",
+  "version": "1.0.2",
+  "displayName": "AC Freedom",
   "description": "Homebridge plugin for AUX air conditioners via Broadlink (local UDP) and AUX Cloud API",
   "main": "index.js",
   "scripts": {

package/src/ac-accessory.js

@@ -66,6 +66,8 @@ class AcFreedomAccessory {
 
     this.setupAccessoryInfo();
     this.setupHeaterCooler();
+    this.reorderLinkedServices();
+    this.setupFanService();
     this.setupPresetSwitches();
     this.setupDisplaySwitch();
 
@@ -164,15 +166,6 @@ class AcFreedomAccessory {
         await this.sendTemperature(value);
       });
 
-    // Rotation speed (fan: 0=auto, 20=mute, 40=low, 60=med, 80=high, 100=turbo)
-    this.heaterCooler.getCharacteristic(C.RotationSpeed)
-      .setProps({ minValue: 0, maxValue: 100, minStep: 20 })
-      .onGet(() => this.fanSpeedToPercent(this.state.fanSpeed))
-      .onSet(async (value) => {
-        this.state.fanSpeed = this.percentToFanSpeed(value);
-        await this.sendFanSpeed(this.state.fanSpeed);
-      });
-
     // Swing mode
     this.heaterCooler.getCharacteristic(C.SwingMode)
       .onGet(() => (this.state.swingV || this.state.swingH)
@@ -186,6 +179,51 @@ class AcFreedomAccessory {
       });
   }
 
+  // ── Reorder linked services ───────────────────────────────────
+  // Remove cached linked services from the accessory so they are
+  // re-added in the correct display order: Fan → Presets → Display.
+  reorderLinkedServices() {
+    const ids = [
+      { type: this.Service.Fanv2, subtype: 'fan' },
+      { type: this.Service.Switch, subtype: 'sleep' },
+      { type: this.Service.Switch, subtype: 'health' },
+      { type: this.Service.Switch, subtype: 'eco' },
+      { type: this.Service.Switch, subtype: 'clean' },
+      { type: this.Service.Switch, subtype: 'display' },
+    ];
+    for (const { type, subtype } of ids) {
+      const svc = this.accessory.getServiceById(type, subtype);
+      if (svc) this.accessory.removeService(svc);
+    }
+  }
+
+  // ── Fan Service (linked to HeaterCooler) ────────────────────────
+  setupFanService() {
+    const C = this.Characteristic;
+
+    this.fanService = this.accessory.addService(this.Service.Fanv2, 'Fan', 'fan');
+
+    // Fan Active follows AC power
+    this.fanService.getCharacteristic(C.Active)
+      .onGet(() => this.state.power ? C.Active.ACTIVE : C.Active.INACTIVE)
+      .onSet(async (value) => {
+        this.state.power = value === C.Active.ACTIVE;
+        await this.sendPower(this.state.power);
+      });
+
+    // Rotation speed: 0=auto, 17=mute, 33=low, 50=med, 67=high, 100=turbo
+    this.fanService.getCharacteristic(C.RotationSpeed)
+      .setProps({ minValue: 0, maxValue: 100, minStep: 1 })
+      .onGet(() => this.fanSpeedToPercent(this.state.fanSpeed))
+      .onSet(async (value) => {
+        this.state.fanSpeed = this.percentToFanSpeed(value);
+        await this.sendFanSpeed(this.state.fanSpeed);
+      });
+
+    // Link fan to HeaterCooler so it appears inside the climate card
+    this.heaterCooler.addLinkedService(this.fanService);
+  }
+
   // ── Preset Switches (linked to HeaterCooler) ──────────────────
   setupPresetSwitches() {
     const presets = this.config.presets || { sleep: true, health: true, eco: true, clean: true };
@@ -200,8 +238,7 @@ class AcFreedomAccessory {
         continue;
       }
 
-      const switchService = this.accessory.getServiceById(this.Service.Switch, key)
-        || this.accessory.addService(this.Service.Switch, cfg.label, key);
+      const switchService = this.accessory.addService(this.Service.Switch, cfg.label, key);
 
       switchService.setCharacteristic(this.Characteristic.Name, cfg.label);
 
@@ -242,8 +279,7 @@ class AcFreedomAccessory {
       return;
     }
 
-    this.displaySwitch = this.accessory.getServiceById(this.Service.Switch, 'display')
-      || this.accessory.addService(this.Service.Switch, 'Display', 'display');
+    this.displaySwitch = this.accessory.addService(this.Service.Switch, 'Display', 'display');
 
     this.displaySwitch.setCharacteristic(this.Characteristic.Name, 'Display');
 
@@ -365,10 +401,17 @@ class AcFreedomAccessory {
     this.heaterCooler.updateCharacteristic(C.CurrentTemperature, this.state.currentTemp);
     this.heaterCooler.updateCharacteristic(C.CoolingThresholdTemperature, this.state.targetTemp);
     this.heaterCooler.updateCharacteristic(C.HeatingThresholdTemperature, this.state.targetTemp);
-    this.heaterCooler.updateCharacteristic(C.RotationSpeed, this.fanSpeedToPercent(this.state.fanSpeed));
     this.heaterCooler.updateCharacteristic(C.SwingMode,
       (this.state.swingV || this.state.swingH) ? C.SwingMode.SWING_ENABLED : C.SwingMode.SWING_DISABLED);
 
+    // Update fan service
+    if (this.fanService) {
+      this.fanService.updateCharacteristic(C.Active,
+        this.state.power ? C.Active.ACTIVE : C.Active.INACTIVE);
+      this.fanService.updateCharacteristic(C.RotationSpeed,
+        this.fanSpeedToPercent(this.state.fanSpeed));
+    }
+
     // Update preset switches
     for (const [key, svc] of Object.entries(this.presetSwitches || {})) {
       svc.updateCharacteristic(C.On, this.state[key]);