Skip to content

Commit e18c19f

Browse files
committed
Updated to typingfile, added missing methods (added in version 1.6)
1 parent bc16235 commit e18c19f

File tree

2 files changed

+86
-5
lines changed

2 files changed

+86
-5
lines changed

src/openzwave.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ namespace OZW {
180180
Nan::SetPrototypeMethod(t, "getSwitchPoint", OZW::GetSwitchPoint);
181181
Nan::SetPrototypeMethod(t, "setSwitchPoint", OZW::SetSwitchPoint);
182182
Nan::SetPrototypeMethod(t, "removeSwitchPoint", OZW::RemoveSwitchPoint);
183-
#ifdef OPENZWAVE_DEPRECATED16
183+
#ifdef OPENZWAVE_16
184184
Nan::SetPrototypeMethod(t, "getValueAsBitSet", OZW::GetValueAsBitSet);
185185
Nan::SetPrototypeMethod(t, "setBitMask", OZW::SetBitMask);
186186
Nan::SetPrototypeMethod(t, "getBitMask", OZW::GetBitMask);

types/openzwave-shared.d.ts

Lines changed: 85 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ declare module "openzwave-shared" {
1111
| "string"
1212
| "button"
1313
| "raw"
14-
| "max";
14+
| "max"
15+
| "bitset";
1516
export type ValueGenre = "basic" | "user" | "system" | "config" | "count";
1617

1718
export interface NodeInfo {
@@ -259,7 +260,19 @@ declare module "openzwave-shared" {
259260
listener: (nodeId: number, nodeInfo: ZWave.NodeInfo) => void
260261
): this;
261262
on(
262-
event: "value added" | "value changed",
263+
event: "node reset",
264+
listener: (nodeid: number) => void
265+
): this;
266+
on(
267+
event: "user alert",
268+
listener: (notification: ZWave.Notification, help: string) => void
269+
): this;
270+
on(
271+
event: "manufacturer specific DB ready",
272+
listener: () => void
273+
): this;
274+
on(
275+
event: "value added" | "value changed" | "value refreshed",
263276
listener: (nodeId: number, comClass: number, value: ZWave.Value) => void
264277
): this;
265278
on(
@@ -269,7 +282,7 @@ declare module "openzwave-shared" {
269282

270283
on(
271284
event: "notification",
272-
listener: (nodeId: number, notification: ZWave.Notification) => void
285+
listener: (nodeId: number, notification: ZWave.Notification, help: string) => void
273286
): this;
274287
on(event: "scan complete", listener: () => void): this;
275288
on(
@@ -309,7 +322,7 @@ declare module "openzwave-shared" {
309322
/**
310323
* @param {settings} settings Update the running options.
311324
*/
312-
updateOptions(settings: Partial<ZWave.IConstructorParameters>): void;
325+
updateOptions(info: Partial<ZWave.IConstructorParameters>): void;
313326

314327
/**
315328
* Reset the ZWave controller chip. A hard reset is destructive and wipes
@@ -397,6 +410,11 @@ declare module "openzwave-shared" {
397410
tgtNodeId: number
398411
): void;
399412

413+
isMultiInstance(
414+
nodeId: number,
415+
groupIdx: number,
416+
): boolean;
417+
400418
// Exposed by "openzwave-management.cc"
401419

402420
/**
@@ -496,6 +514,10 @@ declare module "openzwave-shared" {
496514

497515
cancelControllerCommand(): void;
498516

517+
/**
518+
* LEGACY MODE (using writeConfig)
519+
* @deprecated
520+
*/
499521
writeConfig(): void;
500522

501523
getDriverStatistics(): ZWave.DriverStats;
@@ -531,17 +553,34 @@ declare module "openzwave-shared" {
531553
*/
532554
getNodeNeighbors(nodeId: number): Array<number>;
533555

556+
/**
557+
* LEGACY MODE (using setNodeOn)
558+
* @deprecated
559+
*/
534560
setNodeOn(nodeId: number): void;
535561

562+
/**
563+
* LEGACY MODE (using setNodeOff)
564+
* @deprecated
565+
*/
536566
setNodeOff(nodeId: number): void;
537567

538568
/**
539569
* Generic dimmer control
570+
* @deprecated
540571
*/
541572
setNodeLevel(nodeId: number, level: number): void;
542573

574+
/**
575+
* LEGACY MODE (using switchAllOn)
576+
* @deprecated
577+
*/
543578
switchAllOn(): void;
544579

580+
/**
581+
* LEGACY MODE (using switchAllOff)
582+
* @deprecated
583+
*/
545584
switchAllOff(): void;
546585

547586
pressButton(valueId: ZWave.ValueId): void;
@@ -656,6 +695,24 @@ declare module "openzwave-shared" {
656695
switchPoint: ZWave.SwitchPoint
657696
): void;
658697

698+
getValueAsBitSet(
699+
valueId: ZWave.ValueId,
700+
pos: number
701+
): number;
702+
703+
setBitMask(
704+
valueId: ZWave.ValueId,
705+
mask: number
706+
): void;
707+
708+
getBitMask(
709+
valueId: ZWave.ValueId
710+
): number;
711+
712+
getBitSetSize(
713+
valueId: ZWave.ValueId
714+
): number;
715+
659716
// Exposed by "openzwave-polling.cc"
660717

661718
/**
@@ -697,14 +754,38 @@ declare module "openzwave-shared" {
697754

698755
/**
699756
* Returns sceneId.
757+
* @deprecated
700758
*/
701759
createScene(label: string): number;
760+
761+
/**
762+
* @deprecated
763+
*/
702764
removeScene(sceneId: number): void;
765+
766+
/**
767+
* @deprecated
768+
*/
703769
getScenes(): Array<ZWave.SceneInfo>;
704770

771+
/**
772+
* @deprecated
773+
*/
705774
addSceneValue(sceneId: number, value: ZWave.ValueId): void;
775+
776+
/**
777+
* @deprecated
778+
*/
706779
removeSceneValue(sceneId: number, value: ZWave.ValueId): void;
780+
781+
/**
782+
* @deprecated
783+
*/
707784
sceneGetValues(sceneId: number): Array<ZWave.ValueId>;
785+
786+
/**
787+
* @deprecated
788+
*/
708789
activateScene(sceneId: number): void;
709790
}
710791

0 commit comments

Comments
 (0)