@homebridge-plugins/homebridge-tuya 2.7.1-beta.1 → 2.7.1-beta.3
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 +2 -2
- package/dist/accessory/WindowCoveringAccessory.js.map +1 -1
- package/dist/accessory/characteristic/CurrentPosition.js +7 -4
- package/dist/accessory/characteristic/CurrentPosition.js.map +1 -1
- package/dist/accessory/characteristic/PositionState.js +2 -2
- package/dist/accessory/characteristic/PositionState.js.map +1 -1
- package/dist/accessory/characteristic/RotationSpeed.js +11 -6
- package/dist/accessory/characteristic/RotationSpeed.js.map +1 -1
- package/package.json +1 -1
- package/test/accessory/rotationSpeed.test.ts +6 -1
|
@@ -10,14 +10,14 @@ const TargetPosition_1 = require("./characteristic/TargetPosition");
|
|
|
10
10
|
const SCHEMA_CODE = [
|
|
11
11
|
{
|
|
12
12
|
NAME: 'control',
|
|
13
|
-
TARGET_POSITION_CONTROL: ['control', 'mach_operate'],
|
|
13
|
+
TARGET_POSITION_CONTROL: ['work_state', 'control', 'mach_operate'],
|
|
14
14
|
TARGET_POSITION_PERCENT: ['percent_control', 'position'],
|
|
15
15
|
CONTROL_BACK: ['control_back_mode', 'control_back', 'opposite'],
|
|
16
16
|
CURRENT_POSITION_PERCENT: ['percent_state'],
|
|
17
17
|
},
|
|
18
18
|
{
|
|
19
19
|
NAME: 'control_2',
|
|
20
|
-
TARGET_POSITION_CONTROL: ['control_2', 'mach_operate'],
|
|
20
|
+
TARGET_POSITION_CONTROL: ['work_state2', 'control_2', 'mach_operate'],
|
|
21
21
|
TARGET_POSITION_PERCENT: ['percent_control_2', 'position'],
|
|
22
22
|
CONTROL_BACK: ['control_back_mode', 'control_back'],
|
|
23
23
|
CURRENT_POSITION_PERCENT: ['percent_state'],
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
1
|
+
{"version":3,"file":"WindowCoveringAccessory.js","sourceRoot":"","sources":["../../src/accessory/WindowCoveringAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,25 +73,28 @@ function _configureCurrentPositionWithPositionStateControl(accessory, service, p
|
|
|
73
73
|
.on('change', (context) => {
|
|
74
74
|
// Because the context value was not correct, I retrieve the current value manually.
|
|
75
75
|
const currentValue = onGet();
|
|
76
|
+
const newValue = context.newValue;
|
|
77
|
+
// const newValue = onGet();
|
|
78
|
+
const oldValue = context.oldValue;
|
|
76
79
|
accessory.log.debug(`current position onchange. currentValue:${currentValue}`);
|
|
77
80
|
accessory.log.debug('context:%o', context);
|
|
78
81
|
// https://github.com/homebridge-plugins/homebridge-tuya/pull/50
|
|
79
82
|
// Although the implementation is unconventional, it was reportedly necessary to achieve the correct behavior on actual hardware.
|
|
80
83
|
// In principle, PositionState is a read‑only characteristic and should not be updated or set.
|
|
81
|
-
if (
|
|
84
|
+
if (newValue === 0 || newValue === 100) {
|
|
82
85
|
service.updateCharacteristic(accessory.Characteristic.PositionState, accessory.Characteristic.PositionState.STOPPED);
|
|
83
86
|
const status = accessory.getStatus(controlSchema.code);
|
|
84
87
|
const range = controlSchema.property.range ?? [];
|
|
85
88
|
const stopped = range.find(state => PositionState_1.ControlRange.Stop.includes(state));
|
|
86
|
-
accessory.log.debug(`status:${status?.value}, newValue:${
|
|
89
|
+
accessory.log.debug(`status:${status?.value}, newValue:${newValue}`);
|
|
87
90
|
if (status?.value !== stopped) {
|
|
88
91
|
accessory.sendCommands([{ code: controlSchema.code, value: stopped }], true);
|
|
89
92
|
}
|
|
90
93
|
}
|
|
91
|
-
else if ((
|
|
94
|
+
else if ((newValue || 0) < (oldValue || 0)) {
|
|
92
95
|
service.updateCharacteristic(accessory.Characteristic.PositionState, accessory.Characteristic.PositionState.DECREASING);
|
|
93
96
|
}
|
|
94
|
-
else if ((
|
|
97
|
+
else if ((oldValue || 0) < (newValue || 0)) {
|
|
95
98
|
service.updateCharacteristic(accessory.Characteristic.PositionState, accessory.Characteristic.PositionState.INCREASING);
|
|
96
99
|
}
|
|
97
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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"}
|
|
@@ -4,9 +4,9 @@ exports.ControlRange = void 0;
|
|
|
4
4
|
exports.configurePositionState = configurePositionState;
|
|
5
5
|
exports.configurePositionStateByPosition = configurePositionStateByPosition;
|
|
6
6
|
exports.ControlRange = {
|
|
7
|
-
Open: ['open', 'ZZ'],
|
|
7
|
+
Open: ['opening', 'open', 'ZZ'],
|
|
8
8
|
Stop: ['stop', 'STOP'],
|
|
9
|
-
Close: ['close', 'FZ'],
|
|
9
|
+
Close: ['closing', 'close', 'FZ'],
|
|
10
10
|
Continue: ['continue'],
|
|
11
11
|
};
|
|
12
12
|
function configurePositionState(accessory, service, stateSchema) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PositionState.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/PositionState.ts"],"names":[],"mappings":";;;AAWA,wDA8BC;AAED,4EAgCC;AAvEY,QAAA,YAAY,GAAG;IAC1B,IAAI,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"PositionState.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/PositionState.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,12 +6,14 @@ exports.integerToPercentageProperty = integerToPercentageProperty;
|
|
|
6
6
|
exports.enumToPercentageProperty = enumToPercentageProperty;
|
|
7
7
|
const TuyaDevice_1 = require("../../device/TuyaDevice");
|
|
8
8
|
const util_1 = require("../../util/util");
|
|
9
|
+
// Used to determine whether a STOPPED status code is included.
|
|
10
|
+
const StopCodes = ['stop', '0', 'closed', 'level_0'];
|
|
9
11
|
function configureRotationSpeed(accessory, service, schema) {
|
|
10
12
|
if (!schema) {
|
|
11
13
|
return;
|
|
12
14
|
}
|
|
13
15
|
if (schema.type === TuyaDevice_1.TuyaDeviceSchemaType.Enum) {
|
|
14
|
-
configureRotationSpeedEnum(accessory, service, schema, ['auto']);
|
|
16
|
+
configureRotationSpeedEnum(accessory, service, schema, ['auto', 'smart']);
|
|
15
17
|
}
|
|
16
18
|
else if (schema.type === TuyaDevice_1.TuyaDeviceSchemaType.Integer) {
|
|
17
19
|
configureRotationSpeedInteger(accessory, service, schema);
|
|
@@ -67,11 +69,12 @@ function configureRotationSpeedEnum(accessory, service, schema, ignoreValues) {
|
|
|
67
69
|
range.push(value);
|
|
68
70
|
}
|
|
69
71
|
cloneProperty.range = range;
|
|
70
|
-
const
|
|
72
|
+
const includesStopCode = StopCodes.some(value => range.includes(value));
|
|
73
|
+
const rotationSpeedProperty = enumToPercentageProperty(cloneProperty, includesStopCode);
|
|
71
74
|
const onGetHandler = () => {
|
|
72
75
|
const status = accessory.getStatus(schema.code);
|
|
73
76
|
const index = range.indexOf(status.value);
|
|
74
|
-
const level = index + 1;
|
|
77
|
+
const level = includesStopCode ? index : index + 1;
|
|
75
78
|
const hapValue = level * rotationSpeedProperty.minStep;
|
|
76
79
|
accessory.log.debug(`(get) value from device: ${status.value} (${typeof status.value})`);
|
|
77
80
|
accessory.log.debug(`to home app: ${hapValue} (${typeof hapValue})`);
|
|
@@ -85,7 +88,9 @@ function configureRotationSpeedEnum(accessory, service, schema, ignoreValues) {
|
|
|
85
88
|
if (!Number.isFinite(percent) || percent <= 0) {
|
|
86
89
|
return;
|
|
87
90
|
}
|
|
88
|
-
const
|
|
91
|
+
const level = Math.floor(percent / rotationSpeedProperty.minStep);
|
|
92
|
+
const index = includesStopCode ? level : level - 1;
|
|
93
|
+
const speed = cloneProperty.range[index];
|
|
89
94
|
accessory.log.debug(`(set) value from Home app: ${value} (${typeof value})`);
|
|
90
95
|
accessory.log.debug(`to device: ${speed} (${typeof speed})`);
|
|
91
96
|
await accessory.sendCommands([{ code: schema.code, value: speed }], true);
|
|
@@ -152,9 +157,9 @@ function integerToPercentageProperty(property) {
|
|
|
152
157
|
}
|
|
153
158
|
return { minValue: 0, maxValue: 100, minStep: Math.floor(100 / stepCount), unit: '%' };
|
|
154
159
|
}
|
|
155
|
-
function enumToPercentageProperty(property) {
|
|
160
|
+
function enumToPercentageProperty(property, includesStopCode) {
|
|
156
161
|
const min = 0;
|
|
157
|
-
const max = property.range.length;
|
|
162
|
+
const max = includesStopCode ? property.range.length - 1 : property.range.length;
|
|
158
163
|
const step = 1;
|
|
159
164
|
return integerToPercentageProperty({ min: min, max: max, step: step, scale: 0, unit: '%' });
|
|
160
165
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RotationSpeed.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/RotationSpeed.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"RotationSpeed.js","sourceRoot":"","sources":["../../../src/accessory/characteristic/RotationSpeed.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.1-beta.
|
|
4
|
+
"version": "2.7.1-beta.3",
|
|
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": {
|
|
@@ -77,7 +77,12 @@ describe('convert property', () => {
|
|
|
77
77
|
|
|
78
78
|
test('enumToPercentageProperty returns 25% steps for 4 enum values', () => {
|
|
79
79
|
const property = { range: ['low', 'medium', 'high', 'auto'] } as unknown as TuyaDeviceSchemaEnumProperty;
|
|
80
|
-
expect(enumToPercentageProperty(property)).toEqual({ minValue: 0, maxValue: 100, minStep: 25, unit: '%' });
|
|
80
|
+
expect(enumToPercentageProperty(property, false)).toEqual({ minValue: 0, maxValue: 100, minStep: 25, unit: '%' });
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
test('enumToPercentageProperty returns 25% steps for 5 enum values(including stop code)', () => {
|
|
84
|
+
const property = { range: ['stop', 'low', 'medium', 'high', 'auto'] } as unknown as TuyaDeviceSchemaEnumProperty;
|
|
85
|
+
expect(enumToPercentageProperty(property, true)).toEqual({ minValue: 0, maxValue: 100, minStep: 25, unit: '%' });
|
|
81
86
|
});
|
|
82
87
|
|
|
83
88
|
});
|