@homebridge-plugins/homebridge-tuya 2.7.1-beta.6 → 2.7.1-beta.8
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.
|
@@ -25,15 +25,7 @@ function configureCurrentPosition(accessory, service, percentSchema, controlSche
|
|
|
25
25
|
function _configureCurrentPosition(accessory, service, percentSchema) {
|
|
26
26
|
const onGet = onGetPositionHandler(accessory, percentSchema);
|
|
27
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
|
-
});
|
|
28
|
+
.onGet(onGet);
|
|
37
29
|
}
|
|
38
30
|
function _configureCurrentPositionByPositionState(accessory, service, controlSchema) {
|
|
39
31
|
service.getCharacteristic(accessory.Characteristic.CurrentPosition)
|
|
@@ -55,14 +47,6 @@ function _configureCurrentPositionByPositionState(accessory, service, controlSch
|
|
|
55
47
|
}
|
|
56
48
|
accessory.log.warn('Unknown CurrentPosition:', status.value);
|
|
57
49
|
return 50;
|
|
58
|
-
})
|
|
59
|
-
.on('change', (context) => {
|
|
60
|
-
// https://github.com/homebridge-plugins/homebridge-tuya/pull/50
|
|
61
|
-
// Although the implementation is unconventional, it was reportedly necessary to achieve the correct behavior on actual hardware.
|
|
62
|
-
// In principle, PositionState is a read‑only characteristic and should not be updated or set.
|
|
63
|
-
if (context.newValue === 0 || context.newValue === 100) {
|
|
64
|
-
service.updateCharacteristic(accessory.Characteristic.PositionState, accessory.Characteristic.PositionState.STOPPED);
|
|
65
|
-
}
|
|
66
50
|
});
|
|
67
51
|
}
|
|
68
52
|
function _configureCurrentPositionWithPositionStateControl(accessory, service, percentSchema, controlSchema) {
|
|
@@ -70,35 +54,7 @@ function _configureCurrentPositionWithPositionStateControl(accessory, service, p
|
|
|
70
54
|
const onGet = onGetPositionHandler(accessory, percentSchema);
|
|
71
55
|
service.getCharacteristic(accessory.Characteristic.CurrentPosition)
|
|
72
56
|
.onGet(onGet)
|
|
73
|
-
.setProps(hapProps)
|
|
74
|
-
.on('change', (context) => {
|
|
75
|
-
// Because the context value was not correct, I retrieve the current value manually.
|
|
76
|
-
const currentValue = onGet();
|
|
77
|
-
const newValue = context.newValue;
|
|
78
|
-
// const newValue = onGet();
|
|
79
|
-
const oldValue = context.oldValue;
|
|
80
|
-
accessory.log.debug(`current position onchange. currentValue:${currentValue}`);
|
|
81
|
-
accessory.log.debug('context:%o', context);
|
|
82
|
-
// https://github.com/homebridge-plugins/homebridge-tuya/pull/50
|
|
83
|
-
// Although the implementation is unconventional, it was reportedly necessary to achieve the correct behavior on actual hardware.
|
|
84
|
-
// In principle, PositionState is a read‑only characteristic and should not be updated or set.
|
|
85
|
-
if (newValue === 0 || newValue === 100) {
|
|
86
|
-
service.updateCharacteristic(accessory.Characteristic.PositionState, accessory.Characteristic.PositionState.STOPPED);
|
|
87
|
-
const status = accessory.getStatus(controlSchema.code);
|
|
88
|
-
const range = controlSchema.property.range ?? [];
|
|
89
|
-
const stopped = range.find(state => PositionState_1.ControlRange.Stop.includes(state));
|
|
90
|
-
accessory.log.debug(`status:${status?.value}, newValue:${newValue}`);
|
|
91
|
-
if (status?.value !== stopped) {
|
|
92
|
-
accessory.sendCommands([{ code: controlSchema.code, value: stopped }], true);
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
else if ((newValue || 0) < (oldValue || 0)) {
|
|
96
|
-
service.updateCharacteristic(accessory.Characteristic.PositionState, accessory.Characteristic.PositionState.DECREASING);
|
|
97
|
-
}
|
|
98
|
-
else if ((oldValue || 0) < (newValue || 0)) {
|
|
99
|
-
service.updateCharacteristic(accessory.Characteristic.PositionState, accessory.Characteristic.PositionState.INCREASING);
|
|
100
|
-
}
|
|
101
|
-
});
|
|
57
|
+
.setProps(hapProps);
|
|
102
58
|
}
|
|
103
59
|
function onGetPositionHandler(accessory, schema) {
|
|
104
60
|
const hapProps = (0, util_1.toHapProperty)(schema.property);
|
|
@@ -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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"}
|
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.8",
|
|
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": {
|