homebridge-tasmota 0.2.4-beta.0 → 0.2.4-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/TasmotaService.d.ts +1 -11
- package/dist/TasmotaService.js +12 -38
- package/dist/TasmotaService.js.map +1 -1
- package/dist/index.d.ts +0 -3
- package/dist/index.js +0 -3
- package/dist/index.js.map +1 -1
- package/dist/settings.d.ts +0 -6
- package/dist/settings.js +0 -6
- package/dist/settings.js.map +1 -1
- package/dist/tasmotaBinarySensorService.d.ts +0 -5
- package/dist/tasmotaBinarySensorService.js +7 -48
- package/dist/tasmotaBinarySensorService.js.map +1 -1
- package/dist/tasmotaFanService.d.ts +0 -9
- package/dist/tasmotaFanService.js +4 -27
- package/dist/tasmotaFanService.js.map +1 -1
- package/dist/tasmotaGarageService.d.ts +0 -36
- package/dist/tasmotaGarageService.js +1 -61
- package/dist/tasmotaGarageService.js.map +1 -1
- package/dist/tasmotaLightService.d.ts +0 -9
- package/dist/tasmotaLightService.js +5 -36
- package/dist/tasmotaLightService.js.map +1 -1
- package/dist/tasmotaPlatform.d.ts +1 -12
- package/dist/tasmotaPlatform.js +55 -191
- package/dist/tasmotaPlatform.js.map +1 -1
- package/dist/tasmotaSensorService.d.ts +1 -5
- package/dist/tasmotaSensorService.js +71 -245
- package/dist/tasmotaSensorService.js.map +1 -1
- package/dist/tasmotaSwitchService.d.ts +0 -13
- package/dist/tasmotaSwitchService.js +1 -104
- package/dist/tasmotaSwitchService.js.map +1 -1
- package/dist/utils.js +9 -40
- package/dist/utils.js.map +1 -1
- package/package.json +8 -9
- package/vitest.config.ts +19 -0
package/dist/TasmotaService.d.ts
CHANGED
|
@@ -1,11 +1,5 @@
|
|
|
1
1
|
import { Characteristic, CharacteristicValue, Nullable, PlatformAccessory, Service } from 'homebridge';
|
|
2
|
-
import nunjucks from 'nunjucks';
|
|
3
2
|
import { tasmotaPlatform } from './tasmotaPlatform.js';
|
|
4
|
-
/**
|
|
5
|
-
* Platform Accessory
|
|
6
|
-
* An instance of this class is created for each accessory your platform registers
|
|
7
|
-
* Each accessory may expose multiple services of different service types.
|
|
8
|
-
*/
|
|
9
3
|
interface Subscription {
|
|
10
4
|
event: string;
|
|
11
5
|
callback: any;
|
|
@@ -20,7 +14,7 @@ export declare class TasmotaService {
|
|
|
20
14
|
statusSubscribe?: Subscription;
|
|
21
15
|
availabilitySubscribe?: Subscription;
|
|
22
16
|
fakegato: string;
|
|
23
|
-
nunjucksEnvironment:
|
|
17
|
+
nunjucksEnvironment: any;
|
|
24
18
|
protected uuid: string;
|
|
25
19
|
constructor(platform: tasmotaPlatform, accessory: PlatformAccessory, uniq_id: string);
|
|
26
20
|
enableFakegato(): void;
|
|
@@ -28,10 +22,6 @@ export declare class TasmotaService {
|
|
|
28
22
|
deviceClassToHKCharacteristic(device_class: string): any;
|
|
29
23
|
refresh(): void;
|
|
30
24
|
statusUpdate(topic: string, message: Buffer): void;
|
|
31
|
-
/**
|
|
32
|
-
* Handle "LWT" Last Will and Testament messages from Tasmota
|
|
33
|
-
* These are sent when the device is no longer available from the MQTT server.
|
|
34
|
-
*/
|
|
35
25
|
availabilityUpdate(topic: string, message: Buffer): void;
|
|
36
26
|
delta(value1: Nullable<CharacteristicValue> | undefined, value2: Nullable<CharacteristicValue> | undefined): boolean;
|
|
37
27
|
parseValue(valueTemplate: string, value: string): string;
|
package/dist/TasmotaService.js
CHANGED
|
@@ -2,6 +2,8 @@ import createDebug from 'debug';
|
|
|
2
2
|
import os from 'node:os';
|
|
3
3
|
import nunjucks from 'nunjucks';
|
|
4
4
|
const debug = createDebug('Tasmota:Service');
|
|
5
|
+
nunjucks.installJinjaCompat();
|
|
6
|
+
nunjucks.configure({ autoescape: true });
|
|
5
7
|
export class TasmotaService {
|
|
6
8
|
platform;
|
|
7
9
|
accessory;
|
|
@@ -22,9 +24,7 @@ export class TasmotaService {
|
|
|
22
24
|
this.uuid = this.platform.api.hap.uuid.generate(this.accessory.context.device[this.uniq_id].uniq_id);
|
|
23
25
|
this.device_class = accessory.context.device[this.uniq_id].dev_cla;
|
|
24
26
|
this.nunjucksEnvironment = new nunjucks.Environment();
|
|
25
|
-
// Home Assistant device template filters
|
|
26
27
|
this.nunjucksEnvironment.addFilter('is_defined', (val, cb) => {
|
|
27
|
-
// console.log('is_defined', val, cb);
|
|
28
28
|
if (val || val === 0) {
|
|
29
29
|
cb(null, val);
|
|
30
30
|
}
|
|
@@ -32,17 +32,9 @@ export class TasmotaService {
|
|
|
32
32
|
cb(new Error('missing key'), val);
|
|
33
33
|
}
|
|
34
34
|
}, true);
|
|
35
|
-
|
|
36
|
-
return (Number.parseFloat(val));
|
|
37
|
-
}
|
|
38
|
-
this.nunjucksEnvironment.addGlobal('float', float);
|
|
39
|
-
nunjucks.installJinjaCompat();
|
|
40
|
-
nunjucks.configure({
|
|
41
|
-
autoescape: true,
|
|
42
|
-
});
|
|
35
|
+
this.nunjucksEnvironment.addGlobal('float', (val) => Number.parseFloat(val));
|
|
43
36
|
}
|
|
44
37
|
enableFakegato() {
|
|
45
|
-
// Enable historical logging
|
|
46
38
|
if (this.platform.config.history && !this.accessory.context.fakegatoService?.addEntry) {
|
|
47
39
|
const hostname = os.hostname().split('.')[0];
|
|
48
40
|
this.accessory.context.fakegatoService = new this.platform.FakeGatoHistoryService('custom', this.accessory, {
|
|
@@ -79,25 +71,23 @@ export class TasmotaService {
|
|
|
79
71
|
deviceClassToHKCharacteristic(device_class) {
|
|
80
72
|
switch (device_class) {
|
|
81
73
|
case '-dt24-amp':
|
|
82
|
-
case '_energy_current':
|
|
74
|
+
case '_energy_current':
|
|
83
75
|
return (this.platform.CustomCharacteristics.ElectricCurrent);
|
|
84
|
-
case '_energy_voltage':
|
|
85
|
-
case '-dt24-volt':
|
|
76
|
+
case '_energy_voltage':
|
|
77
|
+
case '-dt24-volt':
|
|
86
78
|
return (this.platform.CustomCharacteristics.Voltage);
|
|
87
|
-
case '_energy_power':
|
|
88
|
-
case '-dt24-watt':
|
|
79
|
+
case '_energy_power':
|
|
80
|
+
case '-dt24-watt':
|
|
89
81
|
return (this.platform.CustomCharacteristics.CurrentConsumption);
|
|
90
|
-
case '_energy_total':
|
|
82
|
+
case '_energy_total':
|
|
91
83
|
case '-dt24-watt-hour':
|
|
92
84
|
return (this.platform.CustomCharacteristics.TotalConsumption);
|
|
93
|
-
break;
|
|
94
85
|
}
|
|
95
86
|
}
|
|
96
87
|
refresh() {
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
const teleperiod = `${this.accessory.context.device[this.uniq_id].stat_t.substr(0, this.accessory.context.device[this.uniq_id].stat_t.lastIndexOf('/') + 1).replace('tele', 'cmnd')}teleperiod`;
|
|
88
|
+
if (this.accessory.context.device[this.uniq_id].stat_t && !this.accessory.context.device[this.uniq_id].stat_t.match(/[+#]/)) {
|
|
89
|
+
const statTopic = this.accessory.context.device[this.uniq_id].stat_t;
|
|
90
|
+
const teleperiod = `${statTopic.substring(0, statTopic.lastIndexOf('/') + 1).replace('tele', 'cmnd')}teleperiod`;
|
|
101
91
|
this.platform.mqttHost.sendMessage(teleperiod, this.platform.teleperiod.toString());
|
|
102
92
|
}
|
|
103
93
|
}
|
|
@@ -106,7 +96,6 @@ export class TasmotaService {
|
|
|
106
96
|
this.accessory.context.timeout = this.platform.autoCleanup(this.accessory);
|
|
107
97
|
try {
|
|
108
98
|
let value = this.parseValue(this.accessory.context.device[this.uniq_id].val_tpl, message.toString());
|
|
109
|
-
// Sensor value tweaks or adjustments needed for homekit
|
|
110
99
|
switch (this.device_class) {
|
|
111
100
|
case 'temperature':
|
|
112
101
|
if (this.accessory.context.device[this.uniq_id].unit_of_meas.toUpperCase() === 'F') {
|
|
@@ -114,7 +103,6 @@ export class TasmotaService {
|
|
|
114
103
|
}
|
|
115
104
|
break;
|
|
116
105
|
case 'illuminance':
|
|
117
|
-
// normalize LX in the range homebridge expects
|
|
118
106
|
value = String(Number(value) < 0.0001 ? 0.0001 : (Number(value) > 100000 ? 100000 : value));
|
|
119
107
|
break;
|
|
120
108
|
case 'co2':
|
|
@@ -139,35 +127,24 @@ export class TasmotaService {
|
|
|
139
127
|
this.platform.log.debug(String((err && err.message ? err.message : err)));
|
|
140
128
|
}
|
|
141
129
|
}
|
|
142
|
-
/**
|
|
143
|
-
* Handle "LWT" Last Will and Testament messages from Tasmota
|
|
144
|
-
* These are sent when the device is no longer available from the MQTT server.
|
|
145
|
-
*/
|
|
146
130
|
availabilityUpdate(topic, message) {
|
|
147
|
-
// debug("availabilityUpdate", this, topic, message.toString());
|
|
148
131
|
this.platform.log.info('Marking accessory \'%s\' to %s', this.service?.displayName, message.toString());
|
|
149
132
|
if (message.toString() === this.accessory.context.device[this.uniq_id].pl_not_avail) {
|
|
150
133
|
const availability = new Error(`${this.accessory.displayName} ${message.toString()}`);
|
|
151
134
|
this.characteristic?.updateValue(availability);
|
|
152
135
|
}
|
|
153
136
|
else {
|
|
154
|
-
// debug("availabilityUpdate", this.characteristic);
|
|
155
137
|
this.characteristic?.updateValue(this.characteristic?.value);
|
|
156
138
|
}
|
|
157
139
|
}
|
|
158
|
-
// Utility functions for status update
|
|
159
140
|
delta(value1, value2) {
|
|
160
|
-
// debug("delta", (parseInt(value1) !== parseInt(value2)));
|
|
161
141
|
return (Number.parseInt(String(value1)) !== Number.parseInt(String(value2)));
|
|
162
142
|
}
|
|
163
143
|
parseValue(valueTemplate, value) {
|
|
164
144
|
try {
|
|
165
145
|
if (valueTemplate) {
|
|
166
|
-
// debug('nunjucksEnvironment', this, this.nunjucksEnvironment);
|
|
167
146
|
const template = nunjucks.compile(valueTemplate, this.nunjucksEnvironment);
|
|
168
|
-
// debug('nunjucksEnvironment', template, this.nunjucksEnvironment, value);
|
|
169
147
|
const result = template.render({ value_json: JSON.parse(value) });
|
|
170
|
-
// debug('nunjucksEnvironment-result', valueTemplate, value, result);
|
|
171
148
|
if (result) {
|
|
172
149
|
return result;
|
|
173
150
|
}
|
|
@@ -180,9 +157,6 @@ export class TasmotaService {
|
|
|
180
157
|
}
|
|
181
158
|
}
|
|
182
159
|
catch (err) {
|
|
183
|
-
// this.platform.log.error('ERROR: Template Parsing error', err.message);
|
|
184
|
-
// debug('ERROR: Template Parsing error', valueTemplate, value);
|
|
185
|
-
// return (err);
|
|
186
160
|
}
|
|
187
161
|
return '';
|
|
188
162
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TasmotaService.js","sourceRoot":"","sources":["../src/TasmotaService.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,OAAO,CAAC;AAQhC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,QAAQ,MAAM,UAAU,CAAC;AAGhC,MAAM,KAAK,GAAG,WAAW,CAAC,iBAAiB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"TasmotaService.js","sourceRoot":"","sources":["../src/TasmotaService.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAKvD,eAAe,CAAC,GAAQ,EAAQ,EAAE;IAChC,GAAG,CAAC,gBAAgB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;AACvD,CAAC,CAAC"}
|
package/dist/settings.d.ts
CHANGED
|
@@ -1,8 +1,2 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* This is the name of the platform that users will use to register the plugin in the Homebridge config.json
|
|
3
|
-
*/
|
|
4
1
|
export declare const PLATFORM_NAME = "Tasmota";
|
|
5
|
-
/**
|
|
6
|
-
* This must match the name of your plugin as defined the package.json
|
|
7
|
-
*/
|
|
8
2
|
export declare const PLUGIN_NAME = "homebridge-tasmota";
|
package/dist/settings.js
CHANGED
|
@@ -1,9 +1,3 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* This is the name of the platform that users will use to register the plugin in the Homebridge config.json
|
|
3
|
-
*/
|
|
4
1
|
export const PLATFORM_NAME = 'Tasmota';
|
|
5
|
-
/**
|
|
6
|
-
* This must match the name of your plugin as defined the package.json
|
|
7
|
-
*/
|
|
8
2
|
export const PLUGIN_NAME = 'homebridge-tasmota';
|
|
9
3
|
//# sourceMappingURL=settings.js.map
|
package/dist/settings.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC;AAKvC,MAAM,CAAC,MAAM,WAAW,GAAG,oBAAoB,CAAC"}
|
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
import { PlatformAccessory } from 'homebridge';
|
|
2
2
|
import { TasmotaService } from './TasmotaService.js';
|
|
3
3
|
import { tasmotaPlatform } from './tasmotaPlatform.js';
|
|
4
|
-
/**
|
|
5
|
-
* Platform Accessory
|
|
6
|
-
* An instance of this class is created for each accessory your platform registers
|
|
7
|
-
* Each accessory may expose multiple services of different service types.
|
|
8
|
-
*/
|
|
9
4
|
export declare class tasmotaBinarySensorService extends TasmotaService {
|
|
10
5
|
readonly platform: tasmotaPlatform;
|
|
11
6
|
readonly accessory: PlatformAccessory;
|
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
import createDebug from 'debug';
|
|
2
2
|
import { TasmotaService, isTrue } from './TasmotaService.js';
|
|
3
3
|
const debug = createDebug('Tasmota:binarySensor');
|
|
4
|
-
/**
|
|
5
|
-
* Platform Accessory
|
|
6
|
-
* An instance of this class is created for each accessory your platform registers
|
|
7
|
-
* Each accessory may expose multiple services of different service types.
|
|
8
|
-
*/
|
|
9
4
|
export class tasmotaBinarySensorService extends TasmotaService {
|
|
10
5
|
platform;
|
|
11
6
|
accessory;
|
|
@@ -17,6 +12,8 @@ export class tasmotaBinarySensorService extends TasmotaService {
|
|
|
17
12
|
this.uniq_id = uniq_id;
|
|
18
13
|
switch (accessory.context.device[this.uniq_id].dev_cla) {
|
|
19
14
|
case 'doorbell':
|
|
15
|
+
case 'contact':
|
|
16
|
+
case 'door':
|
|
20
17
|
this.platform.log.debug('Creating %s binary sensor %s', accessory.context.device[this.uniq_id].dev_cla, accessory.context.device[this.uniq_id].name);
|
|
21
18
|
this.service = this.accessory.getService(this.uuid) || this.accessory.addService(this.platform.Service.ContactSensor, accessory.context.device[this.uniq_id].name, this.uuid);
|
|
22
19
|
this.service.setCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.context.device[this.uniq_id].name);
|
|
@@ -25,9 +22,12 @@ export class tasmotaBinarySensorService extends TasmotaService {
|
|
|
25
22
|
}
|
|
26
23
|
this.characteristic = this.service.getCharacteristic(this.platform.Characteristic.ContactSensorState);
|
|
27
24
|
if (this.platform.config.history) {
|
|
28
|
-
this.fakegato = 'contact';
|
|
29
|
-
|
|
25
|
+
this.fakegato = accessory.context.device[this.uniq_id].dev_cla === 'doorbell' ? 'contact' : 'motion';
|
|
26
|
+
if (accessory.context.device[this.uniq_id].dev_cla === 'doorbell') {
|
|
27
|
+
this.service.addOptionalCharacteristic(this.platform.CustomCharacteristics.TimesOpened);
|
|
28
|
+
}
|
|
30
29
|
this.service.addOptionalCharacteristic(this.platform.CustomCharacteristics.LastActivation);
|
|
30
|
+
debug('adding', this.fakegato);
|
|
31
31
|
}
|
|
32
32
|
break;
|
|
33
33
|
case 'motion':
|
|
@@ -44,34 +44,6 @@ export class tasmotaBinarySensorService extends TasmotaService {
|
|
|
44
44
|
debug('adding', this.fakegato);
|
|
45
45
|
}
|
|
46
46
|
break;
|
|
47
|
-
case 'contact':
|
|
48
|
-
this.platform.log.debug('Creating %s binary sensor %s', accessory.context.device[this.uniq_id].dev_cla, accessory.context.device[this.uniq_id].name);
|
|
49
|
-
this.service = this.accessory.getService(this.uuid) || this.accessory.addService(this.platform.Service.ContactSensor, accessory.context.device[this.uniq_id].name, this.uuid);
|
|
50
|
-
this.service.setCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.context.device[this.uniq_id].name);
|
|
51
|
-
if (!this.service.displayName) {
|
|
52
|
-
this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.context.device[this.uniq_id].name);
|
|
53
|
-
}
|
|
54
|
-
this.characteristic = this.service.getCharacteristic(this.platform.Characteristic.ContactSensorState);
|
|
55
|
-
if (this.platform.config.history) {
|
|
56
|
-
this.fakegato = 'contact';
|
|
57
|
-
this.service.addOptionalCharacteristic(this.platform.CustomCharacteristics.LastActivation);
|
|
58
|
-
debug('adding', this.fakegato);
|
|
59
|
-
}
|
|
60
|
-
break;
|
|
61
|
-
case 'door':
|
|
62
|
-
this.platform.log.debug('Creating %s binary sensor %s', accessory.context.device[this.uniq_id].dev_cla, accessory.context.device[this.uniq_id].name);
|
|
63
|
-
this.service = this.accessory.getService(this.uuid) || this.accessory.addService(this.platform.Service.ContactSensor, accessory.context.device[this.uniq_id].name, this.uuid);
|
|
64
|
-
this.service.setCharacteristic(this.platform.Characteristic.ConfiguredName, accessory.context.device[this.uniq_id].name);
|
|
65
|
-
if (!this.service.displayName) {
|
|
66
|
-
this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.context.device[this.uniq_id].name);
|
|
67
|
-
}
|
|
68
|
-
this.characteristic = this.service.getCharacteristic(this.platform.Characteristic.ContactSensorState);
|
|
69
|
-
if (this.platform.config.history) {
|
|
70
|
-
this.fakegato = 'motion';
|
|
71
|
-
this.service.addOptionalCharacteristic(this.platform.CustomCharacteristics.LastActivation);
|
|
72
|
-
debug('adding', this.fakegato);
|
|
73
|
-
}
|
|
74
|
-
break;
|
|
75
47
|
case 'moisture':
|
|
76
48
|
this.platform.log.debug('Creating %s binary sensor %s', accessory.context.device[this.uniq_id].dev_cla, accessory.context.device[this.uniq_id].name);
|
|
77
49
|
this.service = this.accessory.getService(this.uuid) || this.accessory.addService(this.platform.Service.LeakSensor, accessory.context.device[this.uniq_id].name, this.uuid);
|
|
@@ -81,9 +53,7 @@ export class tasmotaBinarySensorService extends TasmotaService {
|
|
|
81
53
|
}
|
|
82
54
|
this.characteristic = this.service.getCharacteristic(this.platform.Characteristic.LeakDetected);
|
|
83
55
|
if (this.platform.config.history) {
|
|
84
|
-
// this.fakegato = 'motion';
|
|
85
56
|
this.service.addOptionalCharacteristic(this.platform.CustomCharacteristics.LastActivation);
|
|
86
|
-
// debug('adding', this.fakegato);
|
|
87
57
|
}
|
|
88
58
|
break;
|
|
89
59
|
default:
|
|
@@ -96,21 +66,14 @@ export class tasmotaBinarySensorService extends TasmotaService {
|
|
|
96
66
|
debug('MQTT', topic, message.toString());
|
|
97
67
|
this.accessory.context.timeout = this.platform.autoCleanup(this.accessory);
|
|
98
68
|
try {
|
|
99
|
-
// debug('this.uniq_id', this.uniq_id);
|
|
100
|
-
// debug('val_tpl', this.accessory.context.device[this.uniq_id].val_tpl);
|
|
101
|
-
// debug('message', message.toString());
|
|
102
69
|
let value = message.toString();
|
|
103
70
|
if (this.accessory.context.device[this.uniq_id].val_tpl) {
|
|
104
71
|
value = this.parseValue(this.accessory.context.device[this.uniq_id].val_tpl, message.toString());
|
|
105
72
|
}
|
|
106
|
-
// debug('value', value, typeof value);
|
|
107
|
-
// debug('device_class', this.device_class);
|
|
108
|
-
// Adjust value to format expected by sensor type
|
|
109
73
|
switch (this.device_class) {
|
|
110
74
|
case 'doorbell':
|
|
111
75
|
break;
|
|
112
76
|
case 'moisture':
|
|
113
|
-
// 1 / 0
|
|
114
77
|
debug('moisture', this.accessory.context.device[this.uniq_id].pl_on, value);
|
|
115
78
|
value = (this.accessory.context.device[this.uniq_id].pl_on === value
|
|
116
79
|
? this.platform.Characteristic.LeakDetected.LEAK_DETECTED
|
|
@@ -125,11 +88,9 @@ export class tasmotaBinarySensorService extends TasmotaService {
|
|
|
125
88
|
: this.platform.Characteristic.ContactSensorState.CONTACT_DETECTED);
|
|
126
89
|
break;
|
|
127
90
|
case 'motion':
|
|
128
|
-
// boolean
|
|
129
91
|
value = (this.accessory.context.device[this.uniq_id].pl_on === value);
|
|
130
92
|
break;
|
|
131
93
|
case 'contact':
|
|
132
|
-
// boolean
|
|
133
94
|
value = (this.accessory.context.device[this.uniq_id].pl_on === value
|
|
134
95
|
? this.platform.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED
|
|
135
96
|
: this.platform.Characteristic.ContactSensorState.CONTACT_DETECTED);
|
|
@@ -142,7 +103,6 @@ export class tasmotaBinarySensorService extends TasmotaService {
|
|
|
142
103
|
case 'doorbell':
|
|
143
104
|
timesOpened = 1 + Number(this.service?.getCharacteristic(this.platform.CustomCharacteristics.TimesOpened).value);
|
|
144
105
|
this.service?.updateCharacteristic(this.platform.CustomCharacteristics.TimesOpened, timesOpened);
|
|
145
|
-
// fall thru
|
|
146
106
|
case 'moisture':
|
|
147
107
|
case 'motion':
|
|
148
108
|
case 'contact':
|
|
@@ -167,7 +127,6 @@ export class tasmotaBinarySensorService extends TasmotaService {
|
|
|
167
127
|
});
|
|
168
128
|
}
|
|
169
129
|
else {
|
|
170
|
-
// debug('Not updating fakegato', this.service.displayName);
|
|
171
130
|
}
|
|
172
131
|
}
|
|
173
132
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasmotaBinarySensorService.js","sourceRoot":"","sources":["../src/tasmotaBinarySensorService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tasmotaBinarySensorService.js","sourceRoot":"","sources":["../src/tasmotaBinarySensorService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,11 @@
|
|
|
1
1
|
import { CharacteristicSetCallback, CharacteristicValue, PlatformAccessory } from 'homebridge';
|
|
2
2
|
import { TasmotaService } from './TasmotaService.js';
|
|
3
3
|
import { tasmotaPlatform } from './tasmotaPlatform.js';
|
|
4
|
-
/**
|
|
5
|
-
* Platform Accessory
|
|
6
|
-
* An instance of this class is created for each accessory your platform registers
|
|
7
|
-
* Each accessory may expose multiple services of different service types.
|
|
8
|
-
*/
|
|
9
4
|
export declare class tasmotaFanService extends TasmotaService {
|
|
10
5
|
readonly platform: tasmotaPlatform;
|
|
11
6
|
readonly accessory: PlatformAccessory;
|
|
12
7
|
protected readonly uniq_id: string;
|
|
13
8
|
constructor(platform: tasmotaPlatform, accessory: PlatformAccessory, uniq_id: string);
|
|
14
|
-
/**
|
|
15
|
-
* Handle "STATE" messages from Tasmotastat_t:
|
|
16
|
-
* These are sent when the device's state is changed, either via HomeKit, Local Control or Other control methods.
|
|
17
|
-
*/
|
|
18
9
|
statusUpdate(topic: string, message: Buffer): void;
|
|
19
10
|
setOn(value: CharacteristicValue, callback: CharacteristicSetCallback): void;
|
|
20
11
|
setRotationSpeed(value: CharacteristicValue, callback: CharacteristicSetCallback): void;
|
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
import createDebug from 'debug';
|
|
2
2
|
import { TasmotaService } from './TasmotaService.js';
|
|
3
3
|
const debug = createDebug('Tasmota:fan');
|
|
4
|
-
/**
|
|
5
|
-
* Platform Accessory
|
|
6
|
-
* An instance of this class is created for each accessory your platform registers
|
|
7
|
-
* Each accessory may expose multiple services of different service types.
|
|
8
|
-
*/
|
|
9
4
|
export class tasmotaFanService extends TasmotaService {
|
|
10
5
|
platform;
|
|
11
6
|
accessory;
|
|
@@ -25,7 +20,6 @@ export class tasmotaFanService extends TasmotaService {
|
|
|
25
20
|
.on('set', this.setOn.bind(this));
|
|
26
21
|
this.enableStatus();
|
|
27
22
|
}
|
|
28
|
-
// Does the Fan include a RotationSpeed characteristic
|
|
29
23
|
if (accessory.context.device[this.uniq_id].bri_cmd_t) {
|
|
30
24
|
(this.service.getCharacteristic(this.platform.Characteristic.RotationSpeed)
|
|
31
25
|
|| this.service.addCharacteristic(this.platform.Characteristic.RotationSpeed))
|
|
@@ -35,15 +29,8 @@ export class tasmotaFanService extends TasmotaService {
|
|
|
35
29
|
(this.service.getCharacteristic(this.platform.Characteristic.RotationSpeed)
|
|
36
30
|
|| this.service.addCharacteristic(this.platform.Characteristic.RotationSpeed))
|
|
37
31
|
.on('set', this.setRotationSpeedFixed.bind(this));
|
|
38
|
-
// .setProps({ // This causes an issue with validateUserInput in Characteristic and 33.3333 becomes 0
|
|
39
|
-
// minStep: 33.33333333333333,
|
|
40
|
-
// });
|
|
41
32
|
}
|
|
42
33
|
}
|
|
43
|
-
/**
|
|
44
|
-
* Handle "STATE" messages from Tasmotastat_t:
|
|
45
|
-
* These are sent when the device's state is changed, either via HomeKit, Local Control or Other control methods.
|
|
46
|
-
*/
|
|
47
34
|
statusUpdate(topic, message) {
|
|
48
35
|
debug('statusUpdate', topic, message.toString());
|
|
49
36
|
this.accessory.context.timeout = this.platform.autoCleanup(this.accessory);
|
|
@@ -54,7 +41,6 @@ export class tasmotaFanService extends TasmotaService {
|
|
|
54
41
|
}
|
|
55
42
|
if (this.service?.getCharacteristic(this.platform.Characteristic.On).value !== (value
|
|
56
43
|
=== this.accessory.context.device[this.uniq_id].pl_on)) {
|
|
57
|
-
// Use debug logging for no change updates, and info when a change occurred
|
|
58
44
|
this.platform.log.info('Updating \'%s\' to %s', this.service?.displayName, value);
|
|
59
45
|
}
|
|
60
46
|
else {
|
|
@@ -65,9 +51,7 @@ export class tasmotaFanService extends TasmotaService {
|
|
|
65
51
|
=== this.accessory.context.device[this.uniq_id].pl_on));
|
|
66
52
|
this.service?.getCharacteristic(this.platform.Characteristic.On).updateValue((value
|
|
67
53
|
=== this.accessory.context.device[this.uniq_id].pl_on));
|
|
68
|
-
// Update RotationSpeed if supported
|
|
69
54
|
if (this.accessory.context.device[this.uniq_id].bri_val_tpl) {
|
|
70
|
-
// Use debug logging for no change updates, and info when a change occurred
|
|
71
55
|
const bri_val = this.parseValue(this.accessory.context.device[this.uniq_id].bri_val_tpl, message.toString());
|
|
72
56
|
if (this.service?.getCharacteristic(this.platform.Characteristic.RotationSpeed).value !== bri_val) {
|
|
73
57
|
this.platform.log.info('Updating \'%s\' RotationSpeed to %s', this.service?.displayName, bri_val);
|
|
@@ -85,19 +69,16 @@ export class tasmotaFanService extends TasmotaService {
|
|
|
85
69
|
setOn(value, callback) {
|
|
86
70
|
this.platform.log.info('%s Set Characteristic On ->', this.accessory.displayName, value);
|
|
87
71
|
if (!this.accessory.context.device[this.uniq_id].spds) {
|
|
88
|
-
// Not hampton bay fans with speeds rather than on
|
|
89
72
|
this.platform.mqttHost.sendMessage(this.accessory.context.device[this.uniq_id].cmd_t, (value
|
|
90
73
|
? this.accessory.context.device[this.uniq_id].pl_on
|
|
91
74
|
: this.accessory.context.device[this.uniq_id].pl_off));
|
|
92
75
|
}
|
|
93
76
|
else if (!value) {
|
|
94
|
-
// Turning off
|
|
95
77
|
this.platform.mqttHost.sendMessage(this.accessory.context.device[this.uniq_id].cmd_t, (value
|
|
96
78
|
? this.accessory.context.device[this.uniq_id].pl_on
|
|
97
79
|
: this.accessory.context.device[this.uniq_id].pl_off));
|
|
98
80
|
}
|
|
99
81
|
else {
|
|
100
|
-
// Turning on of Hampton bay RF Fans, they don't have a ON function but can restore previous speed
|
|
101
82
|
this.setRotationSpeedFixed(this.service?.getCharacteristic(this.platform.Characteristic.RotationSpeed).value || 25, callback);
|
|
102
83
|
return;
|
|
103
84
|
}
|
|
@@ -109,21 +90,17 @@ export class tasmotaFanService extends TasmotaService {
|
|
|
109
90
|
callback(null);
|
|
110
91
|
}
|
|
111
92
|
setRotationSpeedFixed(value, callback) {
|
|
112
|
-
// debug('config', this.accessory.displayName, this.accessory.context.device[this.uniq_id]);
|
|
113
93
|
this.platform.log.info('%s Set Characteristic RotationSpeedFixed ->', this.accessory.displayName, value);
|
|
114
|
-
if (Number(value) < 25) {
|
|
94
|
+
if (Number(value) < 25) {
|
|
115
95
|
this.platform.mqttHost.sendMessage(this.accessory.context.device[this.uniq_id].cmd_t, this.accessory.context.device[this.uniq_id].pl_off);
|
|
116
96
|
}
|
|
117
|
-
else if (Number(value) < 50) {
|
|
118
|
-
// debug('low', this.accessory.displayName, this.accessory.context.device[this.uniq_id].pl_lo_spd);
|
|
97
|
+
else if (Number(value) < 50) {
|
|
119
98
|
this.platform.mqttHost.sendMessage(this.accessory.context.device[this.uniq_id].cmd_t, this.accessory.context.device[this.uniq_id].pl_lo_spd);
|
|
120
99
|
}
|
|
121
|
-
else if (Number(value) < 75) {
|
|
122
|
-
// debug('medium', this.accessory.displayName, this.accessory.context.device[this.uniq_id].pl_med_spd);
|
|
100
|
+
else if (Number(value) < 75) {
|
|
123
101
|
this.platform.mqttHost.sendMessage(this.accessory.context.device[this.uniq_id].cmd_t, this.accessory.context.device[this.uniq_id].pl_med_spd);
|
|
124
102
|
}
|
|
125
|
-
else {
|
|
126
|
-
// debug('high', this.accessory.displayName, this.accessory.context.device[this.uniq_id].pl_hi_spd);
|
|
103
|
+
else {
|
|
127
104
|
this.platform.mqttHost.sendMessage(this.accessory.context.device[this.uniq_id].cmd_t, this.accessory.context.device[this.uniq_id].pl_hi_spd);
|
|
128
105
|
}
|
|
129
106
|
callback(null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasmotaFanService.js","sourceRoot":"","sources":["../src/tasmotaFanService.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,OAAO,CAAC;AAEhC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAIrD,MAAM,KAAK,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"tasmotaFanService.js","sourceRoot":"","sources":["../src/tasmotaFanService.ts"],"names":[],"mappings":"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"}
|