isy-nodejs 1.0.2-alpha.2 → 1.0.2-alpha.4

package/src/Devices/Insteon/Generated/I3PaddleFlags.ts

@@ -3,7 +3,7 @@
 import { UnitOfMeasure } from "../../../Definitions/Global/UOM.js";
 import { Family } from "../../../Definitions/Global/Families.js";
 import type { NodeInfo } from "../../../Model/NodeInfo.js";
-import type { ISY } from "../../../ISY.js";
+import { ISY } from "../../../ISY.js";
 import type { ISYNode } from "../../../ISYNode.js";
 import { Base } from "../index.js";
 import { ISYDeviceNode } from "../../ISYDeviceNode.js";
@@ -12,13 +12,13 @@ import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "I3PaddleFlags";
+const nodeDefId = "I3PaddleFlags";
 
 type Commands = I3PaddleFlags.Commands;
 type Drivers = I3PaddleFlags.Drivers;
 
 export class I3PaddleFlagsNode extends Base<Drivers, Commands> implements I3PaddleFlags.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		GV0: this.updateMode,
 		GV1: this.updateProgramLock,
 		GV2: this.updateResumeDim,
@@ -29,7 +29,8 @@ export class I3PaddleFlagsNode extends Base<Drivers, Commands> implements I3Padd
 		QUERY: this.query,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "I3PaddleFlags";
+	static override nodeDefId = "I3PaddleFlags";
+	static override implements = ["I3PaddleFlags"];
 	declare readonly nodeDefId: "I3PaddleFlags";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
@@ -42,33 +43,15 @@ export class I3PaddleFlagsNode extends Base<Drivers, Commands> implements I3Padd
 		this.drivers.GV7 = Driver.create("GV7", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Boolean, label: "Error Blink", name: "errorBlink" });
 		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
 	}
-	async updateMode(value: Insteon.I3RelayDim) {
-		return this.sendCommand("GV0", { value: value });
-	}
-	async updateProgramLock(value: Insteon.I3OnOff) {
-		return this.sendCommand("GV1", { value: value });
-	}
-	async updateResumeDim(value: Insteon.I3OnOff) {
-		return this.sendCommand("GV2", { value: value });
-	}
-	async updateKeyBeep(value: Insteon.I3OnOff) {
-		return this.sendCommand("GV4", { value: value });
-	}
-	async updateDisableRf(value: Insteon.I3OnOff) {
-		return this.sendCommand("GV5", { value: value });
-	}
-	async updateButtonLock(value: Insteon.I3OnOff) {
-		return this.sendCommand("GV6", { value: value });
-	}
-	async updateErrorBlink(value: Insteon.I3OnOff) {
-		return this.sendCommand("GV7", { value: value });
-	}
-	async query() {
-		return this.sendCommand("QUERY");
-	}
-	async writeChanges() {
-		return this.sendCommand("WDU");
-	}
+	async updateMode(value: Insteon.I3RelayDim) { return this.sendCommand("GV0", { value: value }); }
+	async updateProgramLock(value: Insteon.I3OnOff) { return this.sendCommand("GV1", { value: value }); }
+	async updateResumeDim(value: Insteon.I3OnOff) { return this.sendCommand("GV2", { value: value }); }
+	async updateKeyBeep(value: Insteon.I3OnOff) { return this.sendCommand("GV4", { value: value }); }
+	async updateDisableRf(value: Insteon.I3OnOff) { return this.sendCommand("GV5", { value: value }); }
+	async updateButtonLock(value: Insteon.I3OnOff) { return this.sendCommand("GV6", { value: value }); }
+	async updateErrorBlink(value: Insteon.I3OnOff) { return this.sendCommand("GV7", { value: value }); }
+	async query() { return this.sendCommand("QUERY"); }
+	async writeChanges() { return this.sendCommand("WDU"); }
 	public get mode(): Insteon.I3RelayDim {
 		return this.drivers.ST?.value;
 	}
@@ -101,8 +84,9 @@ export namespace I3PaddleFlags {
 	export interface Interface extends Omit<InstanceType<typeof I3PaddleFlagsNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "I3PaddleFlags";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is I3PaddleFlagsNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is I3PaddleFlagsNode { return ["I3PaddleFlags"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is I3PaddleFlagsNode {
+		return ["I3PaddleFlags", "I3KeypadFlags"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new I3PaddleFlagsNode(isy, nodeInfo);

package/src/Devices/Insteon/Generated/ImeterSolo.ts

@@ -3,7 +3,7 @@
 import { UnitOfMeasure } from "../../../Definitions/Global/UOM.js";
 import { Family } from "../../../Definitions/Global/Families.js";
 import type { NodeInfo } from "../../../Model/NodeInfo.js";
-import type { ISY } from "../../../ISY.js";
+import { ISY } from "../../../ISY.js";
 import type { ISYNode } from "../../../ISYNode.js";
 import { Base } from "../index.js";
 import { ISYDeviceNode } from "../../ISYDeviceNode.js";
@@ -12,18 +12,19 @@ import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "IMETER_SOLO";
+const nodeDefId = "IMETER_SOLO";
 
 type Commands = ImeterSolo.Commands;
 type Drivers = ImeterSolo.Drivers;
 
 export class ImeterSoloNode extends Base<Drivers, Commands> implements ImeterSolo.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		RESET: this.resetTotalEnergy,
 		QUERY: this.query,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "IMETER_SOLO";
+	static override nodeDefId = "IMETER_SOLO";
+	static override implements = ["IMETER_SOLO"];
 	declare readonly nodeDefId: "IMETER_SOLO";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
@@ -31,15 +32,9 @@ export class ImeterSoloNode extends Base<Drivers, Commands> implements ImeterSol
 		this.drivers.TPW = Driver.create("TPW", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.KilowattsPerHour, label: "Total Energy", name: "totalEnergy" });
 		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
 	}
-	async resetTotalEnergy() {
-		return this.sendCommand("RESET");
-	}
-	async query() {
-		return this.sendCommand("QUERY");
-	}
-	async writeChanges() {
-		return this.sendCommand("WDU");
-	}
+	async resetTotalEnergy() { return this.sendCommand("RESET"); }
+	async query() { return this.sendCommand("QUERY"); }
+	async writeChanges() { return this.sendCommand("WDU"); }
 	public get currentPower(): number {
 		return this.drivers.ST?.value;
 	}
@@ -57,8 +52,9 @@ export namespace ImeterSolo {
 	export interface Interface extends Omit<InstanceType<typeof ImeterSoloNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "IMETER_SOLO";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is ImeterSoloNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is ImeterSoloNode { return ["IMETER_SOLO"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is ImeterSoloNode {
+		return ["IMETER_SOLO"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new ImeterSoloNode(isy, nodeInfo);

package/src/Devices/Insteon/Generated/IrLincTx.ts

@@ -3,7 +3,7 @@
 import { UnitOfMeasure } from "../../../Definitions/Global/UOM.js";
 import { Family } from "../../../Definitions/Global/Families.js";
 import type { NodeInfo } from "../../../Model/NodeInfo.js";
-import type { ISY } from "../../../ISY.js";
+import { ISY } from "../../../ISY.js";
 import type { ISYNode } from "../../../ISYNode.js";
 import { Base } from "../index.js";
 import { ISYDeviceNode } from "../../ISYDeviceNode.js";
@@ -12,28 +12,25 @@ import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "IRLincTx";
+const nodeDefId = "IRLincTx";
 
 type Commands = IrLincTx.Commands;
 type Drivers = IrLincTx.Drivers;
 
 export class IrLincTxNode extends Base<Drivers, Commands> implements IrLincTx.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		BEEP: this.beep,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "IRLincTx";
+	static override nodeDefId = "IRLincTx";
+	static override implements = ["IRLincTx", "SirenAlert", "SirenArm"];
 	declare readonly nodeDefId: "IRLincTx";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
 		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
 	}
-	async beep(value?: number) {
-		return this.sendCommand("BEEP", { value: value });
-	}
-	async writeChanges() {
-		return this.sendCommand("WDU");
-	}
+	async beep(value?: number) { return this.sendCommand("BEEP", { value: value }); }
+	async writeChanges() { return this.sendCommand("WDU"); }
 	public get responding(): Insteon.Error {
 		return this.drivers.ERR?.value;
 	}
@@ -45,8 +42,9 @@ export namespace IrLincTx {
 	export interface Interface extends Omit<InstanceType<typeof IrLincTxNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "IRLincTx";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is IrLincTxNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is IrLincTxNode { return ["IRLincTx"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is IrLincTxNode {
+		return ["IRLincTx", "Thermostat", "TempLinc", "DimmerMotorSwitch", "DimmerMotorSwitch_ADV", "DimmerLampSwitch", "DimmerLampSwitch_ADV", "DimmerLampSwitchLED", "DimmerLampSwitchLED_ADV", "DimmerLampOnly", "KeypadDimmer", "KeypadDimmer_ADV", "BallastRelayLampSwitch", "BallastRelayLampSwitch_ADV", "RelayLampSwitch", "RelayLampSwitch_ADV", "RelayLampSwitchLED", "RelayLampSwitchLED_ADV", "RelaySwitchOnlyPlusQuery", "RelaySwitchOnlyPlusQuery_ADV", "RelaySwitchOnly", "RelaySwitchOnly_ADV", "RelayLampOnly", "RelayLampOnly_ADV", "KeypadRelay", "KeypadRelay_ADV"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new IrLincTxNode(isy, nodeInfo);

package/src/Devices/Insteon/Generated/{KeypadButtonAdv.ts → KeypadButton.ts}

@@ -3,7 +3,7 @@
 import { UnitOfMeasure } from "../../../Definitions/Global/UOM.js";
 import { Family } from "../../../Definitions/Global/Families.js";
 import type { NodeInfo } from "../../../Model/NodeInfo.js";
-import type { ISY } from "../../../ISY.js";
+import { ISY } from "../../../ISY.js";
 import type { ISYNode } from "../../../ISYNode.js";
 import { Base } from "../index.js";
 import { ISYDeviceNode } from "../../ISYDeviceNode.js";
@@ -12,33 +12,28 @@ import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "KeypadButton_ADV";
+const nodeDefId = "KeypadButton";
 
-type Commands = KeypadButtonAdv.Commands;
-type Drivers = KeypadButtonAdv.Drivers;
+type Commands = KeypadButton.Commands;
+type Drivers = KeypadButton.Drivers;
 
-export class KeypadButtonAdvNode extends Base<Drivers, Commands> implements KeypadButtonAdv.Interface {
-	public readonly commands = {
+export class KeypadButtonNode extends Base<Drivers, Commands> implements KeypadButton.Interface {
+	public override readonly commands = {
 		QUERY: this.query,
 		BL: this.backlight,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "KeypadButton_ADV";
-	declare readonly nodeDefId: "KeypadButton_ADV";
+	static override nodeDefId = "KeypadButton";
+	static override implements = ["KeypadButton", "EZIO2x4_Input", "EZIO2x4_Input_ADV", "SirenAlert", "SirenArm"];
+	declare readonly nodeDefId: "KeypadButton" | "KeypadButton_ADV";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
 		this.drivers.ST = Driver.create("ST", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: "Status", name: "status" });
 		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
 	}
-	async query() {
-		return this.sendCommand("QUERY");
-	}
-	async backlight(value: number) {
-		return this.sendCommand("BL", { value: value });
-	}
-	async writeChanges() {
-		return this.sendCommand("WDU");
-	}
+	async query() { return this.sendCommand("QUERY"); }
+	async backlight(value: Insteon.Backlight) { return this.sendCommand("BL", { value: value }); }
+	async writeChanges() { return this.sendCommand("WDU"); }
 	public get status(): Insteon.OnLevelRelay {
 		return this.drivers.ST?.value;
 	}
@@ -47,25 +42,27 @@ export class KeypadButtonAdvNode extends Base<Drivers, Commands> implements Keyp
 	}
 }
 
-NodeFactory.register(KeypadButtonAdvNode);
+NodeFactory.register(KeypadButtonNode);
+NodeFactory.register(KeypadButtonNode, "KeypadButton_ADV");
 
-export namespace KeypadButtonAdv {
-	export interface Interface extends Omit<InstanceType<typeof KeypadButtonAdvNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "KeypadButton_ADV";
+export namespace KeypadButton {
+	export interface Interface extends Omit<InstanceType<typeof KeypadButtonNode>, keyof ISYDeviceNode<any, any, any, any>> {
+		nodeDefId: "KeypadButton" | "KeypadButton_ADV";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is KeypadButtonAdvNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is KeypadButtonNode { return ["KeypadButton", "KeypadButton_ADV"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is KeypadButtonNode {
+		return ["KeypadButton", "KeypadRelay", "KeypadRelay_ADV", "KeypadButton_ADV"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
-		return new KeypadButtonAdvNode(isy, nodeInfo);
+		return new KeypadButtonNode(isy, nodeInfo);
 	}
-	export const Node = KeypadButtonAdvNode;
+	export const Node = KeypadButtonNode;
 	export type Commands = {
 		QUERY: (() => Promise<boolean>) & {
 			label: "Query";
 			name: "query";
 		};
-		BL: ((value: number) => Promise<boolean>) & {
+		BL: ((value: Insteon.Backlight) => Promise<boolean>) & {
 			label: "Backlight";
 			name: "backlight";
 		};

package/src/Devices/Insteon/Generated/KeypadDimmer.ts

@@ -3,7 +3,7 @@
 import { UnitOfMeasure } from "../../../Definitions/Global/UOM.js";
 import { Family } from "../../../Definitions/Global/Families.js";
 import type { NodeInfo } from "../../../Model/NodeInfo.js";
-import type { ISY } from "../../../ISY.js";
+import { ISY } from "../../../ISY.js";
 import type { ISYNode } from "../../../ISYNode.js";
 import { Base } from "../index.js";
 import { ISYDeviceNode } from "../../ISYDeviceNode.js";
@@ -12,13 +12,13 @@ import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "KeypadDimmer";
+const nodeDefId = "KeypadDimmer";
 
 type Commands = KeypadDimmer.Commands;
 type Drivers = KeypadDimmer.Drivers;
 
 export class KeypadDimmerNode extends Base<Drivers, Commands> implements KeypadDimmer.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		DON: this.on,
 		DOF: this.off,
 		DFOF: this.fastOff,
@@ -35,8 +35,9 @@ export class KeypadDimmerNode extends Base<Drivers, Commands> implements KeypadD
 		BL: this.backlight,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "KeypadDimmer";
-	declare readonly nodeDefId: "KeypadDimmer";
+	static override nodeDefId = "KeypadDimmer";
+	static override implements = ["KeypadDimmer", "RemoteLinc2", "RemoteLinc2_ADV", "IRLincTx", "SirenAlert", "SirenArm"];
+	declare readonly nodeDefId: "KeypadDimmer" | "KeypadDimmer_ADV";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
 		this.drivers.ST = Driver.create("ST", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: "Status", name: "status" });
@@ -44,58 +45,28 @@ export class KeypadDimmerNode extends Base<Drivers, Commands> implements KeypadD
 		this.drivers.RR = Driver.create("RR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Ramp Rate", name: "rampRate" });
 		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
 	}
-	async on(value?: number) {
-		return this.sendCommand("DON", { value: value });
-	}
-	async off() {
-		return this.sendCommand("DOF");
-	}
-	async fastOff() {
-		return this.sendCommand("DFOF");
-	}
-	async fastOn() {
-		return this.sendCommand("DFON");
-	}
-	async brighten() {
-		return this.sendCommand("BRT");
-	}
-	async dim() {
-		return this.sendCommand("DIM");
-	}
-	async fadeUp() {
-		return this.sendCommand("FDUP");
-	}
-	async fadeDown() {
-		return this.sendCommand("FDDOWN");
-	}
-	async fadeStop() {
-		return this.sendCommand("FDSTOP");
-	}
-	async query() {
-		return this.sendCommand("QUERY");
-	}
-	async beep(value?: number) {
-		return this.sendCommand("BEEP", { value: value });
-	}
-	async updateOnLevel(value: number) {
-		return this.sendCommand("OL", { value: value });
-	}
-	async updateRampRate(value: number) {
-		return this.sendCommand("RR", { value: value });
-	}
-	async backlight(value: number) {
-		return this.sendCommand("BL", { value: value });
-	}
-	async writeChanges() {
-		return this.sendCommand("WDU");
-	}
+	async on(value?: number) { return this.sendCommand("DON", { value: value }); }
+	async off() { return this.sendCommand("DOF"); }
+	async fastOff() { return this.sendCommand("DFOF"); }
+	async fastOn() { return this.sendCommand("DFON"); }
+	async brighten() { return this.sendCommand("BRT"); }
+	async dim() { return this.sendCommand("DIM"); }
+	async fadeUp() { return this.sendCommand("FDUP"); }
+	async fadeDown() { return this.sendCommand("FDDOWN"); }
+	async fadeStop() { return this.sendCommand("FDSTOP"); }
+	async query() { return this.sendCommand("QUERY"); }
+	async beep(value?: number) { return this.sendCommand("BEEP", { value: value }); }
+	async updateOnLevel(value: number) { return this.sendCommand("OL", { value: value }); }
+	async updateRampRate(value: Insteon.RampRate) { return this.sendCommand("RR", { value: value }); }
+	async backlight(value: Insteon.Backlight) { return this.sendCommand("BL", { value: value }); }
+	async writeChanges() { return this.sendCommand("WDU"); }
 	public get status(): number {
 		return this.drivers.ST?.value;
 	}
 	public get onLevel(): number {
 		return this.drivers.OL?.value;
 	}
-	public get rampRate(): number {
+	public get rampRate(): Insteon.RampRate {
 		return this.drivers.RR?.value;
 	}
 	public get responding(): Insteon.Error {
@@ -104,13 +75,15 @@ export class KeypadDimmerNode extends Base<Drivers, Commands> implements KeypadD
 }
 
 NodeFactory.register(KeypadDimmerNode);
+NodeFactory.register(KeypadDimmerNode, "KeypadDimmer_ADV");
 
 export namespace KeypadDimmer {
 	export interface Interface extends Omit<InstanceType<typeof KeypadDimmerNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "KeypadDimmer";
+		nodeDefId: "KeypadDimmer" | "KeypadDimmer_ADV";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is KeypadDimmerNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is KeypadDimmerNode { return ["KeypadDimmer", "KeypadDimmer_ADV"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is KeypadDimmerNode {
+		return ["KeypadDimmer", "KeypadDimmer_ADV"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new KeypadDimmerNode(isy, nodeInfo);
@@ -165,11 +138,11 @@ export namespace KeypadDimmer {
 			label: "On Level";
 			name: "updateOnLevel";
 		};
-		RR: ((value: number) => Promise<boolean>) & {
+		RR: ((value: Insteon.RampRate) => Promise<boolean>) & {
 			label: "Ramp Rate";
 			name: "updateRampRate";
 		};
-		BL: ((value: number) => Promise<boolean>) & {
+		BL: ((value: Insteon.Backlight) => Promise<boolean>) & {
 			label: "Backlight";
 			name: "backlight";
 		};
@@ -193,7 +166,7 @@ export namespace KeypadDimmer {
 		};
 		RR: {
 			uom: UnitOfMeasure.Index;
-			value: number;
+			value: Insteon.RampRate;
 			label: "Ramp Rate";
 			name: "rampRate";
 		};

package/src/Devices/Insteon/Generated/KeypadRelay.ts

@@ -1,9 +1,9 @@
-/* THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT DIRECTLY. */
-
+/* THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT EDIT DIRECTLY. */
+
 import { UnitOfMeasure } from "../../../Definitions/Global/UOM.js";
 import { Family } from "../../../Definitions/Global/Families.js";
 import type { NodeInfo } from "../../../Model/NodeInfo.js";
-import type { ISY } from "../../../ISY.js";
+import { ISY } from "../../../ISY.js";
 import type { ISYNode } from "../../../ISYNode.js";
 import { Base } from "../index.js";
 import { ISYDeviceNode } from "../../ISYDeviceNode.js";
@@ -11,14 +11,14 @@ import { Driver } from "../../../Definitions/Global/Drivers.js";
 import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
-
-export const nodeDefId = "KeypadRelay";
-
+
+const nodeDefId = "KeypadRelay";
+
 type Commands = KeypadRelay.Commands;
 type Drivers = KeypadRelay.Drivers;
-
+
 export class KeypadRelayNode extends Base<Drivers, Commands> implements KeypadRelay.Interface {
-	public readonly commands = {
+	public override readonly commands = {
 		DON: this.on,
 		DOF: this.off,
 		DFOF: this.fastOff,
@@ -28,53 +28,40 @@ export class KeypadRelayNode extends Base<Drivers, Commands> implements KeypadRe
 		BL: this.backlight,
 		WDU: this.writeChanges
 	};
-	static nodeDefId = "KeypadRelay";
-	declare readonly nodeDefId: "KeypadRelay";
+	static override nodeDefId = "KeypadRelay";
+	static override implements = ["KeypadRelay", "IRLincTx", "KeypadButton", "KeypadButton_ADV", "EZRAIN_Output", "EZIO2x4_Output", "EZIO2x4_Input", "EZIO2x4_Input_ADV", "DoorLock", "BinaryAlarm", "BinaryAlarm_ADV", "BinaryControl", "BinaryControl_ADV", "AlertModuleArmed", "SirenAlert", "SirenArm", "PIR2844OnOff", "PIR2844OnOff_ADV"];
+	declare readonly nodeDefId: "KeypadRelay" | "KeypadRelay_ADV";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
-		this.drivers.ST = Driver.create("ST", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: "Status", name: "status" });
+		this.drivers.ST = Driver.create("ST", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Boolean, label: "Status", name: "status" });
 		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
 	}
-	async on(value?: (0 | 100)) {
-		return this.sendCommand("DON", { value: value });
-	}
-	async off() {
-		return this.sendCommand("DOF");
-	}
-	async fastOff() {
-		return this.sendCommand("DFOF");
-	}
-	async fastOn() {
-		return this.sendCommand("DFON");
-	}
-	async query() {
-		return this.sendCommand("QUERY");
-	}
-	async beep(value?: number) {
-		return this.sendCommand("BEEP", { value: value });
-	}
-	async backlight(value: number) {
-		return this.sendCommand("BL", { value: value });
-	}
-	async writeChanges() {
-		return this.sendCommand("WDU");
-	}
-	public get status(): Insteon.OnLevelRelay {
+	async on(value?: (0 | 100)) { return this.sendCommand("DON", { value: value }); }
+	async off() { return this.sendCommand("DOF"); }
+	async fastOff() { return this.sendCommand("DFOF"); }
+	async fastOn() { return this.sendCommand("DFON"); }
+	async query() { return this.sendCommand("QUERY"); }
+	async beep(value?: number) { return this.sendCommand("BEEP", { value: value }); }
+	async backlight(value: number) { return this.sendCommand("BL", { value: value }); }
+	async writeChanges() { return this.sendCommand("WDU"); }
+	public get status(): number {
 		return this.drivers.ST?.value;
 	}
 	public get responding(): Insteon.Error {
 		return this.drivers.ERR?.value;
 	}
 }
-
+
 NodeFactory.register(KeypadRelayNode);
-
+NodeFactory.register(KeypadRelayNode, "KeypadRelay_ADV");
+
 export namespace KeypadRelay {
 	export interface Interface extends Omit<InstanceType<typeof KeypadRelayNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "KeypadRelay";
+		nodeDefId: "KeypadRelay" | "KeypadRelay_ADV";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is KeypadRelayNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is KeypadRelayNode { return ["KeypadRelay", "KeypadRelay_ADV"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is KeypadRelayNode {
+		return ["KeypadRelay", "KeypadRelay_ADV"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new KeypadRelayNode(isy, nodeInfo);
@@ -116,8 +103,8 @@ export namespace KeypadRelay {
 	};
 	export type Drivers = {
 		ST: {
-			uom: UnitOfMeasure.Percent;
-			value: Insteon.OnLevelRelay;
+			uom: UnitOfMeasure.Boolean;
+			value: number;
 			label: "Status";
 			name: "status";
 		};

package/src/Devices/Insteon/Generated/OnOffControl.ts

@@ -3,7 +3,7 @@
 import { UnitOfMeasure } from "../../../Definitions/Global/UOM.js";
 import { Family } from "../../../Definitions/Global/Families.js";
 import type { NodeInfo } from "../../../Model/NodeInfo.js";
-import type { ISY } from "../../../ISY.js";
+import { ISY } from "../../../ISY.js";
 import type { ISYNode } from "../../../ISYNode.js";
 import { Base } from "../index.js";
 import { ISYDeviceNode } from "../../ISYDeviceNode.js";
@@ -12,21 +12,22 @@ import { Insteon } from "../../../Definitions/index.js";
 import type { DriverState } from "../../../Model/DriverState.js";
 import { NodeFactory } from "../../NodeFactory.js";
 
-export const nodeDefId = "OnOffControl";
+const nodeDefId = "OnOffControl";
 
 type Commands = OnOffControl.Commands;
 type Drivers = OnOffControl.Drivers;
 
 export class OnOffControlNode extends Base<Drivers, Commands> implements OnOffControl.Interface {
-	public readonly commands = {};
-	static nodeDefId = "OnOffControl";
-	declare readonly nodeDefId: "OnOffControl";
+	public override readonly commands = {};
+	static override nodeDefId = "OnOffControl";
+	static override implements = ["OnOffControl", "SirenAlert", "SirenArm"];
+	declare readonly nodeDefId: "OnOffControl" | "OnOffControl_ADV";
 	constructor (isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
-		this.drivers.ST = Driver.create("ST", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Percent, label: "Status", name: "status" });
+		this.drivers.ST = Driver.create("ST", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Boolean, label: "Status", name: "status" });
 		this.drivers.ERR = Driver.create("ERR", this, nodeInfo.property as DriverState, { uom: UnitOfMeasure.Index, label: "Responding", name: "responding" });
 	}
-	public get status(): Insteon.OnLevelRelay {
+	public get status(): Insteon.OnLevelRelay | Insteon.OnLevelRelay {
 		return this.drivers.ST?.value;
 	}
 	public get responding(): Insteon.Error {
@@ -35,13 +36,15 @@ export class OnOffControlNode extends Base<Drivers, Commands> implements OnOffCo
 }
 
 NodeFactory.register(OnOffControlNode);
+NodeFactory.register(OnOffControlNode, "OnOffControl_ADV");
 
 export namespace OnOffControl {
 	export interface Interface extends Omit<InstanceType<typeof OnOffControlNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "OnOffControl";
+		nodeDefId: "OnOffControl" | "OnOffControl_ADV";
 	}
-	export function is(node: ISYNode<any, any, any, any>): node is OnOffControlNode {
-		return node.nodeDefId === nodeDefId;
+	export function is(node: ISYNode<any, any, any, any>): node is OnOffControlNode { return ["OnOffControl", "OnOffControl_ADV"].includes(node.nodeDefId); }
+	export function isImplementedBy(node: ISYNode<any, any, any, any>): node is OnOffControlNode {
+		return ["OnOffControl", "X10", "OnOffControl_ADV"].includes(node.nodeDefId);
 	}
 	export function create(isy: ISY, nodeInfo: NodeInfo) {
 		return new OnOffControlNode(isy, nodeInfo);
@@ -50,8 +53,8 @@ export namespace OnOffControl {
 	export type Commands = {};
 	export type Drivers = {
 		ST: {
-			uom: UnitOfMeasure.Percent;
-			value: Insteon.OnLevelRelay;
+			uom: UnitOfMeasure.Boolean | UnitOfMeasure.Percent;
+			value: Insteon.OnLevelRelay | Insteon.OnLevelRelay;
 			label: "Status";
 			name: "status";
 		};