homebridge-ge-ac 1.1.0 → 1.2.0

package/README.md

@@ -48,7 +48,10 @@ the unit echoes the change back on `publish#erd`.
   Setpoint changes **stick**.
 - **Mode switches** with real names: Cool, Fan Only, Energy Saver, Dry. (No bogus "Heat" — these
   are cooling-only units. Each switch sets `ConfiguredName`, so HomeKit never shows "Switch 1–5".)
-- **Fan speed** via the rotation-speed slider (Auto / Low / Med / High).
+- **Fan speed** as a dedicated **Fan** accessory — an **Auto ⇄ Manual** toggle plus a Low/Med/High
+  speed slider, mirroring the GE app's Auto/Low/Med/High. (Apple's Home app won't render fan speed on
+  a thermostat tile, so it's exposed as its own Fan service on the same accessory — it groups with the
+  AC rather than appearing as the thermostat's rotation-speed slider.)
 - **Live updates** — state is pushed from the WebSocket subscription, so HomeKit reflects changes
   made in the GE app or on the unit, in real time.
 - Resilient: app‑level keepalive, OAuth token refresh ahead of expiry, and exponential‑backoff

package/lib/accessory.js

@@ -77,9 +77,9 @@ class ACAccessory {
         .onSet(this._wrap(async (v) => { await this.client.setErd(this.mac, C.ERD.HEAT_TARGET_TEMP, C.encodeTempF(this._clampF(v))); }));
     }
 
-    hc.getCharacteristic(this.Ch.RotationSpeed)
-      .onGet(() => this._fanPct())
-      .onSet(this._wrap(async (pct) => { await this.client.setErd(this.mac, C.ERD.FAN, this._fanFromPct(pct)); }));
+    // Apple's Home app does NOT render RotationSpeed on a HeaterCooler, so fan speed lives on a
+    // dedicated Fanv2 service (below). Strip any stale cached RotationSpeed off the HeaterCooler.
+    if (hc.testCharacteristic(this.Ch.RotationSpeed)) hc.removeCharacteristic(hc.getCharacteristic(this.Ch.RotationSpeed));
 
     hc.getCharacteristic(this.Ch.TemperatureDisplayUnits)
       .onGet(() => (this.client.getState(this.mac, C.ERD.TEMP_UNIT) === '01') ? this.Ch.TemperatureDisplayUnits.CELSIUS : this.Ch.TemperatureDisplayUnits.FAHRENHEIT);
@@ -106,6 +106,27 @@ class ACAccessory {
       return { sw, modeHex };
     });
 
+    // ---- Fan (Fanv2): Auto/Manual toggle + Low/Med/High slider, bound to fan ERD 0x7A00 ----
+    // Apple Home renders this as a proper Fan tile (with an Auto switch), unlike a HeaterCooler's
+    // RotationSpeed. Same accessory, so it groups with the thermostat + mode switches.
+    const fan = accessory.getService(this.S.Fanv2) || accessory.addService(this.S.Fanv2, `${name} Fan`, 'GEAC_FANV2');
+    this.fan = fan;
+    this._configuredName(fan, 'Fan');
+    const TFS = this.Ch.TargetFanState, CFS = this.Ch.CurrentFanState, ACT = this.Ch.Active;
+    fan.getCharacteristic(ACT)
+      .onGet(() => this._power() ? ACT.ACTIVE : ACT.INACTIVE)
+      .onSet(this._wrap(async (v) => { await this.client.setErd(this.mac, C.ERD.POWER, v === ACT.ACTIVE ? C.POWER.ON : C.POWER.OFF); }));
+    fan.getCharacteristic(CFS)
+      .onGet(() => this._power() ? CFS.BLOWING_AIR : CFS.INACTIVE);
+    fan.getCharacteristic(TFS)
+      .onGet(() => this._fanIsAuto() ? TFS.AUTO : TFS.MANUAL)
+      .onSet(this._wrap(async (v) => {
+        await this.client.setErd(this.mac, C.ERD.FAN, v === TFS.AUTO ? C.FAN.AUTO : this._fanFromPct(this._fanSpeedPct()));
+      }));
+    fan.getCharacteristic(this.Ch.RotationSpeed) // continuous slider; onSet maps to Low(<=34)/Med(<=67)/High
+      .onGet(() => this._fanSpeedPct())
+      .onSet(this._wrap(async (pct) => { await this.client.setErd(this.mac, C.ERD.FAN, this._fanFromPct(pct)); }));
+
     // live updates
     this._onErd = (m) => { if (m === this.mac) this._pushAll(); };
     client.on('erd', this._onErd);
@@ -133,12 +154,14 @@ class ACAccessory {
     if (this._isHeatMode()) return (this._ambientF() < this._setpointF(C.ERD.HEAT_TARGET_TEMP)) ? CHCS.HEATING : CHCS.IDLE;
     return (this._ambientF() > this._setpointF(C.ERD.TARGET_TEMP)) ? CHCS.COOLING : CHCS.IDLE;
   }
-  _fanPct() {
+  // GE fan enum: AUTO=1 LOW=2 LOW_AUTO=3 MED=4 MED_AUTO=5 HIGH=8 HIGH_AUTO=9. The low bit = "auto".
+  _fanIsAuto() { const n = C.decodeInt(this.client.getState(this.mac, C.ERD.FAN)); return n == null || (n & 1) === 1; }
+  _fanSpeedPct() {
     const n = C.decodeInt(this.client.getState(this.mac, C.ERD.FAN));
-    if (n == null) return 0;
-    if (n >= 8) return 100; if (n >= 4) return 66; if (n >= 2) return 33; return 0; // 0/1 => AUTO
+    if (n == null) return 33;
+    if (n & 8) return 100; if (n & 4) return 66; if (n & 2) return 33; return 33; // pure AUTO(1): default Low position
   }
-  _fanFromPct(p) { if (p <= 0) return C.FAN.AUTO; if (p <= 33) return C.FAN.LOW; if (p <= 66) return C.FAN.MED; return C.FAN.HIGH; }
+  _fanFromPct(p) { if (p <= 0) return C.FAN.AUTO; if (p <= 34) return C.FAN.LOW; if (p <= 67) return C.FAN.MED; return C.FAN.HIGH; }
 
   _pushAll() {
     const u = (c, v) => { try { this.hc.updateCharacteristic(c, v); } catch (e) { /* ignore */ } };
@@ -148,7 +171,13 @@ class ACAccessory {
     u(this.Ch.CurrentTemperature, C.fToC(this._ambientF()));
     u(this.Ch.CoolingThresholdTemperature, this._threshC(C.ERD.TARGET_TEMP));
     if (this.heatCapable) u(this.Ch.HeatingThresholdTemperature, this._threshC(C.ERD.HEAT_TARGET_TEMP));
-    u(this.Ch.RotationSpeed, this._fanPct());
+    if (this.fan) {
+      const uf = (c, v) => { try { this.fan.updateCharacteristic(c, v); } catch (e) { /* ignore */ } };
+      uf(this.Ch.Active, this._power() ? this.Ch.Active.ACTIVE : this.Ch.Active.INACTIVE);
+      uf(this.Ch.CurrentFanState, this._power() ? this.Ch.CurrentFanState.BLOWING_AIR : this.Ch.CurrentFanState.INACTIVE);
+      uf(this.Ch.TargetFanState, this._fanIsAuto() ? this.Ch.TargetFanState.AUTO : this.Ch.TargetFanState.MANUAL);
+      uf(this.Ch.RotationSpeed, this._fanSpeedPct());
+    }
     for (const { sw, modeHex } of this.switches) {
       try { sw.updateCharacteristic(this.Ch.On, this._power() && this._mode() === modeHex); } catch (e) { /* ignore */ }
     }

package/lib/platform.js

@@ -57,6 +57,7 @@ class GEACPlatform {
       this.log.info(`Restoring AC "${name}" (${mac}) from cache`);
       accessory.context.mac = mac;
       new ACAccessory(this, accessory, this.client, mac);
+      this.api.updatePlatformAccessories([accessory]); // persist service changes (e.g. added Fan, removed stale chars)
     } else {
       this.log.info(`Adding AC "${name}" (${mac})`);
       accessory = new this.api.platformAccessory(name, uuid);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-ge-ac",
   "displayName": "GE Profile AC (SmartHQ WebSocket)",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Homebridge plugin for GE SmartHQ Wi-Fi window air conditioners over GE's realtime WebSocket channel (reliable setpoint/mode/fan control). Built and tested on the cooling-only GE Profile AHTT06BC; likely works on similar GE Wi-Fi window ACs (unverified).",
   "author": "Fabricore",
   "license": "ISC",