From f93dd6f759774bb5a656342ea4423129f489acbb Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Sun, 7 Nov 2021 19:28:53 -0800 Subject: [PATCH] sdk/server: fan/humidity interface --- sdk/package-lock.json | 4 ++-- sdk/package.json | 2 +- sdk/types.d.ts | 14 ++++++++------ sdk/types.js | 2 ++ sdk/types.ts | 14 ++++++++------ server/package-lock.json | 18 +++++++++--------- server/package.json | 4 ++-- 7 files changed, 32 insertions(+), 26 deletions(-) diff --git a/sdk/package-lock.json b/sdk/package-lock.json index 281e9d9c5..f9975dd13 100644 --- a/sdk/package-lock.json +++ b/sdk/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/sdk", - "version": "0.0.94", + "version": "0.0.95", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/sdk", - "version": "0.0.94", + "version": "0.0.95", "license": "ISC", "dependencies": { "@babel/plugin-proposal-class-properties": "^7.14.5", diff --git a/sdk/package.json b/sdk/package.json index d4e7ae600..1bbc223c6 100644 --- a/sdk/package.json +++ b/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@scrypted/sdk", - "version": "0.0.94", + "version": "0.0.95", "description": "", "main": "index.js", "scripts": { diff --git a/sdk/types.d.ts b/sdk/types.d.ts index 84c905258..c2cd420f8 100644 --- a/sdk/types.d.ts +++ b/sdk/types.d.ts @@ -276,6 +276,12 @@ export interface HumiditySetting { setHumidity(humidity: HumidityCommand): Promise; } export interface FanStatus { + /** + * RPM. Negative numbers are valid to indicate fan direction, + * if it rotates in both directions. + * A fan speed of zero indicates it is active, but currently off. + * A fan speed of null or undefined indicates the fan is off. + */ speed?: number; /** * Available fan speed range in RPM. @@ -283,12 +289,6 @@ export interface FanStatus { availableSpeeds: [number, number]; } export interface Fan { - /** - * RPM. Negative numbers are valid to indicate fan direction, - * if it rotates in both directions. - * A fan speed of zero indicates it is active, but currently off. - * A fan speed of null or undefined indicates the fan is off. - */ fan?: FanStatus; setFanSpeed(speed: number): Promise; } @@ -1010,6 +1010,8 @@ export declare enum ScryptedInterface { Pause = "Pause", Dock = "Dock", TemperatureSetting = "TemperatureSetting", + HumiditySetting = "HumiditySetting", + Fan = "Fan", Thermometer = "Thermometer", HumiditySensor = "HumiditySensor", Camera = "Camera", diff --git a/sdk/types.js b/sdk/types.js index fcefecd08..9be141ba2 100644 --- a/sdk/types.js +++ b/sdk/types.js @@ -83,6 +83,8 @@ var ScryptedInterface; ScryptedInterface["Pause"] = "Pause"; ScryptedInterface["Dock"] = "Dock"; ScryptedInterface["TemperatureSetting"] = "TemperatureSetting"; + ScryptedInterface["HumiditySetting"] = "HumiditySetting"; + ScryptedInterface["Fan"] = "Fan"; ScryptedInterface["Thermometer"] = "Thermometer"; ScryptedInterface["HumiditySensor"] = "HumiditySensor"; ScryptedInterface["Camera"] = "Camera"; diff --git a/sdk/types.ts b/sdk/types.ts index 1f57e8764..0f5b7526b 100644 --- a/sdk/types.ts +++ b/sdk/types.ts @@ -300,6 +300,12 @@ export interface HumiditySetting { setHumidity(humidity: HumidityCommand): Promise; } export interface FanStatus { + /** + * RPM. Negative numbers are valid to indicate fan direction, + * if it rotates in both directions. + * A fan speed of zero indicates it is active, but currently off. + * A fan speed of null or undefined indicates the fan is off. + */ speed?: number; /** * Available fan speed range in RPM. @@ -307,12 +313,6 @@ export interface FanStatus { availableSpeeds: [number, number]; } export interface Fan { - /** - * RPM. Negative numbers are valid to indicate fan direction, - * if it rotates in both directions. - * A fan speed of zero indicates it is active, but currently off. - * A fan speed of null or undefined indicates the fan is off. - */ fan?: FanStatus; setFanSpeed(speed: number): Promise; } @@ -1124,6 +1124,8 @@ export enum ScryptedInterface { Pause = "Pause", Dock = "Dock", TemperatureSetting = "TemperatureSetting", + HumiditySetting = "HumiditySetting", + Fan = "Fan", Thermometer = "Thermometer", HumiditySensor = "HumiditySensor", Camera = "Camera", diff --git a/server/package-lock.json b/server/package-lock.json index 0262167fe..d0df80d7d 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,16 +1,16 @@ { "name": "@scrypted/server", - "version": "0.0.55", + "version": "0.0.56", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/server", - "version": "0.0.55", + "version": "0.0.56", "license": "ISC", "dependencies": { "@mapbox/node-pre-gyp": "^1.0.5", - "@scrypted/sdk": "^0.0.94", + "@scrypted/sdk": "^0.0.95", "adm-zip": "^0.5.3", "axios": "^0.21.1", "body-parser": "^1.19.0", @@ -628,9 +628,9 @@ } }, "node_modules/@scrypted/sdk": { - "version": "0.0.94", - "resolved": "https://registry.npmjs.org/@scrypted/sdk/-/sdk-0.0.94.tgz", - "integrity": "sha512-rLb/esVaQUbooyqzoOJBugMVagvlu6O4Q9QjTgjOV4rs1PImVtcth73rVY7bu0fg3kyb5zOg0yBoL9TB5UsZyg==", + "version": "0.0.95", + "resolved": "https://registry.npmjs.org/@scrypted/sdk/-/sdk-0.0.95.tgz", + "integrity": "sha512-g0NQQJjRg61u9E0aR3RqoFv2BYYkjp/Zd/NKosQADf78PyyN7l9EN33LxuBMzkqOVVdyUM8UG02ySu9QddDZpQ==", "dependencies": { "@babel/plugin-proposal-class-properties": "^7.14.5", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5", @@ -5091,9 +5091,9 @@ } }, "@scrypted/sdk": { - "version": "0.0.94", - "resolved": "https://registry.npmjs.org/@scrypted/sdk/-/sdk-0.0.94.tgz", - "integrity": "sha512-rLb/esVaQUbooyqzoOJBugMVagvlu6O4Q9QjTgjOV4rs1PImVtcth73rVY7bu0fg3kyb5zOg0yBoL9TB5UsZyg==", + "version": "0.0.95", + "resolved": "https://registry.npmjs.org/@scrypted/sdk/-/sdk-0.0.95.tgz", + "integrity": "sha512-g0NQQJjRg61u9E0aR3RqoFv2BYYkjp/Zd/NKosQADf78PyyN7l9EN33LxuBMzkqOVVdyUM8UG02ySu9QddDZpQ==", "requires": { "@babel/plugin-proposal-class-properties": "^7.14.5", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5", diff --git a/server/package.json b/server/package.json index ecee28b23..3460bd508 100644 --- a/server/package.json +++ b/server/package.json @@ -1,10 +1,10 @@ { "name": "@scrypted/server", - "version": "0.0.55", + "version": "0.0.56", "description": "", "dependencies": { "@mapbox/node-pre-gyp": "^1.0.5", - "@scrypted/sdk": "^0.0.94", + "@scrypted/sdk": "^0.0.95", "adm-zip": "^0.5.3", "axios": "^0.21.1", "body-parser": "^1.19.0",