homebridge-smarthq-client 1.1.2 → 1.2.0

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.2.0](https://github.com/ceb400/homebridge-smarthq-client/releases/tag/v1.2.0) (2026-07-01)
+- Added initial support for air conditioner
+- minor bug fixes to correct invalid name error
+
+## What's Changed
+
 ## [1.1.1](https://github.com/ceb400/homebridge-smarthq-client/releases/tag/v1.1.1) (2026-04-25)
 
 ## What's Changed

package/Readme.md

@@ -5,6 +5,7 @@
 A homebridge plugin for GE appliances using the SmartHQ API s (Identity and Access Management API, Digital Twin API) from npm pkg 'ge-smarthq'.  The following devices are implemented:
 * refrigerator
 * dishwasher
+* air conditioner
 * Other devices will be discovered and service information could be written to the log to assist in adding support for more devices.
 
 The refrigerator services include controls for:
@@ -28,6 +29,11 @@ The dishwasher services include controls for:
 * Wash zones
 * Options for steam, bottlewash, silverware, sabbath mode, controls lock
 
+The air conditioner services include controls for:
+* AC temperature
+* AC fan speed
+* AC modes (Cool, ECO, Dry, Fan Only)
+
 
 
 ## Installation

package/dist/airConditioner/airConditioner.d.ts

@@ -0,0 +1,37 @@
+import { CharacteristicValue, PlatformAccessory, Service, Characteristic } from 'homebridge';
+import { DeviceService } from 'ge-smarthq';
+import { SmartHqPlatform } from '../platform.js';
+export declare class AirConditioner {
+    private readonly platform;
+    private readonly accessory;
+    readonly deviceServices: DeviceService[];
+    readonly deviceId: string;
+    private targetCelsius;
+    private targetMode;
+    private targetFanSpeed;
+    private isOn;
+    private client;
+    Service: typeof Service;
+    Characteristic: typeof Characteristic;
+    private api;
+    private readonly modeToHK;
+    private hkToMode;
+    private acThermostat;
+    private acFan;
+    private modeSwitches;
+    constructor(platform: SmartHqPlatform, accessory: PlatformAccessory, deviceServices: DeviceService[], deviceId: string);
+    private updateModeSwitches;
+    private fanSpeedToPercent;
+    private percentToFanSpeed;
+    private sendThermostatCommand;
+    private findService;
+    getCurrentHeatingCoolingState(): Promise<number>;
+    getTargetHeatingCoolingState(): number;
+    setTargetHeatingCoolingState(value: CharacteristicValue): Promise<void>;
+    getCurrentTemperature(): Promise<number>;
+    getTargetTemperature(): number;
+    setTargetTemperature(value: CharacteristicValue): Promise<void>;
+    handleTemperatureDisplayUnitsGet(): number;
+    handleTemperatureDisplayUnitsSet(value: CharacteristicValue): void;
+    setupWebSocket(): Promise<void>;
+}

package/dist/airConditioner/airConditioner.js

@@ -0,0 +1,377 @@
+import { SmartHQClient } from 'ge-smarthq';
+export class AirConditioner {
+    platform;
+    accessory;
+    deviceServices;
+    deviceId;
+    targetCelsius = 22.22;
+    targetMode = 'cloud.smarthq.type.thermostatmode.cool';
+    targetFanSpeed = 'cloud.smarthq.type.fanspeed.auto';
+    isOn = false;
+    client;
+    Service;
+    Characteristic;
+    api;
+    modeToHK = {};
+    hkToMode = {};
+    // Promoted to class properties so handlers outside constructor can access them
+    acThermostat;
+    acFan;
+    // Mode switch service references for mutual exclusion updates
+    modeSwitches = {};
+    constructor(platform, accessory, deviceServices, deviceId) {
+        this.platform = platform;
+        this.accessory = accessory;
+        this.deviceServices = deviceServices;
+        this.deviceId = deviceId;
+        this.api = platform.api;
+        this.Service = this.api.hap.Service;
+        this.Characteristic = this.api.hap.Characteristic;
+        this.client = new SmartHQClient({
+            clientId: platform.config.clientId,
+            clientSecret: platform.config.clientSecret,
+            redirectUri: platform.config.redirectUri,
+            debug: platform.config.debugLogging || false,
+        });
+        const HK = this.Characteristic.TargetHeatingCoolingState;
+        this.modeToHK = {
+            'cloud.smarthq.type.thermostatmode.cool': HK.COOL,
+            'cloud.smarthq.type.thermostatmode.cool.energysaver': HK.AUTO,
+            'cloud.smarthq.type.thermostatmode.fanonly': HK.OFF,
+            'cloud.smarthq.type.thermostatmode.dry': HK.COOL,
+        };
+        this.hkToMode = {
+            [HK.OFF]: 'cloud.smarthq.type.thermostatmode.fanonly',
+            [HK.COOL]: 'cloud.smarthq.type.thermostatmode.cool',
+            [HK.HEAT]: 'cloud.smarthq.type.thermostatmode.cool',
+            [HK.AUTO]: 'cloud.smarthq.type.thermostatmode.cool.energysaver',
+        };
+        // Seed initial state from service data at startup
+        const thermoSvc = this.findService('cloud.smarthq.service.thermostat.v1', 'cloud.smarthq.domain.thermostat');
+        if (thermoSvc?.state) {
+            if (thermoSvc.state.coolCelsiusConverted != null)
+                this.targetCelsius = thermoSvc.state.coolCelsiusConverted;
+            if (thermoSvc.state.mode != null)
+                this.targetMode = thermoSvc.state.mode;
+            if (thermoSvc.state.fanSpeed != null)
+                this.targetFanSpeed = thermoSvc.state.fanSpeed;
+            if (thermoSvc.state.on != null)
+                this.isOn = thermoSvc.state.on;
+        }
+        // authenticate() before connect() so both sendCommand and WebSocket work
+        this.setupWebSocket();
+        // WebSocket push updates
+        this.client.on('service_update', (message) => {
+            if (message.domainType === 'cloud.smarthq.domain.thermostat') {
+                if (message.state?.on !== undefined) {
+                    this.isOn = message.state.on;
+                    this.acFan.getCharacteristic(this.Characteristic.On).updateValue(this.isOn);
+                }
+                if (message.state?.coolCelsiusConverted !== undefined) {
+                    this.targetCelsius = message.state.coolCelsiusConverted;
+                    this.acThermostat.getCharacteristic(this.Characteristic.TargetTemperature).updateValue(this.targetCelsius);
+                }
+                if (message.state?.mode !== undefined) {
+                    this.targetMode = message.state.mode;
+                    const hkMode = this.modeToHK[this.targetMode] ?? HK.COOL;
+                    this.acThermostat.getCharacteristic(this.Characteristic.TargetHeatingCoolingState).updateValue(hkMode);
+                    this.updateModeSwitches(this.targetMode);
+                }
+                if (message.state?.fanSpeed !== undefined) {
+                    this.targetFanSpeed = message.state.fanSpeed;
+                    this.acFan.getCharacteristic(this.Characteristic.RotationSpeed).updateValue(this.fanSpeedToPercent(this.targetFanSpeed));
+                }
+            }
+            if (message.domainType === 'cloud.smarthq.domain.state.compressor') {
+                const running = message.state?.on;
+                const currentState = running
+                    ? this.Characteristic.CurrentHeatingCoolingState.COOL
+                    : this.Characteristic.CurrentHeatingCoolingState.OFF;
+                this.acThermostat.getCharacteristic(this.Characteristic.CurrentHeatingCoolingState).updateValue(currentState);
+            }
+        });
+        // ── Accessory information ────────────────────────────────────────────────
+        this.accessory.getService(this.Service.AccessoryInformation)
+            .setCharacteristic(this.Characteristic.Manufacturer, 'GE')
+            .setCharacteristic(this.Characteristic.Model, accessory.context.device.model || 'AHTT08BC')
+            .setCharacteristic(this.Characteristic.SerialNumber, accessory.context.device.serial || 'Default-Serial');
+        // ── Thermostat service ───────────────────────────────────────────────────
+        const displayName = 'Air Conditioner';
+        this.acThermostat = this.accessory.getService(displayName)
+            || this.accessory.addService(this.Service.Thermostat, displayName, 'ac-thermo1');
+        this.acThermostat.setCharacteristic(this.Characteristic.Name, displayName);
+        this.acThermostat.addOptionalCharacteristic(this.Characteristic.ConfiguredName);
+        this.acThermostat.setCharacteristic(this.Characteristic.ConfiguredName, displayName);
+        this.acThermostat.getCharacteristic(this.Characteristic.CurrentHeatingCoolingState).setProps({
+            minValue: this.Characteristic.CurrentHeatingCoolingState.OFF,
+            maxValue: this.Characteristic.CurrentHeatingCoolingState.COOL,
+            validValues: [
+                this.Characteristic.CurrentHeatingCoolingState.OFF,
+                this.Characteristic.CurrentHeatingCoolingState.COOL,
+            ],
+        });
+        this.acThermostat.getCharacteristic(this.Characteristic.TargetHeatingCoolingState).setProps({
+            minValue: this.Characteristic.TargetHeatingCoolingState.OFF,
+            maxValue: this.Characteristic.TargetHeatingCoolingState.AUTO,
+            validValues: [
+                this.Characteristic.TargetHeatingCoolingState.OFF,
+                this.Characteristic.TargetHeatingCoolingState.COOL,
+                this.Characteristic.TargetHeatingCoolingState.AUTO,
+            ],
+        });
+        this.acThermostat.getCharacteristic(this.Characteristic.CurrentTemperature).setProps({
+            minValue: -20,
+            maxValue: 50,
+            minStep: 0.1,
+        });
+        this.acThermostat.getCharacteristic(this.Characteristic.TargetTemperature).setProps({
+            minValue: 17.78,
+            maxValue: 30.0,
+            minStep: 0.5,
+        });
+        this.acThermostat.getCharacteristic(this.Characteristic.CurrentHeatingCoolingState)
+            .onGet(this.getCurrentHeatingCoolingState.bind(this));
+        this.acThermostat.getCharacteristic(this.Characteristic.TargetHeatingCoolingState)
+            .onGet(this.getTargetHeatingCoolingState.bind(this))
+            .onSet(this.setTargetHeatingCoolingState.bind(this));
+        this.acThermostat.getCharacteristic(this.Characteristic.CurrentTemperature)
+            .onGet(this.getCurrentTemperature.bind(this));
+        this.acThermostat.getCharacteristic(this.Characteristic.TargetTemperature)
+            .onGet(this.getTargetTemperature.bind(this))
+            .onSet(this.setTargetTemperature.bind(this));
+        this.acThermostat.getCharacteristic(this.Characteristic.TemperatureDisplayUnits)
+            .onGet(this.handleTemperatureDisplayUnitsGet.bind(this))
+            .onSet(this.handleTemperatureDisplayUnitsSet.bind(this));
+        // ── Fan service ───────────────────────────────────────────────────────────
+        const fanDisplayName = 'AC Fan Speed';
+        this.acFan = this.accessory.getService(fanDisplayName)
+            || this.accessory.addService(this.Service.Fan, fanDisplayName, 'ac-fan1');
+        this.acFan.setCharacteristic(this.Characteristic.Name, fanDisplayName);
+        this.acFan.addOptionalCharacteristic(this.Characteristic.ConfiguredName);
+        this.acFan.setCharacteristic(this.Characteristic.ConfiguredName, fanDisplayName);
+        this.acFan.getCharacteristic(this.Characteristic.On)
+            .onGet(() => this.isOn)
+            .onSet(async (value) => {
+            await this.setTargetHeatingCoolingState(value
+                ? this.Characteristic.TargetHeatingCoolingState.COOL
+                : this.Characteristic.TargetHeatingCoolingState.OFF);
+        });
+        this.acFan.getCharacteristic(this.Characteristic.RotationSpeed)
+            .setProps({ minValue: 0, maxValue: 100, minStep: 25 })
+            .onGet(() => this.fanSpeedToPercent(this.targetFanSpeed))
+            .onSet(async (value) => {
+            this.targetFanSpeed = this.percentToFanSpeed(value);
+            await this.sendThermostatCommand(this.targetMode, this.targetCelsius, this.targetFanSpeed, this.isOn);
+        });
+        // ── Mode switches ─────────────────────────────────────────────────────────
+        const modes = [
+            { name: 'Cool', mode: 'cloud.smarthq.type.thermostatmode.cool', subtype: 'ac-mode-cool' },
+            { name: 'Eco', mode: 'cloud.smarthq.type.thermostatmode.cool.energysaver', subtype: 'ac-mode-eco' },
+            { name: 'Dry', mode: 'cloud.smarthq.type.thermostatmode.dry', subtype: 'ac-mode-dry' },
+            { name: 'Fan Only', mode: 'cloud.smarthq.type.thermostatmode.fanonly', subtype: 'ac-mode-fanonly' },
+        ];
+        for (const { name, mode, subtype } of modes) {
+            const svc = this.accessory.getService(name)
+                || this.accessory.addService(this.Service.Switch, name, subtype);
+            svc.setCharacteristic(this.Characteristic.Name, name);
+            svc.addOptionalCharacteristic(this.Characteristic.ConfiguredName);
+            svc.setCharacteristic(this.Characteristic.ConfiguredName, name);
+            svc.getCharacteristic(this.Characteristic.On)
+                .onGet(() => this.isOn && this.targetMode === mode)
+                .onSet(async (value) => {
+                if (value) {
+                    // Switching to this mode turns the AC on and deactivates others
+                    this.isOn = true;
+                    this.targetMode = mode;
+                    await this.sendThermostatCommand(mode, this.targetCelsius, this.targetFanSpeed, true);
+                    this.updateModeSwitches(mode);
+                    // Keep thermostat tile in sync
+                    const hkMode = this.modeToHK[mode] ?? HK.COOL;
+                    this.acThermostat.getCharacteristic(this.Characteristic.TargetHeatingCoolingState).updateValue(hkMode);
+                    this.acFan.getCharacteristic(this.Characteristic.On).updateValue(true);
+                }
+                else {
+                    // Turning off a mode switch turns the AC off entirely
+                    this.isOn = false;
+                    await this.sendThermostatCommand(this.targetMode, this.targetCelsius, this.targetFanSpeed, false);
+                    this.updateModeSwitches('');
+                    this.acThermostat.getCharacteristic(this.Characteristic.TargetHeatingCoolingState)
+                        .updateValue(this.Characteristic.TargetHeatingCoolingState.OFF);
+                    this.acFan.getCharacteristic(this.Characteristic.On).updateValue(false);
+                }
+            });
+            this.modeSwitches[mode] = svc;
+        }
+        // Set initial switch states
+        this.updateModeSwitches(this.isOn ? this.targetMode : '');
+        // ── Polling (every 30 s) ──────────────────────────────────────────────────
+        setInterval(() => {
+            this.getCurrentTemperature().then(temp => {
+                this.acThermostat.getCharacteristic(this.Characteristic.CurrentTemperature).updateValue(temp);
+            });
+            this.getCurrentHeatingCoolingState().then(state => {
+                const running = state === this.Characteristic.CurrentHeatingCoolingState.COOL;
+                this.acThermostat.getCharacteristic(this.Characteristic.CurrentHeatingCoolingState).updateValue(state);
+                this.acFan.getCharacteristic(this.Characteristic.On).updateValue(running);
+                // Keep TargetHeatingCoolingState in sync with actual on/off state
+                this.acThermostat.getCharacteristic(this.Characteristic.TargetHeatingCoolingState).updateValue(this.isOn
+                    ? (this.modeToHK[this.targetMode] ?? this.Characteristic.TargetHeatingCoolingState.COOL)
+                    : this.Characteristic.TargetHeatingCoolingState.OFF);
+            });
+        }, 30000);
+    }
+    // ── Mode switch mutual exclusion ───────────────────────────────────────────
+    updateModeSwitches(activeMode) {
+        for (const [mode, svc] of Object.entries(this.modeSwitches)) {
+            svc.getCharacteristic(this.Characteristic.On).updateValue(this.isOn && mode === activeMode);
+        }
+    }
+    // ── Fan speed helpers ──────────────────────────────────────────────────────
+    fanSpeedToPercent(fanSpeed) {
+        switch (fanSpeed) {
+            case 'cloud.smarthq.type.fanspeed.high': return 100;
+            case 'cloud.smarthq.type.fanspeed.medium': return 50;
+            case 'cloud.smarthq.type.fanspeed.low': return 25;
+            default: return 0;
+        }
+    }
+    percentToFanSpeed(percent) {
+        if (percent >= 75)
+            return 'cloud.smarthq.type.fanspeed.high';
+        if (percent >= 40)
+            return 'cloud.smarthq.type.fanspeed.medium';
+        if (percent >= 15)
+            return 'cloud.smarthq.type.fanspeed.low';
+        return 'cloud.smarthq.type.fanspeed.auto';
+    }
+    // ── Shared command helper ──────────────────────────────────────────────────
+    async sendThermostatCommand(mode, celsius, fanSpeed, on) {
+        const svc = this.findService('cloud.smarthq.service.thermostat.v1', 'cloud.smarthq.domain.thermostat');
+        if (!svc)
+            return;
+        const command = {
+            commandType: 'cloud.smarthq.command.thermostat.v1.set',
+            on,
+        };
+        // Only send mode and fanSpeed when turning on
+        if (on) {
+            command.mode = mode;
+            // Dry mode doesn't accept fanSpeed
+            const isDry = mode === 'cloud.smarthq.type.thermostatmode.dry';
+            if (!isDry) {
+                command.fanSpeed = fanSpeed;
+            }
+            // Only send coolFahrenheit for cool modes
+            const needsCoolTemp = mode === 'cloud.smarthq.type.thermostatmode.cool'
+                || mode === 'cloud.smarthq.type.thermostatmode.cool.energysaver';
+            if (needsCoolTemp) {
+                command.coolFahrenheit = Math.round(celsius * 9 / 5 + 32);
+            }
+        }
+        const cmdBody = {
+            command,
+            kind: 'service#command',
+            deviceId: this.deviceId,
+            serviceDeviceType: 'cloud.smarthq.device.airconditioner',
+            serviceType: 'cloud.smarthq.service.thermostat.v1',
+            domainType: 'cloud.smarthq.domain.thermostat',
+        };
+        try {
+            await this.client.sendCommand(cmdBody);
+        }
+        catch (error) {
+            // handleApiError in ge-smarthq is async but callers don't await it,
+            // so the thrown value is a Promise<Error> — await it to get the real message.
+            const resolved = error instanceof Promise ? await error : error;
+            const msg = resolved instanceof Error ? resolved.message : JSON.stringify(resolved);
+            this.client.debug('Error sending AC thermostat command: ' + msg);
+        }
+    }
+    // ── Service helpers ────────────────────────────────────────────────────────
+    findService(serviceType, domainType) {
+        return this.deviceServices.find(s => s.serviceType === serviceType && s.domainType === domainType);
+    }
+    // ── Handlers ──────────────────────────────────────────────────────────────
+    async getCurrentHeatingCoolingState() {
+        const svc = this.findService('cloud.smarthq.service.toggle', 'cloud.smarthq.domain.state.compressor');
+        if (!svc)
+            return this.Characteristic.CurrentHeatingCoolingState.OFF;
+        try {
+            const response = await this.client.getServiceDetails(this.deviceId, svc.serviceId);
+            const running = response?.state?.on ?? false;
+            this.isOn = running;
+            return running
+                ? this.Characteristic.CurrentHeatingCoolingState.COOL
+                : this.Characteristic.CurrentHeatingCoolingState.OFF;
+        }
+        catch (error) {
+            this.client.debug('Error getting AC compressor state: ' + error);
+            return this.Characteristic.CurrentHeatingCoolingState.OFF;
+        }
+    }
+    getTargetHeatingCoolingState() {
+        if (!this.isOn)
+            return this.Characteristic.TargetHeatingCoolingState.OFF;
+        return this.modeToHK[this.targetMode] ?? this.Characteristic.TargetHeatingCoolingState.COOL;
+    }
+    async setTargetHeatingCoolingState(value) {
+        const hkValue = value;
+        const HK = this.Characteristic.TargetHeatingCoolingState;
+        if (hkValue === HK.OFF) {
+            this.isOn = false;
+            await this.sendThermostatCommand(this.targetMode, this.targetCelsius, this.targetFanSpeed, false);
+            this.updateModeSwitches('');
+            // Explicitly update thermostat tile to OFF
+            this.acThermostat.getCharacteristic(this.Characteristic.TargetHeatingCoolingState).updateValue(HK.OFF);
+            return;
+        }
+        this.isOn = true;
+        const newMode = this.hkToMode[hkValue] ?? 'cloud.smarthq.type.thermostatmode.cool';
+        this.targetMode = newMode;
+        await this.sendThermostatCommand(newMode, this.targetCelsius, this.targetFanSpeed, true);
+        this.updateModeSwitches(newMode);
+    }
+    async getCurrentTemperature() {
+        const svc = this.findService('cloud.smarthq.service.temperature', 'cloud.smarthq.domain.indoor.ambient');
+        if (!svc)
+            return this.targetCelsius;
+        try {
+            const response = await this.client.getServiceDetails(this.deviceId, svc.serviceId);
+            if (response?.state?.celsiusConverted == null)
+                return this.targetCelsius;
+            return Number(response.state.celsiusConverted);
+        }
+        catch (error) {
+            this.client.debug('Error getting AC current temperature: ' + error);
+            return this.targetCelsius;
+        }
+    }
+    getTargetTemperature() {
+        return this.targetCelsius;
+    }
+    // Only send command when AC is already on — don't turn it on just by moving the temp slider
+    async setTargetTemperature(value) {
+        this.targetCelsius = value;
+        if (this.isOn) {
+            await this.sendThermostatCommand(this.targetMode, this.targetCelsius, this.targetFanSpeed, true);
+        }
+    }
+    handleTemperatureDisplayUnitsGet() {
+        return this.Characteristic.TemperatureDisplayUnits.FAHRENHEIT;
+    }
+    handleTemperatureDisplayUnitsSet(value) {
+        this.client.debug('AC Temperature Display Units set to: ' + value);
+    }
+    // authenticate() before connect() so token is valid for both
+    // sendCommand HTTP calls and the WebSocket connection
+    async setupWebSocket() {
+        try {
+            await this.client.authenticate();
+            await this.client.connect();
+        }
+        catch (error) {
+            this.client.debug('Failed to connect to SmartHQ WebSocket for AC: ' + error);
+        }
+    }
+}
+//# sourceMappingURL=airConditioner.js.map

package/dist/airConditioner/airConditioner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"airConditioner.js","sourceRoot":"","sources":["../../src/airConditioner/airConditioner.ts"],"names":[],"mappings":"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"}

package/dist/airConditionerServices.d.ts

@@ -0,0 +1,4 @@
+import { PlatformAccessory } from 'homebridge';
+import { SmartHqPlatform } from './platform.js';
+import { DeviceService } from 'ge-smarthq';
+export declare function setupAirConditionerServices(this: SmartHqPlatform, accessory: PlatformAccessory, deviceServices: DeviceService[], deviceId: string): void;

package/dist/airConditionerServices.js

@@ -0,0 +1,5 @@
+import { AirConditioner } from './airConditioner/airConditioner.js';
+export function setupAirConditionerServices(accessory, deviceServices, deviceId) {
+    new AirConditioner(this, accessory, deviceServices, deviceId);
+}
+//# sourceMappingURL=airConditionerServices.js.map

package/dist/airConditionerServices.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"airConditionerServices.js","sourceRoot":"","sources":["../src/airConditionerServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAKpE,MAAM,UAAU,2BAA2B,CAAwB,SAA4B,EAAE,cAA+B,EAAE,QAAgB;IAChJ,IAAI,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;AAChE,CAAC"}

package/dist/dishwasher/controlLock.js

@@ -112,7 +112,11 @@ export class ControlLock {
             }
         }
         catch (error) {
-            this.client.debug("Error sending setcontrolsLock command: " + error);
+            // handleApiError in ge-smarthq is async but callers don't await it,
+            // so the thrown value is a Promise<Error> — await it to get the real message.
+            const resolved = error instanceof Promise ? await error : error;
+            const msg = resolved instanceof Error ? resolved.message : JSON.stringify(resolved);
+            this.client.debug("Error sending setcontrolsLock command: " + msg);
         }
     }
 }

package/dist/dishwasher/controlLock.js.map

@@ -1 +1 @@
-{"version":3,"file":"controlLock.js","sourceRoot":"","sources":["../../src/dishwasher/controlLock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"controlLock.js","sourceRoot":"","sources":["../../src/dishwasher/controlLock.ts"],"names":[],"mappings":"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"}

package/dist/dishwasher/dishwasher.js

@@ -177,9 +177,9 @@ export class Dishwasher {
         //=====================================================================================
         // create a new Lightbulb service for the Cycle % Done
         //=====================================================================================
-        displayName = "Cycle % Done";
+        displayName = "Cycle Pct Done";
         const cyclePct = this.accessory.getService(displayName) ||
-            this.accessory.addService(this.Service.Lightbulb, displayName, "cycle-done-2");
+            this.accessory.addService(this.Service.Lightbulb, displayName, "cycle-done-3");
         cyclePct.setCharacteristic(this.Characteristic.Name, displayName);
         cyclePct.addOptionalCharacteristic(this.Characteristic.ConfiguredName);
         cyclePct.setCharacteristic(this.Characteristic.ConfiguredName, displayName);
@@ -742,6 +742,9 @@ export class Dishwasher {
     }
     setupGroupService(serviceType, displayName, serviceIdSuffix, accessory) {
         let service;
+        if (displayName === "1") {
+            displayName = "1 Hour";
+        }
         this.client.debug(chalk.blue("Setting up  " + serviceType + " for " + displayName));
         switch (serviceType) {
             case "Outlet":