isy-nodejs 1.0.1-alpha.26 → 1.0.1-alpha.27

package/package.json

@@ -2,7 +2,7 @@
     "name": "isy-nodejs",
     "description": "Node.js wrapper for ISY interface including websockets for change notifications. Fork of isy-js by Rod Toll. Designed to be used in a node.js application.",
     "license": "MIT",
-    "version": "1.0.1-alpha.26",
+    "version": "1.0.1-alpha.27",
     "author": {
         "name": "Pradeep Mouli"
     },
@@ -69,5 +69,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "256b7ec74dbf1f1abcbfb7e0023f7c43ace45ad9"
+    "gitHead": "6818f4140be310656690e21c6a451f42cae1ef8f"
 }

package/src/Converters.ts

@@ -1,4 +1,3 @@
-
 import { UnitOfMeasure } from './Definitions/Global/UOM.js';
 import { type StringKeys } from './Utils.js';
 
@@ -9,26 +8,21 @@ let NullConverter: Converter<any, any>;
 	from: (value: any) => value;
 }
 
-BooleanPercentage = {
-	to: (value: number): boolean => {
-		return value > 0;
-	},
-	from: (value: boolean): number => {
-		return value ? 100 : 0;
-	}
-};
-
-const StandardConverters: {
-	[x in `${keyof typeof UnitOfMeasure}`]?: { [y in `${keyof typeof UnitOfMeasure}`]?: Converter<any, any> };
-} = {
+const StandardConverters = {
 	Boolean: {
 		LevelFrom0To255: {
 			to: (value: boolean) => (value ? 255 : 0),
 			from: (value: number) => value > 0
 		},
-		Percent: BooleanPercentage
+		Percent: {
+			to: (value: number): boolean => {
+				return value > 0;
+			},
+			from: (value: boolean): number => {
+				return value ? 100 : 0;
+			}
+		}
 	},
-	Percent: {},
 	LevelFrom0To255: {
 		Percent: {
 			to: (value: number): number => {
@@ -41,8 +35,8 @@ const StandardConverters: {
 	}
 };
 
-StandardConverters.Percent.LevelFrom0To255 = invert(StandardConverters.LevelFrom0To255.Percent);
-StandardConverters.LevelFrom0To255.Boolean = invert(StandardConverters.Boolean.LevelFrom0To255);
+//StandardConverters.Percent.LevelFrom0To255 = invert(StandardConverters.LevelFrom0To255.Percent);
+//StandardConverters.LevelFrom0To255.Boolean = invert(StandardConverters.Boolean.LevelFrom0To255);
 
 export const StdConverterRegistry = new Map<UnitOfMeasure | string, Map<UnitOfMeasure | string, Converter<any, any>>>();
 
@@ -94,6 +88,7 @@ export namespace Converter {
 					: value === 255 ? 254
 					: value
 			}
+
 		}
 	};
 
@@ -108,7 +103,7 @@ export namespace Converter {
 	export type MatterConverters = `${MatterISYConvertibleTypes}.${ISYMatterConvertibleTypes}` | `${ISYMatterConvertibleTypes}.${MatterISYConvertibleTypes}`;
 
 	export type KnownConverters = StandardConverters | MatterConverters;
-	const cache : {[x:string]:Converter<any,any>} = {};
+	const cache: { [x: string]: Converter<any, any> } = {};
 	export function get(label: KnownConverters): Converter<any, any>;
 	export function get(from: UnitOfMeasure, to: UnitOfMeasure);
 	export function get(from: ConverterTypes, to: ConverterTypes);
@@ -116,23 +111,22 @@ export namespace Converter {
 	export function get(from: MatterISYConvertibleTypes, to: ISYMatterConvertibleTypes);
 	export function get(to: ISYMatterConvertibleTypes, from: MatterISYConvertibleTypes);
 	export function get(from: UnitOfMeasure | `${keyof typeof UnitOfMeasure}` | string, to?: UnitOfMeasure | `${keyof typeof UnitOfMeasure}` | string): Converter<any, any> {
-		if(to === undefined) {
+		if (to === undefined) {
 			return ConverterRegistry.get(from as string) ?? NullConverter;
 		}
-		if(cache[`${from}.${to}`]) {
+		if (cache[`${from}.${to}`]) {
 			return cache[`${from}.${to}`];
-		}
-		else if(cache[`${to}.${from}`]) {
+		} else if (cache[`${to}.${from}`]) {
 			cache[`${from}.${to}`] = invert(cache[`${to}.${from}`]);
 			return cache[`${from}.${to}`];
 		}
 		let isString = typeof from === 'string';
 		let fuom = isString ? from : UnitOfMeasure[from];
 		if (to) {
-			let tuom = typeof to === 'string' ? to : UnitOfMeasure[to]; ;
+			let tuom = typeof to === 'string' ? to : UnitOfMeasure[to];
 
 			if (StdConverterRegistry.has(fuom)) {
-				if(StdConverterRegistry.get(fuom).has(tuom)) {
+				if (StdConverterRegistry.get(fuom).has(tuom)) {
 					return StdConverterRegistry.get(fuom).get(tuom);
 				}
 			}

package/src/Definitions/Global/Commands.ts

@@ -1,10 +1,22 @@
 import { TimeFormatLocalization } from '@project-chip/matter.js/cluster';
 import type { Identity, Merge, UnionToIntersection } from '@project-chip/matter.js/util';
 import type { Sign } from 'crypto';
+import type { UnitOfMeasure } from './UOM.js';
+
+/*export class Command<T extends string> extends Function {
+
+	constructor(public readonly label: string) {
+		super();
+	}
+
+	public async execute(...args: any[]): Promise<Boolean> {
+		return this(...args);
+	}
+}*/
 
 export namespace Command {
 
-    export type Signature<F extends {name: string} = CallableFunction, L extends string = string,N extends string = string> = F & {label: L, name: N };
+    export type Signature<F extends {name} = CallableFunction, L extends string = string,N extends string = string> = F & {label: L, name: N,} ;
 
     export type Signatures<C extends string> = {[K in C]: Signature<(...args: any[]) => Promise<Boolean>, string, string>};
 

package/src/Devices/Insteon/DimmerLampSwitch.ts

@@ -39,13 +39,13 @@ export class DimmerLampSwitchNode extends Base<Drivers, Commands> implements Dim
 	declare readonly nodeDefId: 'DimmerLampSwitch';
 	constructor(isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
-		this.drivers.ST = Driver.create('ST', this, nodeInfo.state['ST'], { uom: UnitOfMeasure.Percent, label: 'Status', name: 'status' });
+		this.drivers.ST = Driver.create('ST', this, nodeInfo.state['ST'], { uom: UnitOfMeasure.LevelFrom0To255, label: 'Status', name: 'status' });
 		this.drivers.OL = Driver.create('OL', this, nodeInfo.state['OL'] as DriverState, { uom: UnitOfMeasure.Percent, label: 'On Level', name: 'onLevel' });
 		this.drivers.RR = Driver.create('RR', this, nodeInfo.state['RR'] as DriverState, { uom: UnitOfMeasure.Index, label: 'Ramp Rate', name: 'rampRate' });
 		this.drivers.ERR = Driver.create('ERR', this, nodeInfo.state['ERR'] as DriverState, { uom: UnitOfMeasure.Index, label: 'Responding', name: 'responding' });
 	}
 	async on(value?: number) {
-		return this.sendCommand('DON', { value: value });
+		return this.sendCommand('DON', value);
 	}
 	async off() {
 		return this.sendCommand('DOF');
@@ -180,7 +180,7 @@ export namespace DimmerLampSwitch {
 	};
 	export type Drivers = {
 		ST: {
-			uom: UnitOfMeasure.Percent;
+			uom: UnitOfMeasure.LevelFrom0To255;
 			value: number;
 			label: 'Status';
 			name: 'status';

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

@@ -1,5 +1,5 @@
-/* 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";
@@ -11,12 +11,13 @@ 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";
-
+import { validateHeaderName } from 'http';
+
 export const nodeDefId = "DimmerLampSwitch";
-
+
 type Commands = DimmerLampSwitch.Commands;
 type Drivers = DimmerLampSwitch.Drivers;
-
+
 export class DimmerLampSwitchNode extends Base<Drivers, Commands> implements DimmerLampSwitch.Interface {
 	public readonly commands = {
 		DON: this.on,
@@ -102,9 +103,9 @@ export class DimmerLampSwitchNode extends Base<Drivers, Commands> implements Dim
 		return this.drivers.ERR?.value;
 	}
 }
-
+
 NodeFactory.register(DimmerLampSwitchNode);
-
+
 export namespace DimmerLampSwitch {
 	export interface Interface extends Omit<InstanceType<typeof DimmerLampSwitchNode>, keyof ISYDeviceNode<any, any, any, any>> {
 		nodeDefId: "DimmerLampSwitch";

package/src/Devices/Insteon/RelayLampSwitch.ts

@@ -1,18 +1,18 @@
 /* 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 type { ISYNode } from "../../ISYNode.js";
-import { InsteonBaseDevice } from "./InsteonBaseDevice.js";
-import { ISYDeviceNode } from "../ISYDeviceNode.js";
-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";
+import { Driver } from '../../Definitions/Global/Drivers.js';
+import { Family } from '../../Definitions/Global/Families.js';
+import { UnitOfMeasure } from '../../Definitions/Global/UOM.js';
+import { Insteon } from '../../Definitions/index.js';
+import type { ISY } from '../../ISY.js';
+import type { ISYNode } from '../../ISYNode.js';
+import type { DriverState } from '../../Model/DriverState.js';
+import type { NodeInfo } from '../../Model/NodeInfo.js';
+import { ISYDeviceNode } from '../ISYDeviceNode.js';
+import { NodeFactory } from '../NodeFactory.js';
+import { InsteonBaseDevice } from './InsteonBaseDevice.js';
 
-export const nodeDefId = "RelayLampSwitch";
+export const nodeDefId = 'RelayLampSwitch';
 
 type Commands = RelayLampSwitch.Commands;
 type Drivers = RelayLampSwitch.Drivers;
@@ -32,11 +32,11 @@ export class RelayLampSwitchNode extends InsteonBaseDevice<Drivers, Commands> im
 	declare readonly nodeDefId: 'RelayLampSwitch';
 	constructor(isy: ISY, nodeInfo: NodeInfo) {
 		super(isy, nodeInfo);
-		this.drivers.ST = Driver.create('ST', this, nodeInfo.state['ST'], { uom: UnitOfMeasure.Percent, label: 'Status', name: 'status' });
+		this.drivers.ST = Driver.create('ST', this, nodeInfo.state['ST'], { uom: UnitOfMeasure.Boolean, label: 'Status', name: 'status' });
 		this.drivers.ERR = Driver.create('ERR', this, nodeInfo.state['ERR'], { uom: UnitOfMeasure.Index, label: 'Responding', name: 'responding' });
 	}
 	async on(value?: 0 | 100) {
-		return this.sendCommand('DON', { value: value });
+		return this.sendCommand('DON', value);
 	}
 	async off() {
 		return this.sendCommand('DOF');
@@ -59,7 +59,7 @@ export class RelayLampSwitchNode extends InsteonBaseDevice<Drivers, Commands> im
 	async writeChanges() {
 		return this.sendCommand('WDU');
 	}
-	public get status(): Insteon.OnLevelRelay {
+	public get status(): boolean {
 		return this.drivers.ST?.value;
 	}
 	public get responding(): Insteon.Error {
@@ -71,7 +71,7 @@ NodeFactory.register(RelayLampSwitchNode);
 
 export namespace RelayLampSwitch {
 	export interface Interface extends Omit<InstanceType<typeof RelayLampSwitchNode>, keyof ISYDeviceNode<any, any, any, any>> {
-		nodeDefId: "RelayLampSwitch";
+		nodeDefId: 'RelayLampSwitch';
 	}
 	export function is(node: ISYNode<any, any, any, any>): node is RelayLampSwitchNode {
 		return node.nodeDefId === nodeDefId;
@@ -81,51 +81,51 @@ export namespace RelayLampSwitch {
 	}
 	export const Node = RelayLampSwitchNode;
 	export type Commands = {
-		DON: ((value?: (0 | 100)) => Promise<boolean>) & {
-			label: "On";
-			name: "on";
+		DON: ((value?: 0 | 100) => Promise<boolean>) & {
+			label: 'On';
+			name: 'on';
 		};
 		DOF: (() => Promise<boolean>) & {
-			label: "Off";
-			name: "off";
+			label: 'Off';
+			name: 'off';
 		};
 		DFOF: (() => Promise<boolean>) & {
-			label: "Fast Off";
-			name: "fastOff";
+			label: 'Fast Off';
+			name: 'fastOff';
 		};
 		DFON: (() => Promise<boolean>) & {
-			label: "Fast On";
-			name: "fastOn";
+			label: 'Fast On';
+			name: 'fastOn';
 		};
 		QUERY: (() => Promise<boolean>) & {
-			label: "Query";
-			name: "query";
+			label: 'Query';
+			name: 'query';
 		};
 		BEEP: ((value?: number) => Promise<boolean>) & {
-			label: "Beep";
-			name: "beep";
+			label: 'Beep';
+			name: 'beep';
 		};
 		BL: ((value: number) => Promise<boolean>) & {
-			label: "Backlight";
-			name: "backlight";
+			label: 'Backlight';
+			name: 'backlight';
 		};
 		WDU: (() => Promise<boolean>) & {
-			label: "Write Changes";
-			name: "writeChanges";
+			label: 'Write Changes';
+			name: 'writeChanges';
 		};
 	};
 	export type Drivers = {
 		ST: {
-			uom: UnitOfMeasure.Percent;
-			value: Insteon.OnLevelRelay;
-			label: "Status";
-			name: "status";
+			uom: UnitOfMeasure.Boolean;
+			value: boolean;
+			label: 'Status';
+			name: 'status';
 		};
 		ERR: {
 			uom: UnitOfMeasure.Index;
 			value: Insteon.Error;
-			label: "Responding";
-			name: "responding";
+			label: 'Responding';
+			name: 'responding';
 		};
 	};
 }

package/src/ISYScene.ts

@@ -77,7 +77,7 @@ export class ISYScene extends ISYNode<Family.Scene, Driver.Signatures<'ST'>,Comm
 	get isOn() {
 		for (const device of this.members) {
 			if (device instanceof Insteon.Relay)  {
-				if (device.drivers.ST?.value != 0) {
+				if (device.drivers.ST?.value) {
 					return true;
 				}
 			}

package/src/Matter/Behaviors/ISYBridgedDeviceBehavior.ts

@@ -12,6 +12,7 @@ import type { Driver } from '../../Definitions/Global/Drivers.js';
 import { ISY, type Family, type ISYNode } from '../../ISY.js';
 import type { ISYDevice } from '../../ISYDevice.js';
 import { DeviceToClusterMap, MappingRegistry, type ClusterMapping, type BehaviorMapping } from '../../Model/ClusterMap.js';
+import { server } from 'typescript';
 
 
 type ClusterForBehavior<B extends ClusterBehavior> = B extends ClusterBehavior.Type<infer C> ? C : never;
@@ -31,9 +32,11 @@ export class ISYBridgedDeviceBehavior<N extends ISYNode<any, D, any, any>, D ext
 		const d = ISY.instance.nodeMap.get(this.state.address);
 		this.internal.device = d;
 		this.internal.map = MappingRegistry.getMapping(this.internal.device as unknown as ISYNode<Family, any, any, any>);
+		
 		ISY.instance.logger.debug(`Initializing ${this.constructor.name} for ${this.internal.device.constructor.name} ${this.internal.device.name} with address ${address}`);
 		if (d) {
 			d.events.on('propertyChanged', this.handlePropertyChange.bind(this));
+
 			for(const f in d.drivers)
 			{
 				let evt = `${d.drivers[f].name}Changed`;
@@ -41,7 +44,8 @@ export class ISYBridgedDeviceBehavior<N extends ISYNode<any, D, any, any>, D ext
 
 				d.events.on(evt, (driver: string, newValue: any, oldValue: any, formattedValue: string) => obs.emit({ driver, newValue, oldValue, formattedValue }));
 				this.events[evt] = obs;
-				
+
+
 				//@ts-ignore
 				//d.events.on(evt, (driver: string, newValue: any, oldValue: any, formattedValue: string) => this.events.emit(evt, { driver, newValue, oldValue, formattedValue } as unknown as any));
 
@@ -62,13 +66,17 @@ export class ISYBridgedDeviceBehavior<N extends ISYNode<any, D, any, any>, D ext
 	}
 
 	handlePropertyChange(driver: string, newValue: any, oldValue: any, formattedValue: string) {
+
 		this.events.propertyChanged.emit({ driver, newValue, oldValue, formattedValue });
+
+
 	}
 
 	override [Symbol.asyncDispose]() {
 
 		this.internal.device = null;
 
+
 		return super[Symbol.asyncDispose]();
 	}
 }

package/src/Matter/Behaviors/ISYClusterBehavior.ts

@@ -15,6 +15,7 @@ import { ISY, type ISYDevice } from '../../ISY.js';
 import type { DriversOf, ISYNode } from '../../ISYNode.js';
 import { BehaviorMapping, MappingRegistry, type ClusterMapping, type DeviceToClusterMap } from '../../Model/ClusterMap.js';
 import { ISYBridgedDeviceBehavior } from './ISYBridgedDeviceBehavior.js';
+import { loggers } from 'winston';
 
 // #region Type aliases (6)
 
@@ -61,28 +62,34 @@ export function ISYClusterBehavior<T extends Constructor<ClusterBehavior> & { cl
 
 		override async initialize(_options?: {}) {
 			await super.initialize(_options);
+
 			var behavior = (await this.agent.load(ISYBridgedDeviceBehavior)) as ISYBridgedDeviceBehavior<P>;
 			this.bridgedDeviceBehavior = behavior;
 			//var behavior = this.agent.get(ISYBridgedDeviceBehavior);
 			this._device = behavior.device as P;
 			//@ts-ignore
+
 			this.map = behavior.mapForBehavior<T>(this as unknown as T);
 			for (const key2 in this.map.attributes) {
 				let val = this.map.attributes[key2];
 				let driverObj = null;
 				if (typeof val === 'string' || typeof val === 'symbol' || typeof val === 'number') {
 					driverObj = this._device.drivers[val];
+					this.state[key2 as string] = this._device.drivers[val].value;
 					this.handlers[val] = (newValue, oldValue, formattedValue) => {
 						this.state[key2 as string] = newValue;
 					};
+
 				} else if (val.driver as DriversOf<P>) {
 					driverObj = this._device.drivers[val.driver as string];
 
 					let { driver, converter } = val;
-					const convFunc = Converter.get(converter)?.from;
+					const convFunc = Converter.get(converter)?.to;
+					if(!convFunc) throw new Error(`Converter ${converter} not found`);
+					this.state[key2 as string] = convFunc(this._device.drivers[driver as string].value);
 					this.handlers[driver] = (newValue, oldValue, formattedValue) => {
-						if (convFunc) this.state[key2 as string] = convFunc(newValue);
-						else this.state[key2 as string] = newValue;
+						//if (convFunc) this.state[key2 as string] = convFunc(newValue);
+						 this.state[key2 as string] = convFunc(newValue);
 					};
 				}
 				if (driverObj) {

package/src/Matter/Behaviors/{ISYOnOffBehavior.ts → Insteon/ISYOnOffBehavior.ts}

@@ -5,39 +5,33 @@ import { DimmableLightRequirements } from '@project-chip/matter.js/devices/Dimma
 import { OnOffLightRequirements } from '@project-chip/matter.js/devices/OnOffLightDevice';
 import { OnOffLightSwitchDevice } from '@project-chip/matter.js/devices/OnOffLightSwitchDevice';
 import type { MaybePromise } from '@project-chip/matter.js/util';
-import { DriverType } from '../../Definitions/Global/Drivers.js';
-import { InsteonDimmableDevice } from '../../Devices/Insteon/InsteonDimmableDevice.js';
-import { InsteonRelayDevice } from '../../Devices/Insteon/InsteonRelayDevice.js';
-import { MappingRegistry } from '../../Model/ClusterMap.js';
-import { ClusterForBehavior, ISYClusterBehavior, type PropertyChange } from './ISYClusterBehavior.js';
+import { DriverType } from '../../../Definitions/Global/Drivers.js';
+import { InsteonDimmableDevice } from '../../../Devices/Insteon/InsteonDimmableDevice.js';
+import { InsteonRelayDevice } from '../../../Devices/Insteon/InsteonRelayDevice.js';
+import { MappingRegistry } from '../../../Model/ClusterMap.js';
+import { ClusterForBehavior, ISYClusterBehavior, type PropertyChange } from '../ISYClusterBehavior.js';
 
-import { Converter } from '../../Converters.js';
+import { Converter } from '../../../Converters.js';
 
 export class ISYOnOffBehavior extends ISYClusterBehavior(OnOffLightRequirements.OnOffServer, InsteonRelayDevice) {
 	override async initialize(_options?: {}) {
 		await super.initialize(_options);
-		this.state.onOff = (await this.device.status) > 0;
+		//this.state.onOff = this.device.status;
 		//this.state.onOff = await this.device.state;
 	}
 
 	override on = async () => {
-		await super.on();
 		await this.device.on();
 
 		//this.device.commands.DON = true;
 	};
 
 	override async off() {
-		await super.off();
 		await this.device.off();
 
 		// this.device.drivers = false;
 	}
 
-	override toggle = async () => {
-		//this.device.state = !(await this.device.state);
-	};
-
 	override async handlePropertyChange({ driver, newValue, oldValue, formattedValue }: PropertyChange<InsteonRelayDevice>) {
 
 		return super.handlePropertyChange({ driver, newValue, oldValue, formattedValue });
@@ -56,9 +50,10 @@ export class ISYDimmableBehavior extends ISYClusterBehavior(DimmableLightRequire
 	override setLevel(level: number): MaybePromise<void> {
 		level = Converter.Matter.LevelFrom0To255.LightingLevel.from(level);
 		if (level > 0) {
-			return this.device.on();
+			return this.device.on(level);
 		} else {
 			return this.device.off();
 		}
+
 	}
 }

package/src/Matter/Bridge/Server.ts

@@ -20,7 +20,7 @@ import { format, loggers } from 'winston';
 import type { ISYDeviceNode } from '../../Devices/ISYDeviceNode.js';
 import { InsteonDimmableDevice, InsteonKeypadButtonDevice, InsteonRelayDevice, ISY } from '../../ISY.js';
 import { ISYBridgedDeviceBehavior } from '../Behaviors/ISYBridgedDeviceBehavior.js';
-import { ISYDimmableBehavior, ISYOnOffBehavior } from '../Behaviors/ISYOnOffBehavior.js';
+import { ISYDimmableBehavior, ISYOnOffBehavior } from '../Behaviors/Insteon/ISYOnOffBehavior.js';
 import '../Mappings/Insteon.js';
 
 // #region Interfaces (1)

package/src/Matter/Mappings/Insteon.ts

@@ -19,7 +19,7 @@ const map: FamilyToClusterMap<Family.Insteon> = {
 		mapping: {
 			OnOff: {
 				attributes: {
-					onOff: { driver: 'ST', converter: 'Percent.Boolean' }
+					onOff: 'ST'
 				},
 				commands: { on: 'DON' }
 			}
@@ -47,9 +47,9 @@ const map: FamilyToClusterMap<Family.Insteon> = {
 			},
 			LevelControl: {
 				attributes: {
-					currentLevel: { driver: DriverType.Status, converter: 'LevelFrom0To255.LightingLevel' }
+					currentLevel: { driver: 'ST', converter: 'LevelFrom0To255.LightingLevel' }
 				},
-				commands: { moveToLevel: { command: 'DON' } }
+				commands: { setLevel: { command: 'DON' } }
 			}
 		}
 	}