@homebridge-plugins/homebridge-tuya 2.7.0 → 2.7.1-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/accessory/WindowCoveringAccessory.js +20 -128
- package/dist/accessory/WindowCoveringAccessory.js.map +1 -1
- package/dist/accessory/characteristic/CurrentPosition.js +111 -0
- package/dist/accessory/characteristic/CurrentPosition.js.map +1 -0
- package/dist/accessory/characteristic/PositionState.js +76 -0
- package/dist/accessory/characteristic/PositionState.js.map +1 -0
- package/dist/accessory/characteristic/TargetPosition.js +84 -0
- package/dist/accessory/characteristic/TargetPosition.js.map +1 -0
- package/dist/util/util.js +25 -0
- package/dist/util/util.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,25 +3,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const util_1 = require("../util/util");
|
|
7
6
|
const BaseAccessory_1 = __importDefault(require("./BaseAccessory"));
|
|
7
|
+
const CurrentPosition_1 = require("./characteristic/CurrentPosition");
|
|
8
|
+
const PositionState_1 = require("./characteristic/PositionState");
|
|
9
|
+
const TargetPosition_1 = require("./characteristic/TargetPosition");
|
|
8
10
|
const SCHEMA_CODE = [
|
|
9
11
|
{
|
|
10
12
|
NAME: 'control',
|
|
11
|
-
CURRENT_POSITION: ['percent_state'],
|
|
12
13
|
TARGET_POSITION_CONTROL: ['control', 'mach_operate'],
|
|
13
14
|
TARGET_POSITION_PERCENT: ['percent_control', 'position'],
|
|
15
|
+
CONTROL_BACK: ['control_back_mode', 'control_back', 'opposite'],
|
|
16
|
+
CURRENT_POSITION_PERCENT: ['percent_state'],
|
|
14
17
|
},
|
|
15
18
|
{
|
|
16
19
|
NAME: 'control_2',
|
|
17
|
-
CURRENT_POSITION: ['percent_state'],
|
|
18
20
|
TARGET_POSITION_CONTROL: ['control_2', 'mach_operate'],
|
|
19
21
|
TARGET_POSITION_PERCENT: ['percent_control_2', 'position'],
|
|
22
|
+
CONTROL_BACK: ['control_back_mode', 'control_back'],
|
|
23
|
+
CURRENT_POSITION_PERCENT: ['percent_state'],
|
|
20
24
|
},
|
|
21
25
|
];
|
|
22
26
|
class WindowCoveringAccessory extends BaseAccessory_1.default {
|
|
23
27
|
requiredSchema() {
|
|
24
|
-
|
|
28
|
+
// HAP mandates the presence of Current Position, Position State, and Target Position.
|
|
29
|
+
// Because altering this logic may cause some devices to malfunction, the implementation will remain as it is.
|
|
30
|
+
// return [SCHEMA_CODE[0].TARGET_POSITION_CONTROL];//, SCHEMA_CODE[1].TARGET_POSITION_CONTROL];
|
|
31
|
+
return [];
|
|
25
32
|
}
|
|
26
33
|
configureServices() {
|
|
27
34
|
let amount = 1;
|
|
@@ -29,136 +36,21 @@ class WindowCoveringAccessory extends BaseAccessory_1.default {
|
|
|
29
36
|
if (schema) {
|
|
30
37
|
amount = 2;
|
|
31
38
|
}
|
|
32
|
-
this.log.
|
|
39
|
+
this.log.info('Curtain amount:', amount);
|
|
33
40
|
for (let i = 0; i < amount; i++) {
|
|
34
|
-
this.
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
41
|
+
const service = this.accessory.getService(SCHEMA_CODE[i].NAME) ||
|
|
42
|
+
this.accessory.addService(this.Service.WindowCovering, SCHEMA_CODE[i].NAME, SCHEMA_CODE[i].NAME);
|
|
43
|
+
(0, CurrentPosition_1.configureCurrentPosition)(this, service, this.getSchema(...SCHEMA_CODE[i].CURRENT_POSITION_PERCENT, ...SCHEMA_CODE[i].TARGET_POSITION_PERCENT), this.getSchema(...SCHEMA_CODE[i].TARGET_POSITION_CONTROL));
|
|
44
|
+
if (this.getSchema(...SCHEMA_CODE[i].TARGET_POSITION_CONTROL)) {
|
|
45
|
+
(0, PositionState_1.configurePositionState)(this, service, this.getSchema(...SCHEMA_CODE[i].TARGET_POSITION_CONTROL));
|
|
38
46
|
}
|
|
39
47
|
else {
|
|
40
|
-
this.
|
|
48
|
+
this.log.warn('configurePositionStateByPosition');
|
|
49
|
+
(0, PositionState_1.configurePositionStateByPosition)(this, service, this.getSchema(...SCHEMA_CODE[i].CURRENT_POSITION_PERCENT), this.getSchema(...SCHEMA_CODE[i].TARGET_POSITION_PERCENT));
|
|
41
50
|
}
|
|
51
|
+
(0, TargetPosition_1.configureTargetPosition)(this, service, this.getSchema(...SCHEMA_CODE[i].TARGET_POSITION_PERCENT, ...SCHEMA_CODE[i].TARGET_POSITION_CONTROL));
|
|
42
52
|
}
|
|
43
53
|
}
|
|
44
|
-
configureCurrentPosition(i) {
|
|
45
|
-
const currentSchema = this.getSchema(...SCHEMA_CODE[i].CURRENT_POSITION);
|
|
46
|
-
const targetSchema = this.getSchema(...SCHEMA_CODE[i].TARGET_POSITION_PERCENT);
|
|
47
|
-
const targetControlSchema = this.getSchema(...SCHEMA_CODE[i].TARGET_POSITION_CONTROL);
|
|
48
|
-
const service = this.accessory.getService(SCHEMA_CODE[i].NAME) ||
|
|
49
|
-
this.accessory.addService(this.Service.WindowCovering, SCHEMA_CODE[i].NAME, SCHEMA_CODE[i].NAME);
|
|
50
|
-
service.getCharacteristic(this.Characteristic.CurrentPosition)
|
|
51
|
-
.onGet(() => {
|
|
52
|
-
if (currentSchema) {
|
|
53
|
-
const status = this.getStatus(currentSchema.code);
|
|
54
|
-
return (0, util_1.limit)(status.value, 0, 100);
|
|
55
|
-
}
|
|
56
|
-
else if (targetSchema) {
|
|
57
|
-
const status = this.getStatus(targetSchema.code);
|
|
58
|
-
return (0, util_1.limit)(status.value, 0, 100);
|
|
59
|
-
}
|
|
60
|
-
const status = this.getStatus(targetControlSchema.code);
|
|
61
|
-
if (status.value === 'close' || status.value === 'FZ') {
|
|
62
|
-
return 0;
|
|
63
|
-
}
|
|
64
|
-
else if (status.value === 'stop' || status.value === 'STOP') {
|
|
65
|
-
return 50;
|
|
66
|
-
}
|
|
67
|
-
else if (status.value === 'open' || status.value === 'ZZ') {
|
|
68
|
-
return 100;
|
|
69
|
-
}
|
|
70
|
-
this.log.warn('Unknown CurrentPosition:', status.value);
|
|
71
|
-
return 50;
|
|
72
|
-
})
|
|
73
|
-
.on('change', (context) => {
|
|
74
|
-
if (context.newValue === 0 || context.newValue === 100) {
|
|
75
|
-
service.updateCharacteristic(this.Characteristic.PositionState, this.Characteristic.PositionState.STOPPED);
|
|
76
|
-
}
|
|
77
|
-
});
|
|
78
|
-
}
|
|
79
|
-
configurePositionState(i) {
|
|
80
|
-
const currentSchema = this.getSchema(...SCHEMA_CODE[i].CURRENT_POSITION);
|
|
81
|
-
const targetSchema = this.getSchema(...SCHEMA_CODE[i].TARGET_POSITION_PERCENT);
|
|
82
|
-
const { DECREASING, INCREASING, STOPPED } = this.Characteristic.PositionState;
|
|
83
|
-
const service = this.accessory.getService(SCHEMA_CODE[i].NAME) ||
|
|
84
|
-
this.accessory.addService(this.Service.WindowCovering, SCHEMA_CODE[i].NAME, SCHEMA_CODE[i].NAME);
|
|
85
|
-
service.getCharacteristic(this.Characteristic.PositionState)
|
|
86
|
-
.onGet(() => {
|
|
87
|
-
if (!currentSchema || !targetSchema) {
|
|
88
|
-
return STOPPED;
|
|
89
|
-
}
|
|
90
|
-
const currentStatus = this.getStatus(currentSchema.code);
|
|
91
|
-
const targetStatus = this.getStatus(targetSchema.code);
|
|
92
|
-
if (currentStatus.value === 0 || currentStatus.value === 100) {
|
|
93
|
-
return STOPPED;
|
|
94
|
-
}
|
|
95
|
-
if (targetStatus.value === 100 && currentStatus.value !== 100) {
|
|
96
|
-
return INCREASING;
|
|
97
|
-
}
|
|
98
|
-
else if (targetStatus.value === 0 && currentStatus.value !== 0) {
|
|
99
|
-
return DECREASING;
|
|
100
|
-
}
|
|
101
|
-
else {
|
|
102
|
-
return STOPPED;
|
|
103
|
-
}
|
|
104
|
-
});
|
|
105
|
-
}
|
|
106
|
-
configureTargetPositionPercent(i) {
|
|
107
|
-
const schema = this.getSchema(...SCHEMA_CODE[i].TARGET_POSITION_PERCENT);
|
|
108
|
-
if (!schema) {
|
|
109
|
-
return;
|
|
110
|
-
}
|
|
111
|
-
const service = this.accessory.getService(SCHEMA_CODE[i].NAME) ||
|
|
112
|
-
this.accessory.addService(this.Service.WindowCovering, SCHEMA_CODE[i].NAME, SCHEMA_CODE[i].NAME);
|
|
113
|
-
service.getCharacteristic(this.Characteristic.TargetPosition)
|
|
114
|
-
.onGet(() => {
|
|
115
|
-
const status = this.getStatus(schema.code);
|
|
116
|
-
return (0, util_1.limit)(status.value, 0, 100);
|
|
117
|
-
})
|
|
118
|
-
.onSet(async (value) => {
|
|
119
|
-
await this.sendCommands([{ code: schema.code, value: value }], true);
|
|
120
|
-
});
|
|
121
|
-
}
|
|
122
|
-
configureTargetPositionControl(i) {
|
|
123
|
-
const schema = this.getSchema(...SCHEMA_CODE[i].TARGET_POSITION_CONTROL);
|
|
124
|
-
if (!schema) {
|
|
125
|
-
return;
|
|
126
|
-
}
|
|
127
|
-
const isOldSchema = !schema.property.range.includes('open');
|
|
128
|
-
const service = this.accessory.getService(SCHEMA_CODE[i].NAME) ||
|
|
129
|
-
this.accessory.addService(this.Service.WindowCovering, SCHEMA_CODE[i].NAME, SCHEMA_CODE[i].NAME);
|
|
130
|
-
service.getCharacteristic(this.Characteristic.TargetPosition)
|
|
131
|
-
.onGet(() => {
|
|
132
|
-
const status = this.getStatus(schema.code);
|
|
133
|
-
if (status.value === 'close' || status.value === 'FZ') {
|
|
134
|
-
return 0;
|
|
135
|
-
}
|
|
136
|
-
else if (status.value === 'stop' || status.value === 'STOP') {
|
|
137
|
-
return 50;
|
|
138
|
-
}
|
|
139
|
-
else if (status.value === 'open' || status.value === 'ZZ') {
|
|
140
|
-
return 100;
|
|
141
|
-
}
|
|
142
|
-
this.log.warn('Unknown TargetPosition:', status.value);
|
|
143
|
-
return 50;
|
|
144
|
-
})
|
|
145
|
-
.onSet(async (value) => {
|
|
146
|
-
let control;
|
|
147
|
-
if (value === 0) {
|
|
148
|
-
control = isOldSchema ? 'FZ' : 'close';
|
|
149
|
-
}
|
|
150
|
-
else if (value === 100) {
|
|
151
|
-
control = isOldSchema ? 'ZZ' : 'open';
|
|
152
|
-
}
|
|
153
|
-
else {
|
|
154
|
-
control = isOldSchema ? 'STOP' : 'stop';
|
|
155
|
-
}
|
|
156
|
-
await this.sendCommands([{ code: schema.code, value: control }], true);
|
|
157
|
-
})
|
|
158
|
-
.setProps({
|
|
159
|
-
minStep: 50,
|
|
160
|
-
});
|
|
161
|
-
}
|
|
162
54
|
}
|
|
163
55
|
exports.default = WindowCoveringAccessory;
|
|
164
56
|
//# sourceMappingURL=WindowCoveringAccessory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WindowCoveringAccessory.js","sourceRoot":"","sources":["../../src/accessory/WindowCoveringAccessory.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"WindowCoveringAccessory.js","sourceRoot":"","sources":["../../src/accessory/WindowCoveringAccessory.ts"],"names":[],"mappings":";;;;;AAAA,oEAA4C;AAC5C,sEAA4E;AAC5E,kEAA0G;AAC1G,oEAA0E;AAE1E,MAAM,WAAW,GAAG;IAClB;QACE,IAAI,EAAG,SAAS;QAChB,uBAAuB,EAAE,CAAC,SAAS,EAAE,cAAc,CAAC;QACpD,uBAAuB,EAAE,CAAC,iBAAiB,EAAE,UAAU,CAAC;QACxD,YAAY,EAAE,CAAC,mBAAmB,EAAE,cAAc,EAAE,UAAU,CAAC;QAC/D,wBAAwB,EAAE,CAAC,eAAe,CAAC;KAC5C;IACD;QACE,IAAI,EAAG,WAAW;QAClB,uBAAuB,EAAE,CAAC,WAAW,EAAE,cAAc,CAAC;QACtD,uBAAuB,EAAE,CAAC,mBAAmB,EAAE,UAAU,CAAC;QAC1D,YAAY,EAAE,CAAC,mBAAmB,EAAE,cAAc,CAAC;QACnD,wBAAwB,EAAE,CAAC,eAAe,CAAC;KAC5C;CACF,CAAC;AAEF,MAAqB,uBAAwB,SAAQ,uBAAa;IAEhE,cAAc;QACZ,sFAAsF;QACtF,8GAA8G;QAC9G,+FAA+F;QAC/F,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,iBAAiB;QACf,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAC3C,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,GAAG,CAAC,CAAC;QACb,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;QACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC5D,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACnG,IAAA,0CAAwB,EACtB,IAAI,EACJ,OAAO,EACP,IAAI,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,wBAAwB,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,EACrG,IAAI,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAC1D,CAAC;YAEF,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,EAAE,CAAC;gBAC9D,IAAA,sCAAsB,EACpB,IAAI,EACJ,OAAO,EACP,IAAI,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAC1D,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;gBAClD,IAAA,gDAAgC,EAC9B,IAAI,EACJ,OAAO,EACP,IAAI,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,EAC1D,IAAI,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAC1D,CAAC;YACJ,CAAC;YAED,IAAA,wCAAuB,EACrB,IAAI,EACJ,OAAO,EACP,IAAI,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,uBAAuB,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,CACrG,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAjDD,0CAiDC"}
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.configureCurrentPosition = configureCurrentPosition;
|
|
4
|
+
exports.onGetPositionHandler = onGetPositionHandler;
|
|
5
|
+
const util_1 = require("../../util/util");
|
|
6
|
+
const PositionState_1 = require("./PositionState");
|
|
7
|
+
function configureCurrentPosition(accessory, service, percentSchema, controlSchema, invert) {
|
|
8
|
+
if (!!percentSchema && !!controlSchema) {
|
|
9
|
+
accessory.log.debug('_configureCurrentPositionWithPositionStateControl');
|
|
10
|
+
return _configureCurrentPositionWithPositionStateControl(accessory, service, percentSchema, controlSchema, invert);
|
|
11
|
+
}
|
|
12
|
+
else if (percentSchema) {
|
|
13
|
+
accessory.log.debug('_configureCurrentPosition');
|
|
14
|
+
return _configureCurrentPosition(accessory, service, percentSchema, invert);
|
|
15
|
+
}
|
|
16
|
+
else if (controlSchema) {
|
|
17
|
+
accessory.log.warn('_configureCurrentPositionByPositionState');
|
|
18
|
+
return _configureCurrentPositionByPositionState(accessory, service, controlSchema, invert);
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
// nop
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
function _configureCurrentPosition(accessory, service, percentSchema, invert) {
|
|
26
|
+
const onGet = onGetPositionHandler(accessory, percentSchema, !!invert);
|
|
27
|
+
service.getCharacteristic(accessory.Characteristic.CurrentPosition)
|
|
28
|
+
.onGet(onGet)
|
|
29
|
+
.on('change', (context) => {
|
|
30
|
+
// https://github.com/homebridge-plugins/homebridge-tuya/pull/50
|
|
31
|
+
// Although the implementation is unconventional, it was reportedly necessary to achieve the correct behavior on actual hardware.
|
|
32
|
+
// In principle, PositionState is a read‑only characteristic and should not be updated or set.
|
|
33
|
+
if (context.newValue === 0 || context.newValue === 100) {
|
|
34
|
+
service.updateCharacteristic(accessory.Characteristic.PositionState, accessory.Characteristic.PositionState.STOPPED);
|
|
35
|
+
}
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
function _configureCurrentPositionByPositionState(accessory, service, controlSchema, invert) {
|
|
39
|
+
service.getCharacteristic(accessory.Characteristic.CurrentPosition)
|
|
40
|
+
.onGet(() => {
|
|
41
|
+
accessory.log.debug(`CurrentPosition backMode: ${invert}`);
|
|
42
|
+
const status = accessory.getStatus(controlSchema.code);
|
|
43
|
+
if (PositionState_1.ControlRange.Close.includes(status.value)) {
|
|
44
|
+
return invert ? 100 : 0;
|
|
45
|
+
}
|
|
46
|
+
else if (PositionState_1.ControlRange.Stop.includes(status.value)) {
|
|
47
|
+
return 50;
|
|
48
|
+
}
|
|
49
|
+
else if (PositionState_1.ControlRange.Continue.includes(status.value)) {
|
|
50
|
+
return 50;
|
|
51
|
+
}
|
|
52
|
+
else if (PositionState_1.ControlRange.Open.includes(status.value)) {
|
|
53
|
+
return invert ? 0 : 100;
|
|
54
|
+
}
|
|
55
|
+
accessory.log.warn('Unknown CurrentPosition:', status.value);
|
|
56
|
+
return 50;
|
|
57
|
+
})
|
|
58
|
+
.on('change', (context) => {
|
|
59
|
+
// https://github.com/homebridge-plugins/homebridge-tuya/pull/50
|
|
60
|
+
// Although the implementation is unconventional, it was reportedly necessary to achieve the correct behavior on actual hardware.
|
|
61
|
+
// In principle, PositionState is a read‑only characteristic and should not be updated or set.
|
|
62
|
+
if (context.newValue === 0 || context.newValue === 100) {
|
|
63
|
+
service.updateCharacteristic(accessory.Characteristic.PositionState, accessory.Characteristic.PositionState.STOPPED);
|
|
64
|
+
}
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
function _configureCurrentPositionWithPositionStateControl(accessory, service, percentSchema, controlSchema, invert) {
|
|
68
|
+
const hapProps = (0, util_1.toHapProperty)(percentSchema.property);
|
|
69
|
+
const onGet = onGetPositionHandler(accessory, percentSchema, !!invert);
|
|
70
|
+
service.getCharacteristic(accessory.Characteristic.CurrentPosition)
|
|
71
|
+
.onGet(onGet)
|
|
72
|
+
.setProps(hapProps)
|
|
73
|
+
.on('change', (context) => {
|
|
74
|
+
// Because the context value was not correct, I retrieve the current value manually.
|
|
75
|
+
const currentValue = onGet();
|
|
76
|
+
accessory.log.debug(`current position onchange. currentValue:${currentValue}`);
|
|
77
|
+
accessory.log.debug('context:%o', context);
|
|
78
|
+
// https://github.com/homebridge-plugins/homebridge-tuya/pull/50
|
|
79
|
+
// Although the implementation is unconventional, it was reportedly necessary to achieve the correct behavior on actual hardware.
|
|
80
|
+
// In principle, PositionState is a read‑only characteristic and should not be updated or set.
|
|
81
|
+
if (context.newValue === 0 || context.newValue === 100) {
|
|
82
|
+
service.updateCharacteristic(accessory.Characteristic.PositionState, accessory.Characteristic.PositionState.STOPPED);
|
|
83
|
+
const status = accessory.getStatus(controlSchema.code);
|
|
84
|
+
const range = controlSchema.property.range ?? [];
|
|
85
|
+
const stopped = range.find(state => PositionState_1.ControlRange.Stop.includes(state));
|
|
86
|
+
accessory.log.debug(`status:${status?.value}, newValue:${context.newValue}`);
|
|
87
|
+
if (status?.value !== stopped) {
|
|
88
|
+
accessory.sendCommands([{ code: controlSchema.code, value: stopped }], true);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
else if ((context.newValue || 0) < (context.oldValue || 0)) {
|
|
92
|
+
service.updateCharacteristic(accessory.Characteristic.PositionState, accessory.Characteristic.PositionState.DECREASING);
|
|
93
|
+
}
|
|
94
|
+
else if ((context.oldValue || 0) < (context.newValue || 0)) {
|
|
95
|
+
service.updateCharacteristic(accessory.Characteristic.PositionState, accessory.Characteristic.PositionState.INCREASING);
|
|
96
|
+
}
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
function onGetPositionHandler(accessory, schema, invert) {
|
|
100
|
+
const hapProps = (0, util_1.toHapProperty)(schema.property);
|
|
101
|
+
return () => {
|
|
102
|
+
const status = accessory.getStatus(schema.code);
|
|
103
|
+
if (invert) {
|
|
104
|
+
return 100 - (0, util_1.limit)(status.value, hapProps.minValue ?? 0, hapProps.maxValue ?? 100);
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
return (0, util_1.limit)(status.value, hapProps.minValue ?? 0, hapProps.maxValue ?? 100);
|
|
108
|
+
}
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
//# sourceMappingURL=CurrentPosition.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CurrentPosition.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/CurrentPosition.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ControlRange = void 0;
|
|
4
|
+
exports.configurePositionState = configurePositionState;
|
|
5
|
+
exports.configurePositionStateByPosition = configurePositionStateByPosition;
|
|
6
|
+
exports.ControlRange = {
|
|
7
|
+
Open: ['open', 'ZZ'],
|
|
8
|
+
Stop: ['stop', 'STOP'],
|
|
9
|
+
Close: ['close', 'FZ'],
|
|
10
|
+
Continue: ['continue'],
|
|
11
|
+
};
|
|
12
|
+
function configurePositionState(accessory, service, stateSchema) {
|
|
13
|
+
if (!stateSchema) {
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
const prop = stateSchema.property;
|
|
17
|
+
checkRange(prop);
|
|
18
|
+
const { DECREASING, INCREASING, STOPPED } = accessory.Characteristic.PositionState;
|
|
19
|
+
service.getCharacteristic(accessory.Characteristic.PositionState)
|
|
20
|
+
.onGet(() => {
|
|
21
|
+
const state = accessory.getStatus(stateSchema.code);
|
|
22
|
+
switch (true) {
|
|
23
|
+
case exports.ControlRange.Open.includes(state.value):
|
|
24
|
+
return INCREASING;
|
|
25
|
+
case exports.ControlRange.Stop.includes(state.value):
|
|
26
|
+
return STOPPED;
|
|
27
|
+
case exports.ControlRange.Close.includes(state.value):
|
|
28
|
+
return DECREASING;
|
|
29
|
+
case exports.ControlRange.Continue.includes(state.value):
|
|
30
|
+
return STOPPED;
|
|
31
|
+
default:
|
|
32
|
+
return STOPPED;
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
function configurePositionStateByPosition(accessory, service, currentPositionSchema, targetPositionSchema, invert) {
|
|
37
|
+
const { DECREASING, INCREASING, STOPPED } = accessory.Characteristic.PositionState;
|
|
38
|
+
service.getCharacteristic(accessory.Characteristic.PositionState)
|
|
39
|
+
.onGet(() => {
|
|
40
|
+
if (!currentPositionSchema || !targetPositionSchema) {
|
|
41
|
+
return STOPPED;
|
|
42
|
+
}
|
|
43
|
+
const currentPosition = accessory.getStatus(currentPositionSchema.code);
|
|
44
|
+
const targetPosition = accessory.getStatus(targetPositionSchema.code);
|
|
45
|
+
accessory.log.debug(`position state onGet: current:${currentPosition.value}, target:${targetPosition.value}`);
|
|
46
|
+
if (currentPosition.value === 0 || currentPosition.value === 100) {
|
|
47
|
+
return STOPPED;
|
|
48
|
+
}
|
|
49
|
+
if (targetPosition.value === 100 && currentPosition.value !== 100) {
|
|
50
|
+
return invert ? DECREASING : INCREASING;
|
|
51
|
+
}
|
|
52
|
+
else if (targetPosition.value === 0 && currentPosition.value !== 0) {
|
|
53
|
+
return invert ? INCREASING : DECREASING;
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
return STOPPED;
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
function checkRange(prop) {
|
|
61
|
+
const range = prop.range;
|
|
62
|
+
const open = range.find(state => exports.ControlRange.Open.includes(state));
|
|
63
|
+
const stop = range.find(state => exports.ControlRange.Stop.includes(state));
|
|
64
|
+
const close = range.find(state => exports.ControlRange.Close.includes(state));
|
|
65
|
+
const unused = range.filter(v => ![open, stop, close].includes(v));
|
|
66
|
+
if (open === null && 0 < unused.length) {
|
|
67
|
+
exports.ControlRange.Open.push(unused.shift());
|
|
68
|
+
}
|
|
69
|
+
if (stop === null && 0 < unused.length) {
|
|
70
|
+
exports.ControlRange.Stop.push(unused.shift());
|
|
71
|
+
}
|
|
72
|
+
if (close === null && 0 < unused.length) {
|
|
73
|
+
exports.ControlRange.Close.push(unused.shift());
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
//# sourceMappingURL=PositionState.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PositionState.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/PositionState.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.configureTargetPosition = configureTargetPosition;
|
|
4
|
+
const TuyaDevice_1 = require("../../device/TuyaDevice");
|
|
5
|
+
const PositionState_1 = require("./PositionState");
|
|
6
|
+
const CurrentPosition_1 = require("./CurrentPosition");
|
|
7
|
+
const util_1 = require("../../util/util");
|
|
8
|
+
function configureTargetPosition(accessory, service, schema, invert) {
|
|
9
|
+
if (!schema) {
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
if (schema.type === TuyaDevice_1.TuyaDeviceSchemaType.Integer) {
|
|
13
|
+
return _configureTargetPosition(accessory, service, schema, invert);
|
|
14
|
+
}
|
|
15
|
+
else if (schema.type === TuyaDevice_1.TuyaDeviceSchemaType.Enum) {
|
|
16
|
+
accessory.log.warn('_configureTargetPositionByPositionState');
|
|
17
|
+
return _configureTargetPositionByPositionState(accessory, service, schema, invert);
|
|
18
|
+
}
|
|
19
|
+
else {
|
|
20
|
+
// nop
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
function _configureTargetPosition(accessory, service, percentSchema, invert) {
|
|
25
|
+
if (!percentSchema) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
const hapProps = (0, util_1.toHapProperty)(percentSchema.property);
|
|
29
|
+
const onGet = (0, CurrentPosition_1.onGetPositionHandler)(accessory, percentSchema, !!invert);
|
|
30
|
+
service.getCharacteristic(accessory.Characteristic.TargetPosition)
|
|
31
|
+
.onGet(onGet)
|
|
32
|
+
.onSet(async (value) => {
|
|
33
|
+
if (invert) {
|
|
34
|
+
await accessory.sendCommands([{ code: percentSchema.code, value: (100 - value) }], true);
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
await accessory.sendCommands([{ code: percentSchema.code, value: value }], true);
|
|
38
|
+
}
|
|
39
|
+
})
|
|
40
|
+
.setProps(hapProps);
|
|
41
|
+
}
|
|
42
|
+
function _configureTargetPositionByPositionState(accessory, service, controlSchema, invert) {
|
|
43
|
+
if (!controlSchema) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
const hapProps = { minValue: 0, maxValue: 100, minStep: 50, unit: "percentage" /* Units.PERCENTAGE */ };
|
|
47
|
+
let isOldSchema = false;
|
|
48
|
+
if (controlSchema) {
|
|
49
|
+
const props = controlSchema.property;
|
|
50
|
+
isOldSchema = !props.range.includes(PositionState_1.ControlRange.Open[0]);
|
|
51
|
+
}
|
|
52
|
+
service.getCharacteristic(accessory.Characteristic.TargetPosition)
|
|
53
|
+
.onGet(() => {
|
|
54
|
+
const status = accessory.getStatus(controlSchema.code);
|
|
55
|
+
if (PositionState_1.ControlRange.Close.includes(status.value)) {
|
|
56
|
+
return invert ? 100 : 0;
|
|
57
|
+
}
|
|
58
|
+
else if (PositionState_1.ControlRange.Stop.includes(status.value)) {
|
|
59
|
+
return 50;
|
|
60
|
+
}
|
|
61
|
+
else if (PositionState_1.ControlRange.Continue.includes(status.value)) {
|
|
62
|
+
return 50;
|
|
63
|
+
}
|
|
64
|
+
else if (PositionState_1.ControlRange.Open.includes(status.value)) {
|
|
65
|
+
return invert ? 0 : 100;
|
|
66
|
+
}
|
|
67
|
+
accessory.log.warn('Unknown CurrentPosition:', status.value);
|
|
68
|
+
return 50;
|
|
69
|
+
})
|
|
70
|
+
.onSet(async (value) => {
|
|
71
|
+
let control;
|
|
72
|
+
const index = isOldSchema ? 1 : 0;
|
|
73
|
+
const normalizedValue = invert ? 100 - value : value;
|
|
74
|
+
if (normalizedValue === 0) {
|
|
75
|
+
control = PositionState_1.ControlRange.Close[index];
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
control = PositionState_1.ControlRange.Open[index];
|
|
79
|
+
}
|
|
80
|
+
await accessory.sendCommands([{ code: controlSchema.code, value: control }], true);
|
|
81
|
+
})
|
|
82
|
+
.setProps(hapProps);
|
|
83
|
+
}
|
|
84
|
+
//# sourceMappingURL=TargetPosition.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TargetPosition.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/TargetPosition.ts"],"names":[],"mappings":"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"}
|
package/dist/util/util.js
CHANGED
|
@@ -43,6 +43,31 @@ function toHapProperty(property) {
|
|
|
43
43
|
hap['validValues'] = [...value];
|
|
44
44
|
break;
|
|
45
45
|
}
|
|
46
|
+
case 'unit': {
|
|
47
|
+
switch (value) {
|
|
48
|
+
case '%': {
|
|
49
|
+
hap['unit'] = "percentage" /* Units.PERCENTAGE */;
|
|
50
|
+
break;
|
|
51
|
+
}
|
|
52
|
+
case 's': {
|
|
53
|
+
hap['unit'] = "seconds" /* Units.SECONDS */;
|
|
54
|
+
break;
|
|
55
|
+
}
|
|
56
|
+
case 'lx': {
|
|
57
|
+
hap['unit'] = "lux" /* Units.LUX */;
|
|
58
|
+
break;
|
|
59
|
+
}
|
|
60
|
+
case '℃': {
|
|
61
|
+
hap['unit'] = "celsius" /* Units.CELSIUS */;
|
|
62
|
+
break;
|
|
63
|
+
}
|
|
64
|
+
default: {
|
|
65
|
+
hap['unit'] = value;
|
|
66
|
+
break;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
break;
|
|
70
|
+
}
|
|
46
71
|
default: {
|
|
47
72
|
hap[key] = value;
|
|
48
73
|
break;
|
package/dist/util/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util/util.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util/util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@homebridge-plugins/homebridge-tuya",
|
|
3
3
|
"displayName": "Homebridge Tuya",
|
|
4
|
-
"version": "2.7.
|
|
4
|
+
"version": "2.7.1-beta.1",
|
|
5
5
|
"description": "Forked from 0x5e/homebridge-tuya-platform, with a focus on fixing bugs and adding new device support.",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"repository": {
|