@homebridge-plugins/homebridge-tuya 2.7.1-beta.3 → 2.7.1-beta.5
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 +145 -0
- package/dist/accessory/WindowCoveringAccessory.js.map +1 -1
- package/dist/accessory/characteristic/CurrentPosition.js +12 -10
- package/dist/accessory/characteristic/CurrentPosition.js.map +1 -1
- package/dist/accessory/characteristic/ObstructionDetected.js +17 -0
- package/dist/accessory/characteristic/ObstructionDetected.js.map +1 -0
- package/dist/accessory/characteristic/PositionState.js +2 -1
- package/dist/accessory/characteristic/PositionState.js.map +1 -1
- package/dist/accessory/characteristic/RotationSpeed.js +1 -1
- package/dist/accessory/characteristic/RotationSpeed.js.map +1 -1
- package/dist/accessory/characteristic/TargetPosition.js +9 -6
- package/dist/accessory/characteristic/TargetPosition.js.map +1 -1
- package/package.json +1 -1
- package/test/accessory/rotationSpeed.test.ts +2 -2
|
@@ -3,27 +3,46 @@ 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
|
+
exports.TriState = void 0;
|
|
6
7
|
const BaseAccessory_1 = __importDefault(require("./BaseAccessory"));
|
|
7
8
|
const CurrentPosition_1 = require("./characteristic/CurrentPosition");
|
|
8
9
|
const PositionState_1 = require("./characteristic/PositionState");
|
|
9
10
|
const TargetPosition_1 = require("./characteristic/TargetPosition");
|
|
11
|
+
const TuyaDevice_1 = require("../device/TuyaDevice");
|
|
12
|
+
const ObstructionDetected_1 = require("./characteristic/ObstructionDetected");
|
|
10
13
|
const SCHEMA_CODE = [
|
|
11
14
|
{
|
|
12
15
|
NAME: 'control',
|
|
16
|
+
TARGET_CONTROL: ['control', 'mach_operate'],
|
|
13
17
|
TARGET_POSITION_CONTROL: ['work_state', 'control', 'mach_operate'],
|
|
14
18
|
TARGET_POSITION_PERCENT: ['percent_control', 'position'],
|
|
15
19
|
CONTROL_BACK: ['control_back_mode', 'control_back', 'opposite'],
|
|
16
20
|
CURRENT_POSITION_PERCENT: ['percent_state'],
|
|
21
|
+
OBSTRUCTION_DETECTED: ['fault'],
|
|
17
22
|
},
|
|
18
23
|
{
|
|
19
24
|
NAME: 'control_2',
|
|
25
|
+
TARGET_CONTROL: ['control2', 'mach_operate'],
|
|
20
26
|
TARGET_POSITION_CONTROL: ['work_state2', 'control_2', 'mach_operate'],
|
|
21
27
|
TARGET_POSITION_PERCENT: ['percent_control_2', 'position'],
|
|
22
28
|
CONTROL_BACK: ['control_back_mode', 'control_back'],
|
|
23
29
|
CURRENT_POSITION_PERCENT: ['percent_state'],
|
|
30
|
+
OBSTRUCTION_DETECTED: ['fault'],
|
|
24
31
|
},
|
|
25
32
|
];
|
|
33
|
+
var TriState;
|
|
34
|
+
(function (TriState) {
|
|
35
|
+
TriState[TriState["FALSE"] = 0] = "FALSE";
|
|
36
|
+
TriState[TriState["TRUE"] = 1] = "TRUE";
|
|
37
|
+
TriState[TriState["INDETERMINATE"] = 2] = "INDETERMINATE";
|
|
38
|
+
})(TriState || (exports.TriState = TriState = {}));
|
|
26
39
|
class WindowCoveringAccessory extends BaseAccessory_1.default {
|
|
40
|
+
constructor() {
|
|
41
|
+
super(...arguments);
|
|
42
|
+
// Some products treat the closed state as position 100%.
|
|
43
|
+
// true: 100% -> close, 0% -> open, false: 0% -> close, 100% -> open
|
|
44
|
+
this.isOpposite = TriState.INDETERMINATE;
|
|
45
|
+
}
|
|
27
46
|
requiredSchema() {
|
|
28
47
|
// HAP mandates the presence of Current Position, Position State, and Target Position.
|
|
29
48
|
// Because altering this logic may cause some devices to malfunction, the implementation will remain as it is.
|
|
@@ -37,9 +56,14 @@ class WindowCoveringAccessory extends BaseAccessory_1.default {
|
|
|
37
56
|
amount = 2;
|
|
38
57
|
}
|
|
39
58
|
this.log.info('Curtain amount:', amount);
|
|
59
|
+
this.isOpposite = this.isOppositePositionDevice(this.getSchema(...SCHEMA_CODE[0].TARGET_POSITION_CONTROL), this.getSchema(...SCHEMA_CODE[0].CURRENT_POSITION_PERCENT, ...SCHEMA_CODE[0].TARGET_POSITION_PERCENT));
|
|
60
|
+
if (this.isOpposite === TriState.TRUE) {
|
|
61
|
+
this.log.info('this device treat the closed state as position 100%.');
|
|
62
|
+
}
|
|
40
63
|
for (let i = 0; i < amount; i++) {
|
|
41
64
|
const service = this.accessory.getService(SCHEMA_CODE[i].NAME) ||
|
|
42
65
|
this.accessory.addService(this.Service.WindowCovering, SCHEMA_CODE[i].NAME, SCHEMA_CODE[i].NAME);
|
|
66
|
+
service.addListener("characteristic-change" /* ServiceEventTypes.CHARACTERISTIC_CHANGE */, this.positionUpdateListener.bind(this, this.getSchema(...SCHEMA_CODE[0].TARGET_POSITION_CONTROL), this.getSchema(...SCHEMA_CODE[0].CURRENT_POSITION_PERCENT, ...SCHEMA_CODE[0].TARGET_POSITION_PERCENT)));
|
|
43
67
|
(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
68
|
if (this.getSchema(...SCHEMA_CODE[i].TARGET_POSITION_CONTROL)) {
|
|
45
69
|
(0, PositionState_1.configurePositionState)(this, service, this.getSchema(...SCHEMA_CODE[i].TARGET_POSITION_CONTROL));
|
|
@@ -49,7 +73,128 @@ class WindowCoveringAccessory extends BaseAccessory_1.default {
|
|
|
49
73
|
(0, PositionState_1.configurePositionStateByPosition)(this, service, this.getSchema(...SCHEMA_CODE[i].CURRENT_POSITION_PERCENT), this.getSchema(...SCHEMA_CODE[i].TARGET_POSITION_PERCENT));
|
|
50
74
|
}
|
|
51
75
|
(0, TargetPosition_1.configureTargetPosition)(this, service, this.getSchema(...SCHEMA_CODE[i].TARGET_POSITION_PERCENT, ...SCHEMA_CODE[i].TARGET_POSITION_CONTROL));
|
|
76
|
+
(0, ObstructionDetected_1.configureObstructionDetected)(this, service, this.getSchema(...SCHEMA_CODE[i].OBSTRUCTION_DETECTED));
|
|
77
|
+
const currentPositionSchema = this.getSchema(...SCHEMA_CODE[i].CURRENT_POSITION_PERCENT);
|
|
78
|
+
if (!currentPositionSchema) {
|
|
79
|
+
this.currentPositionSchemaSupplmentation(service, this.getSchema(...SCHEMA_CODE[i].TARGET_POSITION_PERCENT), this.getSchema(...SCHEMA_CODE[i].TARGET_CONTROL));
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
positionUpdateListener(positionStateSchema, currentPositionSchema, change) {
|
|
84
|
+
switch (change.characteristic.UUID) {
|
|
85
|
+
case this.Characteristic.TargetPosition.UUID: {
|
|
86
|
+
this.log.debug(`characteristic change:${change.characteristic.displayName}`);
|
|
87
|
+
this.log.debug(`oldValue: ${change.oldValue}, newValue:${change.newValue}`);
|
|
88
|
+
if (this.isOpposite !== TriState.INDETERMINATE) {
|
|
89
|
+
this.isOpposite = this.isOppositePositionDevice(positionStateSchema, currentPositionSchema);
|
|
90
|
+
}
|
|
91
|
+
break;
|
|
92
|
+
}
|
|
93
|
+
default:
|
|
94
|
+
break;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
// Since the position state may not return the correct value when there is no current position, adjustments are made.
|
|
98
|
+
currentPositionSchemaSupplmentation(service, targetPositionSchema, controlSchema) {
|
|
99
|
+
if (!targetPositionSchema || !controlSchema) {
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
const controlProperty = controlSchema.property;
|
|
103
|
+
if (controlProperty.range) {
|
|
104
|
+
const range = controlProperty.range;
|
|
105
|
+
if (!range.some(state => PositionState_1.ControlRange.Stop.includes(state))) {
|
|
106
|
+
return;
|
|
107
|
+
}
|
|
108
|
+
if (controlSchema.mode !== TuyaDevice_1.TuyaDeviceSchemaMode.READ_WRITE) {
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
this.observeControlState(service, targetPositionSchema, controlSchema);
|
|
113
|
+
}
|
|
114
|
+
observeControlState(service, targetPositionSchema, controlSchema) {
|
|
115
|
+
const controlState = this.getStatus(controlSchema.code)?.value ?? '';
|
|
116
|
+
if (PositionState_1.ControlRange.Stop.includes(controlState)) {
|
|
117
|
+
setTimeout(() => this.observeControlState(service, targetPositionSchema, controlSchema), 500);
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
120
|
+
if (service.getCharacteristic(this.Characteristic.PositionState).value === this.Characteristic.PositionState.STOPPED) {
|
|
121
|
+
setTimeout(() => this.observeControlState(service, targetPositionSchema, controlSchema), 500);
|
|
122
|
+
return;
|
|
123
|
+
}
|
|
124
|
+
const positionProperty = targetPositionSchema.property;
|
|
125
|
+
const targetPosition = this.getStatus(targetPositionSchema.code)?.value ?? 0;
|
|
126
|
+
const step = positionProperty.step;
|
|
127
|
+
const max = positionProperty.max;
|
|
128
|
+
const min = positionProperty.min;
|
|
129
|
+
let dummyPreviousPositionValue = 0;
|
|
130
|
+
if (PositionState_1.ControlRange.Open.includes(controlState)) {
|
|
131
|
+
dummyPreviousPositionValue = this.isOpposite ? (targetPosition + step) : (targetPosition - step);
|
|
132
|
+
}
|
|
133
|
+
else if (PositionState_1.ControlRange.Close.includes(controlState)) {
|
|
134
|
+
dummyPreviousPositionValue = this.isOpposite ? (targetPosition - step) : (targetPosition + step);
|
|
135
|
+
}
|
|
136
|
+
dummyPreviousPositionValue = Math.max(min, Math.min(max, dummyPreviousPositionValue));
|
|
137
|
+
// Make it appear as though the value has changed.
|
|
138
|
+
service.getCharacteristic(this.Characteristic.CurrentPosition).updateValue(dummyPreviousPositionValue);
|
|
139
|
+
const updateHomeApp = (loopCount) => {
|
|
140
|
+
const controlState = this.getStatus(controlSchema.code);
|
|
141
|
+
if (PositionState_1.ControlRange.Stop.includes(controlState?.value)) {
|
|
142
|
+
setTimeout(() => this.observeControlState(service, targetPositionSchema, controlSchema), 500);
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
145
|
+
if (service.getCharacteristic(this.Characteristic.PositionState).value === this.Characteristic.PositionState.STOPPED) {
|
|
146
|
+
setTimeout(() => this.observeControlState(service, targetPositionSchema, controlSchema), 500);
|
|
147
|
+
return;
|
|
148
|
+
}
|
|
149
|
+
//
|
|
150
|
+
service.getCharacteristic(this.Characteristic.CurrentPosition).updateValue(targetPosition);
|
|
151
|
+
if (0 < loopCount) {
|
|
152
|
+
setTimeout(() => updateHomeApp(--loopCount), 500);
|
|
153
|
+
}
|
|
154
|
+
else {
|
|
155
|
+
this.log.warn('updating position state to STOPPED.');
|
|
156
|
+
service.getCharacteristic(this.Characteristic.PositionState).updateValue(this.Characteristic.PositionState.STOPPED);
|
|
157
|
+
const controlProperty = controlSchema.property;
|
|
158
|
+
const stop = controlProperty.range.find(state => PositionState_1.ControlRange.Stop.includes(state));
|
|
159
|
+
this.sendCommands([{ code: controlSchema.code, value: stop ?? PositionState_1.ControlRange.Stop[0] }], true);
|
|
160
|
+
setTimeout(() => this.observeControlState(service, targetPositionSchema, controlSchema), 500);
|
|
161
|
+
}
|
|
162
|
+
};
|
|
163
|
+
setTimeout(() => updateHomeApp(10), 500);
|
|
164
|
+
}
|
|
165
|
+
isOppositePositionDevice(positionStateSchema, currentPositionSchema) {
|
|
166
|
+
if (!positionStateSchema || !currentPositionSchema) {
|
|
167
|
+
// eslint-disable-next-line max-len
|
|
168
|
+
this.log.debug(`isOppositePositionDevice: ${!positionStateSchema ? 'no state schema ' : ''}${!currentPositionSchema ? 'no position schema' : ''}`);
|
|
169
|
+
return TriState.INDETERMINATE;
|
|
170
|
+
}
|
|
171
|
+
const positionState = this.getStatus(positionStateSchema.code);
|
|
172
|
+
const currentPosition = this.getStatus(currentPositionSchema.code);
|
|
173
|
+
if (!positionState || !currentPosition) {
|
|
174
|
+
// eslint-disable-next-line max-len
|
|
175
|
+
this.log.debug(`isOppositePositionDevice: ${!positionState ? 'getState failed. ' : ''}${!currentPosition ? 'getPosition failed.' : ''}`);
|
|
176
|
+
return TriState.INDETERMINATE;
|
|
177
|
+
}
|
|
178
|
+
const state = positionState.value;
|
|
179
|
+
const position = currentPosition.value;
|
|
180
|
+
if (position === 100) {
|
|
181
|
+
if (PositionState_1.ControlRange.Close.includes(state)) {
|
|
182
|
+
return TriState.TRUE;
|
|
183
|
+
}
|
|
184
|
+
else {
|
|
185
|
+
return TriState.FALSE;
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
else if (position === 0) {
|
|
189
|
+
if (PositionState_1.ControlRange.Open.includes(state)) {
|
|
190
|
+
return TriState.TRUE;
|
|
191
|
+
}
|
|
192
|
+
else {
|
|
193
|
+
return TriState.FALSE;
|
|
194
|
+
}
|
|
52
195
|
}
|
|
196
|
+
this.log.debug('isOppositePositionDevice: Indeterminate');
|
|
197
|
+
return TriState.INDETERMINATE;
|
|
53
198
|
}
|
|
54
199
|
}
|
|
55
200
|
exports.default = WindowCoveringAccessory;
|
|
@@ -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":"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"}
|
|
@@ -4,26 +4,26 @@ exports.configureCurrentPosition = configureCurrentPosition;
|
|
|
4
4
|
exports.onGetPositionHandler = onGetPositionHandler;
|
|
5
5
|
const util_1 = require("../../util/util");
|
|
6
6
|
const PositionState_1 = require("./PositionState");
|
|
7
|
-
function configureCurrentPosition(accessory, service, percentSchema, controlSchema
|
|
7
|
+
function configureCurrentPosition(accessory, service, percentSchema, controlSchema) {
|
|
8
8
|
if (!!percentSchema && !!controlSchema) {
|
|
9
9
|
accessory.log.debug('_configureCurrentPositionWithPositionStateControl');
|
|
10
|
-
return _configureCurrentPositionWithPositionStateControl(accessory, service, percentSchema, controlSchema
|
|
10
|
+
return _configureCurrentPositionWithPositionStateControl(accessory, service, percentSchema, controlSchema);
|
|
11
11
|
}
|
|
12
12
|
else if (percentSchema) {
|
|
13
13
|
accessory.log.debug('_configureCurrentPosition');
|
|
14
|
-
return _configureCurrentPosition(accessory, service, percentSchema
|
|
14
|
+
return _configureCurrentPosition(accessory, service, percentSchema);
|
|
15
15
|
}
|
|
16
16
|
else if (controlSchema) {
|
|
17
17
|
accessory.log.warn('_configureCurrentPositionByPositionState');
|
|
18
|
-
return _configureCurrentPositionByPositionState(accessory, service, controlSchema
|
|
18
|
+
return _configureCurrentPositionByPositionState(accessory, service, controlSchema);
|
|
19
19
|
}
|
|
20
20
|
else {
|
|
21
21
|
// nop
|
|
22
22
|
return;
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
-
function _configureCurrentPosition(accessory, service, percentSchema
|
|
26
|
-
const onGet = onGetPositionHandler(accessory, percentSchema
|
|
25
|
+
function _configureCurrentPosition(accessory, service, percentSchema) {
|
|
26
|
+
const onGet = onGetPositionHandler(accessory, percentSchema);
|
|
27
27
|
service.getCharacteristic(accessory.Characteristic.CurrentPosition)
|
|
28
28
|
.onGet(onGet)
|
|
29
29
|
.on('change', (context) => {
|
|
@@ -35,9 +35,10 @@ function _configureCurrentPosition(accessory, service, percentSchema, invert) {
|
|
|
35
35
|
}
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
|
-
function _configureCurrentPositionByPositionState(accessory, service, controlSchema
|
|
38
|
+
function _configureCurrentPositionByPositionState(accessory, service, controlSchema) {
|
|
39
39
|
service.getCharacteristic(accessory.Characteristic.CurrentPosition)
|
|
40
40
|
.onGet(() => {
|
|
41
|
+
const invert = accessory['isOpposite'] ?? false;
|
|
41
42
|
accessory.log.debug(`CurrentPosition backMode: ${invert}`);
|
|
42
43
|
const status = accessory.getStatus(controlSchema.code);
|
|
43
44
|
if (PositionState_1.ControlRange.Close.includes(status.value)) {
|
|
@@ -64,9 +65,9 @@ function _configureCurrentPositionByPositionState(accessory, service, controlSch
|
|
|
64
65
|
}
|
|
65
66
|
});
|
|
66
67
|
}
|
|
67
|
-
function _configureCurrentPositionWithPositionStateControl(accessory, service, percentSchema, controlSchema
|
|
68
|
+
function _configureCurrentPositionWithPositionStateControl(accessory, service, percentSchema, controlSchema) {
|
|
68
69
|
const hapProps = (0, util_1.toHapProperty)(percentSchema.property);
|
|
69
|
-
const onGet = onGetPositionHandler(accessory, percentSchema
|
|
70
|
+
const onGet = onGetPositionHandler(accessory, percentSchema);
|
|
70
71
|
service.getCharacteristic(accessory.Characteristic.CurrentPosition)
|
|
71
72
|
.onGet(onGet)
|
|
72
73
|
.setProps(hapProps)
|
|
@@ -99,9 +100,10 @@ function _configureCurrentPositionWithPositionStateControl(accessory, service, p
|
|
|
99
100
|
}
|
|
100
101
|
});
|
|
101
102
|
}
|
|
102
|
-
function onGetPositionHandler(accessory, schema
|
|
103
|
+
function onGetPositionHandler(accessory, schema) {
|
|
103
104
|
const hapProps = (0, util_1.toHapProperty)(schema.property);
|
|
104
105
|
return () => {
|
|
106
|
+
const invert = accessory['isOpposite'] ?? false;
|
|
105
107
|
const status = accessory.getStatus(schema.code);
|
|
106
108
|
if (invert) {
|
|
107
109
|
return 100 - (0, util_1.limit)(status.value, hapProps.minValue ?? 0, hapProps.maxValue ?? 100);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CurrentPosition.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/CurrentPosition.ts"],"names":[],"mappings":";;AAMA,4DAoBC;
|
|
1
|
+
{"version":3,"file":"CurrentPosition.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/CurrentPosition.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.configureObstructionDetected = configureObstructionDetected;
|
|
4
|
+
function configureObstructionDetected(accessory, service, schema) {
|
|
5
|
+
if (!schema) {
|
|
6
|
+
return;
|
|
7
|
+
}
|
|
8
|
+
if (!service) {
|
|
9
|
+
return;
|
|
10
|
+
}
|
|
11
|
+
service.getCharacteristic(accessory.Characteristic.OccupancyDetected)
|
|
12
|
+
.onGet(() => {
|
|
13
|
+
const status = accessory.getStatus(schema.code);
|
|
14
|
+
return status.value !== 0;
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=ObstructionDetected.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ObstructionDetected.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/ObstructionDetected.ts"],"names":[],"mappings":";;AAIA,oEAcC;AAdD,SAAgB,4BAA4B,CAAC,SAAwB,EAAE,OAAiB,EAAE,MAAyB;IACjH,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IAED,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,CAAC,iBAAiB,CAAC;SAClE,KAAK,CAAC,GAAG,EAAE;QACV,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAE,CAAC;QACjD,OAAO,MAAM,CAAC,KAAK,KAAK,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -33,10 +33,11 @@ function configurePositionState(accessory, service, stateSchema) {
|
|
|
33
33
|
}
|
|
34
34
|
});
|
|
35
35
|
}
|
|
36
|
-
function configurePositionStateByPosition(accessory, service, currentPositionSchema, targetPositionSchema
|
|
36
|
+
function configurePositionStateByPosition(accessory, service, currentPositionSchema, targetPositionSchema) {
|
|
37
37
|
const { DECREASING, INCREASING, STOPPED } = accessory.Characteristic.PositionState;
|
|
38
38
|
service.getCharacteristic(accessory.Characteristic.PositionState)
|
|
39
39
|
.onGet(() => {
|
|
40
|
+
const invert = accessory['isOpposite'] ?? false;
|
|
40
41
|
if (!currentPositionSchema || !targetPositionSchema) {
|
|
41
42
|
return STOPPED;
|
|
42
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PositionState.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/PositionState.ts"],"names":[],"mappings":";;;AAWA,
|
|
1
|
+
{"version":3,"file":"PositionState.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/PositionState.ts"],"names":[],"mappings":"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"}
|
|
@@ -155,7 +155,7 @@ function integerToPercentageProperty(property) {
|
|
|
155
155
|
else {
|
|
156
156
|
stepCount = Math.min(100, Math.ceil((hapProperty.maxValue - hapProperty.minValue) / hapProperty.minStep) + 1);
|
|
157
157
|
}
|
|
158
|
-
return { minValue: 0, maxValue: 100, minStep:
|
|
158
|
+
return { minValue: 0, maxValue: 100, minStep: Number((100 / stepCount).toFixed(1)), unit: '%' };
|
|
159
159
|
}
|
|
160
160
|
function enumToPercentageProperty(property, includesStopCode) {
|
|
161
161
|
const min = 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RotationSpeed.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/RotationSpeed.ts"],"names":[],"mappings":";;AAaA,wDAiBC;AAgGD,kEA4CC;AAuBD,kEASC;AAED,4DAKC;AAhND,wDAKiC;AACjC,0CAAuD;AAGvD,+DAA+D;AAC/D,MAAM,SAAS,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,CAAU,CAAC;AAE9D,SAAgB,sBAAsB,CACpC,SAAwB,EACxB,OAAgB,EAChB,MAAyB;IAGzB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,iCAAoB,CAAC,IAAI,EAAE,CAAC;QAC9C,0BAA0B,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5E,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,iCAAoB,CAAC,OAAO,EAAE,CAAC;QACxD,6BAA6B,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5D,CAAC;SAAM,CAAC;QACN,wBAAwB,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC;AACH,CAAC;AAED,SAAS,6BAA6B,CACpC,SAAwB,EACxB,OAAgB,EAChB,MAAyB;IAEzB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,QAA2C,CAAC;IACpE,MAAM,WAAW,GAAG,IAAA,oBAAa,EAAC,QAAQ,CAA6C,CAAC;IACxF,MAAM,qBAAqB,GAAG,2BAA2B,CAAC,QAAQ,CAAC,CAAC;IAEpE,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE9C,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAE,CAAC;QACjD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAe,GAAG,QAAQ,CAAC;QAChD,IAAI,KAAK,GAAG,CAAC,CAAC,KAAK,GAAG,WAAW,CAAC,QAAS,CAAC,GAAG,WAAW,CAAC,OAAQ,CAAC,CAAC;QACrE,IAAI,WAAW,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;YAC/B,KAAK,IAAI,CAAC,CAAC;QACb,CAAC;QACD,MAAM,QAAQ,GAAG,KAAK,GAAG,qBAAqB,CAAC,OAAQ,CAAC;QACxD,OAAO,IAAA,YAAK,EAAC,QAAQ,EAAE,qBAAqB,CAAC,QAAS,EAAE,qBAAqB,CAAC,QAAS,CAAC,CAAC;IAC3F,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,qBAAqB,CAAC,CAAC;IAC3E,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,CAAC,aAAa,CAAC;SAC9D,KAAK,CAAC,YAAY,CAAC;SACnB,KAAK,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;QACnB,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;YAC9C,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,qBAAqB,CAAC,OAAQ,CAAC,CAAC;QACtE,MAAM,KAAK,GAAG,QAAQ,GAAG,WAAW,CAAC,OAAQ,GAAG,QAAQ,CAAC;QACzD,MAAM,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC5E,CAAC,CAAC;SACD,WAAW,CAAC,YAAY,EAAE,CAAC;SAC3B,QAAQ,CAAC,qBAAqB,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,0BAA0B,CACjC,SAAwB,EACxB,OAAgB,EAChB,MAAyB,EACzB,YAAuB;IAEvB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAwC,CAAC;IACjE,MAAM,aAAa,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IAChD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;QACnC,IAAI,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,SAAS;QACX,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC;IACD,aAAa,CAAC,KAAK,GAAG,KAAK,CAAC;IAC5B,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IACxE,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;IAExF,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAE,CAAC;QACjD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAe,CAAC,CAAC;QACpD,MAAM,KAAK,GAAG,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,KAAK,GAAG,qBAAqB,CAAC,OAAQ,CAAC;QACxD,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,MAAM,CAAC,KAAK,KAAK,OAAO,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;QACzF,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,QAAQ,KAAK,OAAO,QAAQ,GAAG,CAAC,CAAC;QACrE,OAAO,IAAA,YAAK,EAAC,QAAQ,EAAE,qBAAqB,CAAC,QAAS,EAAE,qBAAqB,CAAC,QAAS,CAAC,CAAC;IAC3F,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,qBAAqB,CAAC,CAAC;IAC3E,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,CAAC,aAAa,CAAC;SAC9D,KAAK,CAAC,YAAY,CAAC;SACnB,KAAK,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;QACnB,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;YAC9C,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,qBAAqB,CAAC,OAAQ,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACzC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,KAAK,KAAK,OAAO,KAAK,GAAG,CAAC,CAAC;QAC7E,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,KAAK,KAAK,OAAO,KAAK,GAAG,CAAC,CAAC;QAC7D,MAAM,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC5E,CAAC,CAAC;SACD,WAAW,CAAC,YAAY,EAAE,CAAC;SAC3B,QAAQ,CAAC,qBAAqB,CAAC,CAAC;AACrC,CAAC;AAED,SAAgB,2BAA2B,CACzC,SAAwB,EACxB,OAAgB,EAChB,MAAyB,EACzB,YAAuB;IAGvB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAwC,CAAC;IACjE,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;QACnC,IAAI,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,SAAS;QACX,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC;IAED,MAAM,KAAK,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IACjF,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;IAE3D,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAE,CAAC;QACjD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAe,CAAC,CAAC;QACpD,OAAO,IAAA,YAAK,EAAC,KAAK,GAAG,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC1D,CAAC,CAAC;IAEF,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,CAAC,aAAa,CAAC;SAC9D,KAAK,CAAC,YAAY,CAAC;SACnB,KAAK,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;QACnB,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;QACpD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAe,GAAG,CAAC,CAAC,CAAC;QAC9C,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACvC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAC7C,OAAO;QACT,CAAC;QACD,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC3C,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,EAAE,UAAU,CAAC,CAAC;QAC9D,MAAM,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IACjF,CAAC,CAAC;SACD,WAAW,CAAC,YAAY,EAAE,CAAC,CAAC,+CAA+C;SAC3E,QAAQ,CAAC,KAAK,CAAC,CAAC;AACrB,CAAC;AAED,SAAS,wBAAwB,CAC/B,SAAwB,EACxB,OAAgB,EAChB,MAAyB;IAGzB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,MAAM,KAAK,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IACtE,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;IAE3D,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,CAAC,aAAa,CAAC;SAC9D,KAAK,CAAC,GAAG,EAAE;QACV,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAE,CAAC;QACjD,OAAQ,MAAM,CAAC,KAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC;SACD,QAAQ,CAAC,KAAK,CAAC,CAAC;AACrB,CAAC;AAED,SAAgB,2BAA2B,CAAC,QAAyC;IACnF,MAAM,WAAW,GAAG,IAAA,oBAAa,EAAC,QAAQ,CAA6C,CAAC;IACxF,IAAI,SAAgB,CAAC;IACrB,IAAI,WAAW,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAC/B,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAS,GAAG,WAAW,CAAC,OAAQ,CAAC,CAAC,CAAC;IACrF,CAAC;SAAM,CAAC;QACN,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,QAAS,GAAG,WAAW,CAAC,QAAS,CAAC,GAAG,WAAW,CAAC,OAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;IACnH,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"RotationSpeed.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/RotationSpeed.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,31 +5,32 @@ const TuyaDevice_1 = require("../../device/TuyaDevice");
|
|
|
5
5
|
const PositionState_1 = require("./PositionState");
|
|
6
6
|
const CurrentPosition_1 = require("./CurrentPosition");
|
|
7
7
|
const util_1 = require("../../util/util");
|
|
8
|
-
function configureTargetPosition(accessory, service, schema
|
|
8
|
+
function configureTargetPosition(accessory, service, schema) {
|
|
9
9
|
if (!schema) {
|
|
10
10
|
return;
|
|
11
11
|
}
|
|
12
12
|
if (schema.type === TuyaDevice_1.TuyaDeviceSchemaType.Integer) {
|
|
13
|
-
return _configureTargetPosition(accessory, service, schema
|
|
13
|
+
return _configureTargetPosition(accessory, service, schema);
|
|
14
14
|
}
|
|
15
15
|
else if (schema.type === TuyaDevice_1.TuyaDeviceSchemaType.Enum) {
|
|
16
16
|
accessory.log.warn('_configureTargetPositionByPositionState');
|
|
17
|
-
return _configureTargetPositionByPositionState(accessory, service, schema
|
|
17
|
+
return _configureTargetPositionByPositionState(accessory, service, schema);
|
|
18
18
|
}
|
|
19
19
|
else {
|
|
20
20
|
// nop
|
|
21
21
|
return;
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
-
function _configureTargetPosition(accessory, service, percentSchema
|
|
24
|
+
function _configureTargetPosition(accessory, service, percentSchema) {
|
|
25
25
|
if (!percentSchema) {
|
|
26
26
|
return;
|
|
27
27
|
}
|
|
28
28
|
const hapProps = (0, util_1.toHapProperty)(percentSchema.property);
|
|
29
|
-
const onGet = (0, CurrentPosition_1.onGetPositionHandler)(accessory, percentSchema
|
|
29
|
+
const onGet = (0, CurrentPosition_1.onGetPositionHandler)(accessory, percentSchema);
|
|
30
30
|
service.getCharacteristic(accessory.Characteristic.TargetPosition)
|
|
31
31
|
.onGet(onGet)
|
|
32
32
|
.onSet(async (value) => {
|
|
33
|
+
const invert = accessory['isOpposite'] ?? false;
|
|
33
34
|
if (invert) {
|
|
34
35
|
await accessory.sendCommands([{ code: percentSchema.code, value: (100 - value) }], true);
|
|
35
36
|
}
|
|
@@ -39,7 +40,7 @@ function _configureTargetPosition(accessory, service, percentSchema, invert) {
|
|
|
39
40
|
})
|
|
40
41
|
.setProps(hapProps);
|
|
41
42
|
}
|
|
42
|
-
function _configureTargetPositionByPositionState(accessory, service, controlSchema
|
|
43
|
+
function _configureTargetPositionByPositionState(accessory, service, controlSchema) {
|
|
43
44
|
if (!controlSchema) {
|
|
44
45
|
return;
|
|
45
46
|
}
|
|
@@ -51,6 +52,7 @@ function _configureTargetPositionByPositionState(accessory, service, controlSche
|
|
|
51
52
|
}
|
|
52
53
|
service.getCharacteristic(accessory.Characteristic.TargetPosition)
|
|
53
54
|
.onGet(() => {
|
|
55
|
+
const invert = accessory['isOpposite'] ?? false;
|
|
54
56
|
const status = accessory.getStatus(controlSchema.code);
|
|
55
57
|
if (PositionState_1.ControlRange.Close.includes(status.value)) {
|
|
56
58
|
return invert ? 100 : 0;
|
|
@@ -68,6 +70,7 @@ function _configureTargetPositionByPositionState(accessory, service, controlSche
|
|
|
68
70
|
return 50;
|
|
69
71
|
})
|
|
70
72
|
.onSet(async (value) => {
|
|
73
|
+
const invert = accessory['isOpposite'] ?? false;
|
|
71
74
|
let control;
|
|
72
75
|
const index = isOldSchema ? 1 : 0;
|
|
73
76
|
const normalizedValue = invert ? 100 - value : value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TargetPosition.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/TargetPosition.ts"],"names":[],"mappings":";;AAOA,0DAmBC;AAzBD,wDAA+G;AAE/G,mDAA+C;AAC/C,uDAAyD;AACzD,0CAAgD;AAEhD,SAAgB,uBAAuB,CACrC,SAAwB,EACxB,OAAgB,EAChB,MAAyB
|
|
1
|
+
{"version":3,"file":"TargetPosition.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/TargetPosition.ts"],"names":[],"mappings":";;AAOA,0DAmBC;AAzBD,wDAA+G;AAE/G,mDAA+C;AAC/C,uDAAyD;AACzD,0CAAgD;AAEhD,SAAgB,uBAAuB,CACrC,SAAwB,EACxB,OAAgB,EAChB,MAAyB;IAGzB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,iCAAoB,CAAC,OAAO,EAAE,CAAC;QACjD,OAAO,wBAAwB,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC9D,CAAC;SAAM,IAAI,MAAM,CAAC,IAAI,KAAK,iCAAoB,CAAC,IAAI,EAAE,CAAC;QACrD,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;QAC9D,OAAO,uCAAuC,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7E,CAAC;SAAM,CAAC;QACN,MAAM;QACN,OAAO;IACT,CAAC;AACH,CAAC;AAED,SAAS,wBAAwB,CAC/B,SAAwB,EACxB,OAAgB,EAChB,aAAgC;IAGhC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO;IACT,CAAC;IACD,MAAM,QAAQ,GAAG,IAAA,oBAAa,EAAC,aAAa,CAAC,QAAQ,CAAwB,CAAC;IAC9E,MAAM,KAAK,GAAG,IAAA,sCAAoB,EAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IAE7D,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,CAAC,cAAc,CAAC;SAC/D,KAAK,CAAC,KAAK,CAAC;SACZ,KAAK,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;QACnB,MAAM,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,IAAI,KAAK,CAAC;QAChD,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,GAAG,GAAI,KAAgB,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QACvG,CAAC;aAAM,CAAC;YACN,MAAM,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,KAAK,EAAG,KAAgB,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QAC/F,CAAC;IACH,CAAC,CAAC;SACD,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,uCAAuC,CAC9C,SAAwB,EACxB,OAAgB,EAChB,aAAgC;IAGhC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,qCAAkB,EAAE,CAAC;IAErF,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,KAAK,GAAG,aAAa,CAAC,QAAwC,CAAC;QACrE,WAAW,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,4BAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC,cAAc,CAAC,cAAc,CAAC;SAC/D,KAAK,CAAC,GAAG,EAAE;QACV,MAAM,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,IAAI,KAAK,CAAC;QAChD,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAE,CAAC;QACxD,IAAI,4BAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,KAA4C,CAAC,EAAE,CAAC;YACrF,OAAO,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1B,CAAC;aAAM,IAAI,4BAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAA2C,CAAC,EAAE,CAAC;YAC1F,OAAO,EAAE,CAAC;QACZ,CAAC;aAAM,IAAI,4BAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,KAA+C,CAAC,EAAE,CAAC;YAClG,OAAO,EAAE,CAAC;QACZ,CAAC;aAAM,IAAI,4BAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAA2C,CAAC,EAAE,CAAC;YAC1F,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QAC1B,CAAC;QACD,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAE7D,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;SACD,KAAK,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;QACnB,MAAM,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC,IAAI,KAAK,CAAC;QAChD,IAAI,OAAe,CAAC;QACpB,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,eAAe,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,GAAI,KAAgB,CAAC,CAAC,CAAC,KAAe,CAAC;QAC3E,IAAI,eAAe,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,GAAG,4BAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,4BAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IACrF,CAAC,CAAC;SACD,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACxB,CAAC"}
|
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.1-beta.
|
|
4
|
+
"version": "2.7.1-beta.5",
|
|
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": {
|
|
@@ -70,9 +70,9 @@ describe('convert property', () => {
|
|
|
70
70
|
expect(integerToPercentageProperty(property)).toEqual({ minValue: 0, maxValue: 100, minStep: 25, unit: '%' });
|
|
71
71
|
});
|
|
72
72
|
|
|
73
|
-
test('integerToPercentageProperty returns 33% steps for 0..3 levels', () => {
|
|
73
|
+
test('integerToPercentageProperty returns 33.3% steps for 0..3 levels', () => {
|
|
74
74
|
const property = { min: 0, max: 3, step: 1, scale: 0, unit: '' } as unknown as TuyaDeviceSchemaIntegerProperty;
|
|
75
|
-
expect(integerToPercentageProperty(property)).toEqual({ minValue: 0, maxValue: 100, minStep: 33, unit: '%' });
|
|
75
|
+
expect(integerToPercentageProperty(property)).toEqual({ minValue: 0, maxValue: 100, minStep: 33.3, unit: '%' });
|
|
76
76
|
});
|
|
77
77
|
|
|
78
78
|
test('enumToPercentageProperty returns 25% steps for 4 enum values', () => {
|