homebridge-tasmota 0.0.124 → 0.0.128
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/CHANGELOG.md +35 -0
- package/DEVICES.md +29 -3
- package/README.md +9 -11
- package/config.schema.json +139 -18
- package/dist/TasmotaService.d.ts.map +1 -1
- package/dist/TasmotaService.js +3 -0
- package/dist/TasmotaService.js.map +1 -1
- package/dist/platform.d.ts +2 -0
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +81 -9
- package/dist/platform.js.map +1 -1
- package/dist/tasmotaBinarySensorService.d.ts.map +1 -1
- package/dist/tasmotaBinarySensorService.js +20 -0
- package/dist/tasmotaBinarySensorService.js.map +1 -1
- package/dist/tasmotaSensorService.d.ts.map +1 -1
- package/dist/tasmotaSensorService.js +6 -2
- package/dist/tasmotaSensorService.js.map +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,41 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. This project uses [Semantic Versioning](https://semver.org/).
|
|
4
4
|
|
|
5
|
+
## 0.1.0 (2021-02-04)
|
|
6
|
+
|
|
7
|
+
## [Version 0.1.0](https://github.com/northernman54/homebridge-tasmota/compare/v0.0.126...v0.1.0)
|
|
8
|
+
|
|
9
|
+
#### Changes
|
|
10
|
+
|
|
11
|
+
- Updated Tasmota settings gui in the Homebridge UI to support injecting configuration options into the MQTT Discovery message. This new setting `MQTT Discovery Message Injection` replaces the existing setting `override` with a format that works with Homebridge UI.
|
|
12
|
+
- Please note that you can use either injection or override but not both at the same time.
|
|
13
|
+
- When implementing this change, identified a latent defect that the existing override settings are removed by the Homebridge UI. If your using an override, do not use the Homebridge UI to edit your config.json.
|
|
14
|
+
- To ease moving from overide to injections, if debug logging is enabled the plugin will convert your override to an injection during inital startup of homebridge ( prior to the scan code being displayed. )
|
|
15
|
+
- Fix for issue #33, fahrenheit not being respected by homebridge
|
|
16
|
+
- Added a `tasmotaType` `fanFixed` as a simplified macro for a Sonoff iFan03 configuration. Updated DEVICES.md to reflect this.
|
|
17
|
+
- Added preliminary support for device_class contact sensors. Further details on device configuration to come.
|
|
18
|
+
|
|
19
|
+
## 0.0.126 (2021-12-28)
|
|
20
|
+
|
|
21
|
+
## [Version 0.0.124](https://github.com/northernman54/homebridge-tasmota/compare/v0.0.125...v0.0.126)
|
|
22
|
+
|
|
23
|
+
#### Changes
|
|
24
|
+
|
|
25
|
+
- Fix for incorrect temperature historical graphs #40
|
|
26
|
+
- Improved handling of OpenMQTTGateway devices and corrected system information service
|
|
27
|
+
- Fix for duplicated historical graphs from devices with the same name
|
|
28
|
+
|
|
29
|
+
## 0.0.125 (2021-12-12)
|
|
30
|
+
|
|
31
|
+
## [Version 0.0.124](https://github.com/northernman54/homebridge-tasmota/compare/v0.0.124...v0.0.125)
|
|
32
|
+
|
|
33
|
+
#### Changes
|
|
34
|
+
|
|
35
|
+
- Made changes to the new device discovery routine, and stopped the adding of accessories without any services
|
|
36
|
+
- Added a malformed accessory cleanup routine that is triggered on startup, any accessory without services will be removed from the Configuration. The accessories being removed would should up in the HomeApp as 'Not Supported'
|
|
37
|
+
- These changes were as a result of my work with OpenMQTTGateway and the accidental creation of several hundred malformed IBEACON accessories.
|
|
38
|
+
- Changes to the documentation of MCULED ( Was tweaking my Christmas Configuration )
|
|
39
|
+
|
|
5
40
|
## 0.0.124 (2021-10-28)
|
|
6
41
|
|
|
7
42
|
## [Version 0.0.124](https://github.com/northernman54/homebridge-tasmota/compare/v0.0.120...v0.0.124)
|
package/DEVICES.md
CHANGED
|
@@ -15,7 +15,23 @@ Backlog MqttHost mqtt.local; topic tasmota_%06X; setoption57 1; module 71; webbu
|
|
|
15
15
|
Backlog Rule1 on FanSpeed#Data do teleperiod break; rule1 1
|
|
16
16
|
```
|
|
17
17
|
|
|
18
|
-
* configuration override of discovery object to create a FAN
|
|
18
|
+
* configuration override of discovery object to create a FAN ( post version 0.1.0 )
|
|
19
|
+
|
|
20
|
+
`302F1B` is the Tasmota ID
|
|
21
|
+
|
|
22
|
+
`Message Topic to apply override to` - `302F1B_LI_2`
|
|
23
|
+
`Key:` - `tasmotaType`
|
|
24
|
+
`Value:` - `fanFixed`
|
|
25
|
+
|
|
26
|
+
`Message Topic to apply override to` - `302F1B_LI_3`
|
|
27
|
+
`Key:` - `tasmotaType`
|
|
28
|
+
`Value:` - `other`
|
|
29
|
+
|
|
30
|
+
`Message Topic to apply override to` - `302F1B_LI_4`
|
|
31
|
+
`Key:` - `tasmotaType`
|
|
32
|
+
`Value:` - `other`
|
|
33
|
+
|
|
34
|
+
* configuration override of discovery object to create a FAN ( pre version 0.1.0 )
|
|
19
35
|
|
|
20
36
|
`302F1B` is the Tasmota ID
|
|
21
37
|
|
|
@@ -45,6 +61,14 @@ Backlog Rule1 on FanSpeed#Data do teleperiod break; rule1 1
|
|
|
45
61
|
}
|
|
46
62
|
```
|
|
47
63
|
|
|
64
|
+
## Slave a FEIT Wifi Dimmer Wall Switch
|
|
65
|
+
|
|
66
|
+
Configure FEIT WiFi dimmer as per normal, then
|
|
67
|
+
|
|
68
|
+
```
|
|
69
|
+
backlog SetOption85 1; DevGroupName1 Master; DevGroupName2 Null; DevGroupShare 1,1; SetOption88 1
|
|
70
|
+
```
|
|
71
|
+
|
|
48
72
|
## [MCUIOT](docs/MCUIOT.md) BME280 Temperature Sensor
|
|
49
73
|
|
|
50
74
|
* Tasmota Configuration
|
|
@@ -131,7 +155,8 @@ SwitchMode 1
|
|
|
131
155
|
"override":
|
|
132
156
|
"869815_SW_1": { <--- This is the unique_id of the discovery message you want to override
|
|
133
157
|
"device_class": "motion", <--- This is the key and property you want to override
|
|
134
|
-
"name": "Motion Sensor" <--- You can overwrite an existing value
|
|
158
|
+
"name": "Motion Sensor", <--- You can overwrite an existing value
|
|
159
|
+
"tasmotaType": "binary_sensor"
|
|
135
160
|
}
|
|
136
161
|
```
|
|
137
162
|
|
|
@@ -155,7 +180,8 @@ SwitchMode 1
|
|
|
155
180
|
"override":
|
|
156
181
|
"869815_SW_1": { <--- This is the unique_id of the discovery message you want to override
|
|
157
182
|
"device_class": "motion", <--- This is the key and property you want to override
|
|
158
|
-
"name": "Motion Sensor" <--- You can overwrite an existing value
|
|
183
|
+
"name": "Motion Sensor", <--- You can overwrite an existing value
|
|
184
|
+
"tasmotaType": "binary_sensor"
|
|
159
185
|
}
|
|
160
186
|
```
|
|
161
187
|
|
package/README.md
CHANGED
|
@@ -86,17 +86,7 @@ SetOption19 0
|
|
|
86
86
|
|
|
87
87
|
## Discovery Overrides
|
|
88
88
|
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
If you override the tasmotaType with the value of `fan` a fan device will be created. Tested with a Tuya Dimmer. The first field `EF159D_LI_1` is the unique_id of the device.
|
|
92
|
-
|
|
93
|
-
```
|
|
94
|
-
"override": {
|
|
95
|
-
"EF159D_LI_1": {
|
|
96
|
-
"tasmotaType": "fan"
|
|
97
|
-
}
|
|
98
|
-
}
|
|
99
|
-
```
|
|
89
|
+
Please see[DEVICES.md](DEVICES.md) for examples.
|
|
100
90
|
|
|
101
91
|
## Technical Details
|
|
102
92
|
|
|
@@ -104,6 +94,14 @@ Under the covers this plugin leverages the Home Assistant Auto Discovery Functio
|
|
|
104
94
|
|
|
105
95
|
## Known issues
|
|
106
96
|
|
|
97
|
+
### RGB Lights and Tasmota Versions greater 9.5.0
|
|
98
|
+
|
|
99
|
+
Identified that with Tasmota versions greater than 9.5.0 that ability to control RGB light colours is not working.
|
|
100
|
+
|
|
101
|
+
### Override settings removed from config.json by Homebridge UI
|
|
102
|
+
|
|
103
|
+
Identified that the Homebridge UI removes the config.json setting `override`. If your using the `override` setting don't use Homebridge UI or switch to the new setting `injections`.
|
|
104
|
+
|
|
107
105
|
### Accessory Names Doubled
|
|
108
106
|
|
|
109
107
|
Accessory names are doubled with Tasmota version 8.1.3 to 8.4 - This is an issue with Tasmota firmware and is being tracked [here](https://github.com/arendst/Tasmota/issues/8995). As a workaround downgrade to Tasmota version 8.1
|
package/config.schema.json
CHANGED
|
@@ -2,12 +2,11 @@
|
|
|
2
2
|
"pluginAlias": "Tasmota",
|
|
3
3
|
"pluginType": "platform",
|
|
4
4
|
"singular": true,
|
|
5
|
-
"headerDisplay": "
|
|
5
|
+
"headerDisplay": "Automatic discovery and creation of Tasmota devices in your Homebridge environment. To enable discovery please ensure that your Tasmota device has HASS Auto Discovey enabled ( setOption19 1 ).",
|
|
6
6
|
"footerDisplay": "For further details please see the [README](https://github.com/NorthernMan54/homebridge-tasmota/blob/master/README.md). To manage your Tasmota devices [click here](http://tasui.shantur.com/#/findDevices)",
|
|
7
7
|
"schema": {
|
|
8
8
|
"type": "object",
|
|
9
9
|
"properties": {
|
|
10
|
-
|
|
11
10
|
"name": {
|
|
12
11
|
"title": "Name",
|
|
13
12
|
"type": "string",
|
|
@@ -26,63 +25,69 @@
|
|
|
26
25
|
"title": "Username",
|
|
27
26
|
"type": "string",
|
|
28
27
|
"required": false,
|
|
29
|
-
"
|
|
28
|
+
"placeholder": "",
|
|
30
29
|
"description": "This is the Username for your MQTT Broker."
|
|
31
30
|
},
|
|
32
31
|
"mqttPassword": {
|
|
33
32
|
"title": "Password",
|
|
34
33
|
"type": "string",
|
|
35
34
|
"required": false,
|
|
36
|
-
"
|
|
35
|
+
"placeholder": "",
|
|
37
36
|
"description": "This is the Password for your MQTT Broker."
|
|
38
37
|
},
|
|
39
38
|
"cleanup": {
|
|
40
39
|
"title": "Disconnected Device Cleanup Timing",
|
|
41
40
|
"type": "number",
|
|
42
41
|
"required": false,
|
|
43
|
-
"
|
|
42
|
+
"placeholder": 24,
|
|
44
43
|
"description": "Cleanup of devices no longer connected too or responding on the network. Time is in hours, defaults to 1 Day."
|
|
45
44
|
},
|
|
46
45
|
"debug": {
|
|
47
46
|
"title": "Debug Logging",
|
|
48
47
|
"type": "boolean",
|
|
49
48
|
"required": false,
|
|
50
|
-
"
|
|
49
|
+
"placeholder": false,
|
|
51
50
|
"description": "Enable verbose DEBUG logging."
|
|
52
51
|
},
|
|
53
52
|
"history": {
|
|
54
|
-
"title": "
|
|
53
|
+
"title": "Enable support for sensor data history logging",
|
|
55
54
|
"type": "boolean",
|
|
56
55
|
"required": false,
|
|
57
|
-
"
|
|
58
|
-
"description": "Enable logging of historical sensor information."
|
|
56
|
+
"placeholder": false,
|
|
57
|
+
"description": "Enable logging and graphing of historical sensor information. Must use a HomeKit app that supports data graphing to see charts."
|
|
59
58
|
},
|
|
60
59
|
"historyInterval": {
|
|
61
60
|
"title": "Update interval for historical data.",
|
|
62
61
|
"type": "number",
|
|
63
62
|
"required": false,
|
|
64
|
-
"
|
|
65
|
-
"description": "Update interval for the logging of history data. Time is in minutes, defaults to 10 minutes."
|
|
63
|
+
"placeholder": 10,
|
|
64
|
+
"description": "Update interval for the logging of history data. Time is in minutes, defaults to 10 minutes. ( Development testing only. )",
|
|
65
|
+
"condition": {
|
|
66
|
+
"functionBody": "return false;"
|
|
67
|
+
}
|
|
66
68
|
},
|
|
67
69
|
"filter": {
|
|
68
|
-
"title": "Filter device discovery topic",
|
|
70
|
+
"title": "Filter device discovery topic ( Deprecated, please use filter allow )",
|
|
69
71
|
"type": "string",
|
|
70
72
|
"required": false,
|
|
71
|
-
"
|
|
72
|
-
"description": "Regular expression to filter discovery topic messages against. ie \"F52066|00F861\" limit discovery to these two devices."
|
|
73
|
+
"placeholder": "",
|
|
74
|
+
"description": "Regular expression to filter discovery topic messages against. ie \"F52066|00F861\" limit discovery to these two devices.",
|
|
75
|
+
"condition": {
|
|
76
|
+
"functionBody": "return model.filter != null;"
|
|
77
|
+
}
|
|
73
78
|
},
|
|
74
79
|
"filterAllow": {
|
|
75
|
-
"title": "List
|
|
80
|
+
"title": "List discovery message topics allowed from discovery",
|
|
76
81
|
"type": "array",
|
|
77
82
|
"required": false,
|
|
78
|
-
"
|
|
83
|
+
"placeholder": "",
|
|
79
84
|
"description": "A list of regex's specifying allowed disocvery topics. If this is non-empty all non-specified topics will be blocked.",
|
|
80
85
|
"items": {
|
|
81
86
|
"type": "string"
|
|
82
87
|
}
|
|
83
88
|
},
|
|
84
89
|
"filterDeny": {
|
|
85
|
-
"title": "List
|
|
90
|
+
"title": "List discovery message topics removed from discovery",
|
|
86
91
|
"type": "array",
|
|
87
92
|
"required": false,
|
|
88
93
|
"default": "",
|
|
@@ -97,7 +102,123 @@
|
|
|
97
102
|
"required": false,
|
|
98
103
|
"default": false,
|
|
99
104
|
"description": "Enable ability to select RGB light effects. Requires adding an additional accessory/UI widget for each RGB light."
|
|
105
|
+
},
|
|
106
|
+
"injections": {
|
|
107
|
+
"required": false,
|
|
108
|
+
"type": "array",
|
|
109
|
+
"title": " ",
|
|
110
|
+
"buttonText": "Add additional topic to inject or overide.",
|
|
111
|
+
"items": {
|
|
112
|
+
"type": "object",
|
|
113
|
+
"properties": {
|
|
114
|
+
"topic": {
|
|
115
|
+
"title": "Message Topic to apply override to.",
|
|
116
|
+
"type": "string",
|
|
117
|
+
"description": "Unique portion of the discovery topic. ie from this topic `homeassistant/binary_sensor/00FF8D_BTN_1/config` `00FF8D_BTN_1` is unique"
|
|
118
|
+
},
|
|
119
|
+
"injection": {
|
|
120
|
+
"type": "array",
|
|
121
|
+
"default": [],
|
|
122
|
+
"buttonText": "Add additional keys and values.",
|
|
123
|
+
"title": "Key and Value to inject/over write in original discovery message",
|
|
124
|
+
"items": {
|
|
125
|
+
"type": "object",
|
|
126
|
+
"properties": {
|
|
127
|
+
"key": {
|
|
128
|
+
"title": "Key to apply override to",
|
|
129
|
+
"type": "string",
|
|
130
|
+
"required": true
|
|
131
|
+
},
|
|
132
|
+
"value": {
|
|
133
|
+
"title": "Replacement value",
|
|
134
|
+
"type": "string",
|
|
135
|
+
"required": true
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
}
|
|
100
142
|
}
|
|
101
143
|
}
|
|
102
|
-
}
|
|
144
|
+
},
|
|
145
|
+
"form": [
|
|
146
|
+
"name",
|
|
147
|
+
"mqttHost",
|
|
148
|
+
{
|
|
149
|
+
"type": "fieldset",
|
|
150
|
+
"expandable": true,
|
|
151
|
+
"title": "Optional Settings",
|
|
152
|
+
"items": [{
|
|
153
|
+
"type": "flex",
|
|
154
|
+
"flex-flow": "row wrap",
|
|
155
|
+
"items": [
|
|
156
|
+
"mqttUsername",
|
|
157
|
+
"mqttPassword"
|
|
158
|
+
]
|
|
159
|
+
},
|
|
160
|
+
"cleanup",
|
|
161
|
+
"debug",
|
|
162
|
+
"history",
|
|
163
|
+
"historyInterval",
|
|
164
|
+
"effects"
|
|
165
|
+
]
|
|
166
|
+
},
|
|
167
|
+
{
|
|
168
|
+
"type": "fieldset",
|
|
169
|
+
"expandable": true,
|
|
170
|
+
"title": "Device Discovery Filtering",
|
|
171
|
+
"description": "Control which devices are discovered and included with Homebridge.",
|
|
172
|
+
"items": [{
|
|
173
|
+
"key": "filterAllow",
|
|
174
|
+
"type": "array",
|
|
175
|
+
"required": false,
|
|
176
|
+
"items": {
|
|
177
|
+
"title": "Topic regex to allow",
|
|
178
|
+
"description": "A list of regex's specifying allowed disocvery topics. If this is non-empty all non-specified topics will be blocked.",
|
|
179
|
+
"type": "string"
|
|
180
|
+
}
|
|
181
|
+
},
|
|
182
|
+
{
|
|
183
|
+
"key": "filterDeny",
|
|
184
|
+
"type": "array",
|
|
185
|
+
"required": false,
|
|
186
|
+
"items": {
|
|
187
|
+
"title": "Topic regex to filter/deny",
|
|
188
|
+
"description": "A list of regex's specifying topics to skip. Any matching mqtt topic will always be skipped, even if it matches a filterAllow rule.",
|
|
189
|
+
"type": "string"
|
|
190
|
+
}
|
|
191
|
+
},
|
|
192
|
+
"filter"
|
|
193
|
+
]
|
|
194
|
+
},
|
|
195
|
+
{
|
|
196
|
+
"type": "fieldset",
|
|
197
|
+
"expandable": true,
|
|
198
|
+
"title": "MQTT Discovery Message Injection",
|
|
199
|
+
"description": "Ability to inject/over write portions of a MQTT Discovery message.",
|
|
200
|
+
"items": [{
|
|
201
|
+
"key": "injections",
|
|
202
|
+
"type": "array",
|
|
203
|
+
|
|
204
|
+
"items": [
|
|
205
|
+
"injections[].topic",
|
|
206
|
+
{
|
|
207
|
+
"key": "injections[].injection",
|
|
208
|
+
"type": "array",
|
|
209
|
+
"items": [{
|
|
210
|
+
"type": "flex",
|
|
211
|
+
"flex-flow": "row wrap",
|
|
212
|
+
"items": [
|
|
213
|
+
"injections[].injection[].key",
|
|
214
|
+
"injections[].injection[].value"
|
|
215
|
+
]
|
|
216
|
+
}]
|
|
217
|
+
}
|
|
218
|
+
]
|
|
219
|
+
},
|
|
220
|
+
"filter"
|
|
221
|
+
]
|
|
222
|
+
}
|
|
223
|
+
]
|
|
103
224
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TasmotaService.d.ts","sourceRoot":"","sources":["../src/TasmotaService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAiC,MAAM,YAAY,CAAC;AACvG,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"TasmotaService.d.ts","sourceRoot":"","sources":["../src/TasmotaService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAiC,MAAM,YAAY,CAAC;AACvG,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAQ7C;;;;GAIG;AAEH,UAAU,YAAY;IACpB,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,GAAG,CAAA;CAC7B;AAED,qBAAa,cAAc;aAYP,QAAQ,EAAE,eAAe;aACzB,SAAS,EAAE,iBAAiB;IAC5C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM;IAb7B,OAAO,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,cAAc,EAAE,cAAc,CAAC;IACzC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,YAAY,CAAC;IAC9B,qBAAqB,EAAE,YAAY,CAAC;IAC3C,SAAS,CAAC,oBAAoB,MAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,mBAAmB,MAAC;IAC3B,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC;gBAGL,QAAQ,EAAE,eAAe,EACzB,SAAS,EAAE,iBAAiB,EACzB,OAAO,EAAE,MAAM;IA6BpC,cAAc;IAiBd,YAAY;IAmBZ,6BAA6B,CAAC,YAAY,EAAE,MAAM;IAkBlD,OAAO;IASP,YAAY,CAAC,KAAK,KAAA,EAAE,OAAO,KAAA;IA+C3B;;;OAGG;IAEH,kBAAkB,CAAC,KAAK,KAAA,EAAE,OAAO,KAAA;IAejC,KAAK,CAAC,MAAM,KAAA,EAAE,MAAM,KAAA;IAMpB,UAAU,CAAC,aAAa,KAAA,EAAE,KAAK,KAAA;CAuBhC;AAMD,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAehE"}
|
package/dist/TasmotaService.js
CHANGED
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.isTrue = exports.TasmotaService = void 0;
|
|
7
7
|
const nunjucks_1 = __importDefault(require("nunjucks"));
|
|
8
|
+
const os_1 = __importDefault(require("os"));
|
|
8
9
|
const debug_1 = __importDefault(require("debug"));
|
|
9
10
|
const debug = debug_1.default('Tasmota:Service');
|
|
10
11
|
class TasmotaService {
|
|
@@ -37,10 +38,12 @@ class TasmotaService {
|
|
|
37
38
|
// Enable historical logging
|
|
38
39
|
var _a, _b;
|
|
39
40
|
if (this.platform.config.history && this.fakegato && !((_a = this.accessory.context.fakegatoService) === null || _a === void 0 ? void 0 : _a.addEntry)) {
|
|
41
|
+
var hostname = os_1.default.hostname().split(".")[0];
|
|
40
42
|
this.accessory.context.fakegatoService = new this.platform.FakeGatoHistoryService('custom', this.accessory, {
|
|
41
43
|
storage: 'fs',
|
|
42
44
|
minutes: (_b = this.platform.config.historyInterval) !== null && _b !== void 0 ? _b : 10,
|
|
43
45
|
log: this.platform.log,
|
|
46
|
+
filename: hostname + "_" + this.uniq_id + '_persist.json',
|
|
44
47
|
});
|
|
45
48
|
this.platform.log.debug('Creating fakegato service for %s %s', this.accessory.context.device[this.uniq_id].stat_t, this.accessory.context.device[this.uniq_id].name, this.accessory.context.device[this.uniq_id].uniq_id);
|
|
46
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TasmotaService.js","sourceRoot":"","sources":["../src/TasmotaService.ts"],"names":[],"mappings":";;;;;;AAEA,wDAAgC;
|
|
1
|
+
{"version":3,"file":"TasmotaService.js","sourceRoot":"","sources":["../src/TasmotaService.ts"],"names":[],"mappings":"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"}
|
package/dist/platform.d.ts
CHANGED
|
@@ -12,6 +12,7 @@ export declare class tasmotaPlatform implements DynamicPlatformPlugin {
|
|
|
12
12
|
readonly Service: typeof Service;
|
|
13
13
|
readonly Characteristic: typeof Characteristic;
|
|
14
14
|
readonly accessories: PlatformAccessory[];
|
|
15
|
+
private readonly defunctAccessories;
|
|
15
16
|
readonly services: tasmotaGarageService[] | tasmotaSwitchService[] | tasmotaLightService[] | tasmotaSensorService[] | tasmotaBinarySensorService[] | tasmotaFanService[];
|
|
16
17
|
private discoveryTopicMap;
|
|
17
18
|
private CustomCharacteristic;
|
|
@@ -38,5 +39,6 @@ export declare class tasmotaPlatform implements DynamicPlatformPlugin {
|
|
|
38
39
|
serviceCleanup(uniq_id: string, existingAccessory: PlatformAccessory): void;
|
|
39
40
|
autoCleanup(accessory: PlatformAccessory): any;
|
|
40
41
|
accessoryCleanup(existingAccessory: PlatformAccessory): void;
|
|
42
|
+
cleanupDefunctAccessories(): void;
|
|
41
43
|
}
|
|
42
44
|
//# sourceMappingURL=platform.d.ts.map
|
package/dist/platform.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EAAE,qBAAqB,EAAE,MAAM,EAAE,iBAAiB,EAAkB,OAAO,EAAE,cAAc,EAE/F,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAgB1E,qBAAa,eAAgB,YAAW,qBAAqB;
|
|
1
|
+
{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EAAE,qBAAqB,EAAE,MAAM,EAAE,iBAAiB,EAAkB,OAAO,EAAE,cAAc,EAE/F,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAgB1E,qBAAa,eAAgB,YAAW,qBAAqB;aAuBzC,GAAG,EAAE,MAAM;aACX,MAAM,EAAE,GAAG;aACX,GAAG,EAAE,GAAG;IAxB1B,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAwB;IAC/D,SAAgB,cAAc,EAAE,OAAO,cAAc,CAA+B;IAGpF,SAAgB,WAAW,EAAE,iBAAiB,EAAE,CAAM;IACtD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA2B;IAC9D,SAAgB,QAAQ,EAAE,oBAAoB,EAAE,GAAG,oBAAoB,EAAE,GAAG,mBAAmB,EAAE,GAAG,oBAAoB,EAAE,GACxH,0BAA0B,EAAE,GAAG,iBAAiB,EAAE,CAAM;IAE1D,OAAO,CAAC,iBAAiB,CAA2B;IACpD,OAAO,CAAC,oBAAoB,CAAC;IAI7B,OAAO,CAAC,OAAO,CAAM;IACrB,OAAO,CAAC,QAAQ,CAAM;IACtB,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,KAAK,CAAM;IACZ,sBAAsB,MAAC;IACvB,UAAU,SAAO;gBAGN,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,GAAG,EACX,GAAG,EAAE,GAAG;IA2E1B;;;OAGG;IACH,kBAAkB,CAAC,SAAS,EAAE,iBAAiB;IAmB/C,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,OAAO;IAqC7G;;;;OAIG;IACH,eAAe;IA+Mf,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG;IA6B9C,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB;IAqCpE,WAAW,CAAC,SAAS,EAAE,iBAAiB;IAsBxC,gBAAgB,CAAC,iBAAiB,EAAE,iBAAiB;IAoCrD,yBAAyB;CAO1B"}
|
package/dist/platform.js
CHANGED
|
@@ -26,6 +26,7 @@ class tasmotaPlatform {
|
|
|
26
26
|
this.Characteristic = this.api.hap.Characteristic;
|
|
27
27
|
// this is used to track restored cached accessories
|
|
28
28
|
this.accessories = [];
|
|
29
|
+
this.defunctAccessories = [];
|
|
29
30
|
this.services = [];
|
|
30
31
|
this.discoveryTopicMap = [];
|
|
31
32
|
this.timeouts = {};
|
|
@@ -47,6 +48,20 @@ class tasmotaPlatform {
|
|
|
47
48
|
// this.log("DEBUG-2", namespaces);
|
|
48
49
|
debug_2.default.enable(namespaces);
|
|
49
50
|
}
|
|
51
|
+
if (this.config.override) {
|
|
52
|
+
const injections = [];
|
|
53
|
+
Object.keys(this.config.override).forEach((topic) => {
|
|
54
|
+
const inject = [];
|
|
55
|
+
Object.entries(this.config.override[topic]).forEach(([key, value]) => {
|
|
56
|
+
// debug("topic: %s, key: %s, value: %s", topic, key, value);
|
|
57
|
+
const injection = { key: key, value: value };
|
|
58
|
+
inject.push(injection);
|
|
59
|
+
});
|
|
60
|
+
injections.push({ topic: topic, injection: inject });
|
|
61
|
+
});
|
|
62
|
+
debug('This is your override reformated to injections.');
|
|
63
|
+
debug('"injections": %s\n', JSON.stringify(injections, null, 2));
|
|
64
|
+
}
|
|
50
65
|
/* eslint-disable */
|
|
51
66
|
this.CustomCharacteristic = require('./lib/CustomCharacteristics')(this.Service, this.Characteristic);
|
|
52
67
|
// When this event is fired it means Homebridge has restored all cached accessories from disk.
|
|
@@ -56,6 +71,10 @@ class tasmotaPlatform {
|
|
|
56
71
|
this.api.on('didFinishLaunching', () => {
|
|
57
72
|
log.debug('Executed didFinishLaunching callback');
|
|
58
73
|
// run the method to discover / register your devices as accessories
|
|
74
|
+
debug('%d accessories for cleanup', this.defunctAccessories.length);
|
|
75
|
+
if (this.defunctAccessories.length > 0) {
|
|
76
|
+
this.cleanupDefunctAccessories();
|
|
77
|
+
}
|
|
59
78
|
this.discoverDevices();
|
|
60
79
|
if (this.config.history) {
|
|
61
80
|
this.FakeGatoHistoryService = fakegato_history_1.default(this.api);
|
|
@@ -77,10 +96,17 @@ class tasmotaPlatform {
|
|
|
77
96
|
*/
|
|
78
97
|
configureAccessory(accessory) {
|
|
79
98
|
this.log.info('Loading accessory from cache:', accessory.displayName);
|
|
80
|
-
|
|
81
|
-
accessory.
|
|
82
|
-
|
|
83
|
-
|
|
99
|
+
debug('Load: "%s" %d services', accessory.displayName, accessory.services.length);
|
|
100
|
+
if (accessory.services.length > 1) {
|
|
101
|
+
// debug('context', accessory.context);
|
|
102
|
+
accessory.context.timeout = this.autoCleanup(accessory);
|
|
103
|
+
// add the restored accessory to the accessories cache so we can track if it has already been registered
|
|
104
|
+
this.accessories.push(accessory);
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
this.log.warn('Warning: Removing incomplete accessory definition from cache:', accessory.displayName);
|
|
108
|
+
this.defunctAccessories.push(accessory);
|
|
109
|
+
}
|
|
84
110
|
}
|
|
85
111
|
/* Check the topic against the configuration's filterList.
|
|
86
112
|
*/
|
|
@@ -215,6 +241,7 @@ class tasmotaPlatform {
|
|
|
215
241
|
this.discoveryTopicMap[topic] = { topic: topic, type: 'Service', uniq_id: uniq_id, uuid: uuid };
|
|
216
242
|
break;
|
|
217
243
|
case 'fan':
|
|
244
|
+
case 'fanFixed':
|
|
218
245
|
this.services[uniq_id] = new tasmotaFanService_1.tasmotaFanService(this, existingAccessory, uniq_id);
|
|
219
246
|
this.discoveryTopicMap[topic] = { topic: topic, type: 'Service', uniq_id: uniq_id, uuid: uuid };
|
|
220
247
|
break;
|
|
@@ -234,7 +261,7 @@ class tasmotaPlatform {
|
|
|
234
261
|
this.log.warn('Warning: Unhandled Tasmota device type', message.tasmotaType);
|
|
235
262
|
}
|
|
236
263
|
}
|
|
237
|
-
debug('discoveryDevices - this.api.updatePlatformAccessories');
|
|
264
|
+
debug('discoveryDevices - this.api.updatePlatformAccessories - %d', existingAccessory.services.length);
|
|
238
265
|
this.api.updatePlatformAccessories([existingAccessory]);
|
|
239
266
|
}
|
|
240
267
|
else {
|
|
@@ -283,9 +310,14 @@ class tasmotaPlatform {
|
|
|
283
310
|
default:
|
|
284
311
|
this.log.warn('Warning: Unhandled Tasmota device type', message.tasmotaType);
|
|
285
312
|
}
|
|
286
|
-
debug('discovery devices - this.api.registerPlatformAccessories');
|
|
287
|
-
|
|
288
|
-
|
|
313
|
+
debug('discovery devices - this.api.registerPlatformAccessories - %d', accessory.services.length);
|
|
314
|
+
if (accessory.services.length > 1) {
|
|
315
|
+
this.api.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [accessory]);
|
|
316
|
+
this.accessories.push(accessory);
|
|
317
|
+
}
|
|
318
|
+
else {
|
|
319
|
+
this.log.warn('Warning: incomplete HASS Discovery message and device definition', topic, config.name);
|
|
320
|
+
}
|
|
289
321
|
}
|
|
290
322
|
if (this.services[uniq_id] && this.services[uniq_id].service && this.services[uniq_id].service.getCharacteristic(this.Characteristic.ConfiguredName).listenerCount('set') < 1) {
|
|
291
323
|
(this.services[uniq_id].service.getCharacteristic(this.Characteristic.ConfiguredName) ||
|
|
@@ -304,7 +336,7 @@ class tasmotaPlatform {
|
|
|
304
336
|
}
|
|
305
337
|
discoveryOveride(uniq_id, message) {
|
|
306
338
|
/* eslint-disable */
|
|
307
|
-
if (this.config.override) {
|
|
339
|
+
if (this.config.override) { // pre version 0.1.0 override configuration
|
|
308
340
|
// debug('override', this.config.override);
|
|
309
341
|
var overrides = [];
|
|
310
342
|
for (const [key, value] of Object.entries(this.config.override)) {
|
|
@@ -318,6 +350,16 @@ class tasmotaPlatform {
|
|
|
318
350
|
return normalizeMessage(merged);
|
|
319
351
|
}
|
|
320
352
|
}
|
|
353
|
+
else if (this.config.injections) {
|
|
354
|
+
// debug('injections', this.config.injections);
|
|
355
|
+
this.config.injections.forEach(overide => {
|
|
356
|
+
if (overide.topic === uniq_id) {
|
|
357
|
+
overide.injection.forEach(inject => {
|
|
358
|
+
message[inject.key] = inject.value;
|
|
359
|
+
});
|
|
360
|
+
}
|
|
361
|
+
});
|
|
362
|
+
}
|
|
321
363
|
return normalizeMessage(message);
|
|
322
364
|
}
|
|
323
365
|
serviceCleanup(uniq_id, existingAccessory) {
|
|
@@ -404,6 +446,13 @@ class tasmotaPlatform {
|
|
|
404
446
|
this.api.unregisterPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [existingAccessory]);
|
|
405
447
|
// debug('this.timeouts - after', this.timeouts);
|
|
406
448
|
}
|
|
449
|
+
// Remove defunct accessories discovered during startup
|
|
450
|
+
cleanupDefunctAccessories() {
|
|
451
|
+
this.defunctAccessories.forEach(accessory => {
|
|
452
|
+
debug('Removing', accessory.displayName);
|
|
453
|
+
this.accessoryCleanup(accessory);
|
|
454
|
+
});
|
|
455
|
+
}
|
|
407
456
|
}
|
|
408
457
|
exports.tasmotaPlatform = tasmotaPlatform;
|
|
409
458
|
function setConfiguredName(value, callback) {
|
|
@@ -416,6 +465,29 @@ function setConfiguredName(value, callback) {
|
|
|
416
465
|
}
|
|
417
466
|
/* The various Tasmota firmware's have a slightly different flavors of the message. */
|
|
418
467
|
function normalizeMessage(message) {
|
|
468
|
+
switch (message.tasmotaType) {
|
|
469
|
+
case 'fanFixed': // SonOff iFan03
|
|
470
|
+
message = {
|
|
471
|
+
...message, ...{
|
|
472
|
+
"payload_high_speed": "3",
|
|
473
|
+
"payload_medium_speed": "2",
|
|
474
|
+
"payload_low_speed": "1",
|
|
475
|
+
"pl_off": "0",
|
|
476
|
+
"pl_on": "1",
|
|
477
|
+
"val_tpl": "{% if value_json.FanSpeed == 0 -%}0{%- elif value_json.FanSpeed > 0 -%}1{%- endif %}",
|
|
478
|
+
"bri_val_tpl": "{{value_json.FanSpeed*1/3*100}}",
|
|
479
|
+
"speeds": [
|
|
480
|
+
"off",
|
|
481
|
+
"low",
|
|
482
|
+
"medium",
|
|
483
|
+
"high"
|
|
484
|
+
]
|
|
485
|
+
}
|
|
486
|
+
};
|
|
487
|
+
message.cmd_t = message.cmd_t.replace("POWER2", "FanSpeed");
|
|
488
|
+
break;
|
|
489
|
+
default:
|
|
490
|
+
}
|
|
419
491
|
const translation = {
|
|
420
492
|
// from: --> 'to'
|
|
421
493
|
unique_id: 'uniq_id',
|
package/dist/platform.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasmotaBinarySensorService.d.ts","sourceRoot":"","sources":["../src/tasmotaBinarySensorService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAuC,MAAM,YAAY,CAAC;AAC7F,OAAO,EAAE,cAAc,EAAU,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAK7C;;;;GAIG;AAEH,qBAAa,0BAA2B,SAAQ,cAAc;aAG1C,QAAQ,EAAE,eAAe;aACzB,SAAS,EAAE,iBAAiB;IAC5C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM;gBAFlB,QAAQ,EAAE,eAAe,EACzB,SAAS,EAAE,iBAAiB,EACzB,OAAO,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"tasmotaBinarySensorService.d.ts","sourceRoot":"","sources":["../src/tasmotaBinarySensorService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAuC,MAAM,YAAY,CAAC;AAC7F,OAAO,EAAE,cAAc,EAAU,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAK7C;;;;GAIG;AAEH,qBAAa,0BAA2B,SAAQ,cAAc;aAG1C,QAAQ,EAAE,eAAe;aACzB,SAAS,EAAE,iBAAiB;IAC5C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM;gBAFlB,QAAQ,EAAE,eAAe,EACzB,SAAS,EAAE,iBAAiB,EACzB,OAAO,EAAE,MAAM;IAqGpC,YAAY,CAAC,KAAK,KAAA,EAAE,OAAO,KAAA;CA2F5B"}
|
|
@@ -45,6 +45,19 @@ class tasmotaBinarySensorService extends TasmotaService_1.TasmotaService {
|
|
|
45
45
|
debug('adding', this.fakegato);
|
|
46
46
|
}
|
|
47
47
|
break;
|
|
48
|
+
case 'contact':
|
|
49
|
+
this.platform.log.debug('Creating %s binary sensor %s', accessory.context.device[this.uniq_id].dev_cla, accessory.context.device[this.uniq_id].name);
|
|
50
|
+
this.service = this.accessory.getService(this.uuid) || this.accessory.addService(this.platform.Service.ContactSensor, accessory.context.device[this.uniq_id].name, this.uuid);
|
|
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.CustomCharacteristic.LastActivation);
|
|
58
|
+
debug('adding', this.fakegato);
|
|
59
|
+
}
|
|
60
|
+
break;
|
|
48
61
|
case 'door':
|
|
49
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);
|
|
50
63
|
this.service = this.accessory.getService(this.uuid) || this.accessory.addService(this.platform.Service.ContactSensor, accessory.context.device[this.uniq_id].name, this.uuid);
|
|
@@ -114,6 +127,12 @@ class tasmotaBinarySensorService extends TasmotaService_1.TasmotaService {
|
|
|
114
127
|
// boolean
|
|
115
128
|
value = (this.accessory.context.device[this.uniq_id].pl_on === value ? true : false);
|
|
116
129
|
break;
|
|
130
|
+
case 'contact':
|
|
131
|
+
// boolean
|
|
132
|
+
value = (this.accessory.context.device[this.uniq_id].pl_on === value ?
|
|
133
|
+
this.platform.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED :
|
|
134
|
+
this.platform.Characteristic.ContactSensorState.CONTACT_DETECTED);
|
|
135
|
+
break;
|
|
117
136
|
}
|
|
118
137
|
if (this.characteristic.value !== value) {
|
|
119
138
|
this.platform.log.info('Updating \'%s\' binary sensor to %s', this.service.displayName, value);
|
|
@@ -126,6 +145,7 @@ class tasmotaBinarySensorService extends TasmotaService_1.TasmotaService {
|
|
|
126
145
|
/* eslint-disable */
|
|
127
146
|
case 'moisture':
|
|
128
147
|
case 'motion':
|
|
148
|
+
case 'contact':
|
|
129
149
|
if (this.platform.config.history) {
|
|
130
150
|
const now = Math.round(new Date().valueOf() / 1000);
|
|
131
151
|
const lastActivation = now - this.accessory.context.fakegatoService.getInitialTime();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasmotaBinarySensorService.js","sourceRoot":"","sources":["../src/tasmotaBinarySensorService.ts"],"names":[],"mappings":";;;;;;AACA,qDAA0D;AAG1D,kDAAgC;AAChC,MAAM,KAAK,GAAG,eAAW,CAAC,sBAAsB,CAAC,CAAC;AAElD;;;;GAIG;AAEH,MAAa,0BAA2B,SAAQ,+BAAc;IAE5D,YACkB,QAAyB,EACzB,SAA4B,EACzB,OAAe;QAGlC,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QALpB,aAAQ,GAAR,QAAQ,CAAiB;QACzB,cAAS,GAAT,SAAS,CAAmB;QACzB,YAAO,GAAP,OAAO,CAAQ;QAIlC,QAAQ,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE;YACtD,KAAK,UAAU;gBACb,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EACpG,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;gBAE/C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,EAClH,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAE1D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;oBAC7B,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;iBAChH;gBACD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;gBACtG,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE;oBAChC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;oBAC1B,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;oBAC9E,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;iBAClF;gBACD,MAAM;YACR,KAAK,QAAQ;gBACX,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EACpG,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;gBAE/C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,EACjH,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAE1D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;oBAC7B,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;iBAChH;gBACD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;gBAClG,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE;oBAChC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;oBACzB,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;oBACjF,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAChC;gBACD,MAAM;YACR,KAAK,MAAM;gBACT,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EACpG,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;gBAE/C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,EAClH,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAE1D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;oBAC7B,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;iBAChH;gBACD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;gBACtG,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE;oBAChC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;oBACzB,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;oBACjF,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAChC;gBACD,MAAM;YACR,KAAK,UAAU;gBACb,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EACpG,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;gBAE/C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,EAC/G,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAE1D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;oBAC7B,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;iBAChH;gBACD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;gBAChG,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE;oBAChC,4BAA4B;oBAC5B,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;oBACjF,kCAAkC;iBACnC;gBACD,MAAM;YACR;gBACE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,+CAA+C,EACrE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;SACrD;QAED,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,IAAI,CAAC,YAAY,EAAE,CAAC;IAEtB,CAAC;IAED,YAAY,CAAC,KAAK,EAAE,OAAO;;QACzB,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEzC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE3E,IAAI;YAEF,uCAAuC;YACvC,yEAAyE;YACzE,wCAAwC;YACxC,IAAI,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;YAE/B,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE;gBACvD,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;aAClG;YACD,uCAAuC;YACvC,4CAA4C;YAE5C,iDAAiD;YAEjD,QAAQ,IAAI,CAAC,YAAY,EAAE;gBACzB,KAAK,UAAU;oBACb,MAAM;gBACR,KAAK,UAAU;oBACb,QAAQ;oBACR,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;oBAC5E,KAAK,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;wBACpE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;wBACzD,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;oBAC/D,MAAM;gBACR,KAAK,MAAM;oBACT,IAAI,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,KAAK,SAAS,EAAE;wBAC1E,KAAK,GAAG,uBAAM,CAAC,KAAK,CAAC,CAAC;qBACvB;oBACD,KAAK,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;wBACpE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,CAAC;wBACtE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;oBACpE,MAAM;gBACR,KAAK,QAAQ;oBACX,UAAU;oBACV,KAAK,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;oBACrF,MAAM;aACT;YAED,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,KAAK,KAAK,EAAE;gBAEvC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,qCAAqC,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;gBAC/F,IAAI,WAAW,CAAC;gBAChB,QAAQ,IAAI,CAAC,YAAY,EAAE;oBACzB,KAAK,UAAU;wBACb,WAAW,GAAG,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC;wBACxG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,oBAAoB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;oBACxF,YAAY;oBACZ,oBAAoB;oBACpB,KAAK,UAAU,CAAC;oBAChB,KAAK,QAAQ;
|
|
1
|
+
{"version":3,"file":"tasmotaBinarySensorService.js","sourceRoot":"","sources":["../src/tasmotaBinarySensorService.ts"],"names":[],"mappings":";;;;;;AACA,qDAA0D;AAG1D,kDAAgC;AAChC,MAAM,KAAK,GAAG,eAAW,CAAC,sBAAsB,CAAC,CAAC;AAElD;;;;GAIG;AAEH,MAAa,0BAA2B,SAAQ,+BAAc;IAE5D,YACkB,QAAyB,EACzB,SAA4B,EACzB,OAAe;QAGlC,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QALpB,aAAQ,GAAR,QAAQ,CAAiB;QACzB,cAAS,GAAT,SAAS,CAAmB;QACzB,YAAO,GAAP,OAAO,CAAQ;QAIlC,QAAQ,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE;YACtD,KAAK,UAAU;gBACb,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EACpG,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;gBAE/C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,EAClH,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAE1D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;oBAC7B,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;iBAChH;gBACD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;gBACtG,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE;oBAChC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;oBAC1B,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;oBAC9E,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;iBAClF;gBACD,MAAM;YACR,KAAK,QAAQ;gBACX,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EACpG,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;gBAE/C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,EACjH,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAE1D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;oBAC7B,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;iBAChH;gBACD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;gBAClG,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE;oBAChC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;oBACzB,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;oBACjF,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAChC;gBACD,MAAM;YACR,KAAK,SAAS;gBACZ,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EACpG,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;gBAE/C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,EAClH,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAE1D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;oBAC7B,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;iBAChH;gBACD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;gBACtG,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE;oBAChC,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;oBAC1B,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;oBACjF,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAChC;gBACD,MAAM;YACR,KAAK,MAAM;gBACT,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EACpG,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;gBAE/C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,EAClH,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAE1D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;oBAC7B,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;iBAChH;gBACD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;gBACtG,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE;oBAChC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;oBACzB,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;oBACjF,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAChC;gBACD,MAAM;YACR,KAAK,UAAU;gBACb,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,8BAA8B,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EACpG,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;gBAE/C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,EAC/G,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBAE1D,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;oBAC7B,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;iBAChH;gBACD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;gBAChG,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE;oBAChC,4BAA4B;oBAC5B,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;oBACjF,kCAAkC;iBACnC;gBACD,MAAM;YACR;gBACE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,+CAA+C,EACrE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;SACrD;QAED,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,IAAI,CAAC,YAAY,EAAE,CAAC;IAEtB,CAAC;IAED,YAAY,CAAC,KAAK,EAAE,OAAO;;QACzB,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEzC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE3E,IAAI;YAEF,uCAAuC;YACvC,yEAAyE;YACzE,wCAAwC;YACxC,IAAI,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;YAE/B,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE;gBACvD,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;aAClG;YACD,uCAAuC;YACvC,4CAA4C;YAE5C,iDAAiD;YAEjD,QAAQ,IAAI,CAAC,YAAY,EAAE;gBACzB,KAAK,UAAU;oBACb,MAAM;gBACR,KAAK,UAAU;oBACb,QAAQ;oBACR,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;oBAC5E,KAAK,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;wBACpE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;wBACzD,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;oBAC/D,MAAM;gBACR,KAAK,MAAM;oBACT,IAAI,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,KAAK,SAAS,EAAE;wBAC1E,KAAK,GAAG,uBAAM,CAAC,KAAK,CAAC,CAAC;qBACvB;oBACD,KAAK,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;wBACpE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,CAAC;wBACtE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;oBACpE,MAAM;gBACR,KAAK,QAAQ;oBACX,UAAU;oBACV,KAAK,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;oBACrF,MAAM;gBACR,KAAK,SAAS;oBACZ,UAAU;oBACV,KAAK,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;wBACpE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,CAAC;wBACtE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;oBACpE,MAAM;aACT;YAED,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,KAAK,KAAK,EAAE;gBAEvC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,qCAAqC,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;gBAC/F,IAAI,WAAW,CAAC;gBAChB,QAAQ,IAAI,CAAC,YAAY,EAAE;oBACzB,KAAK,UAAU;wBACb,WAAW,GAAG,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC;wBACxG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,oBAAoB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;oBACxF,YAAY;oBACZ,oBAAoB;oBACpB,KAAK,UAAU,CAAC;oBAChB,KAAK,QAAQ,CAAC;oBACd,KAAK,SAAS;wBACZ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE;4BAChC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;4BACpD,MAAM,cAAc,GAAG,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC,cAAc,EAAE,CAAC;4BACrF,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC,oBAAoB,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;yBAC7F;wBACD,MAAM;iBACT;aAEF;iBAAM;gBACL,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,qCAAqC,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;aACjG;YAED,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAEvC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,KAAI,MAAA,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,eAAe,0CAAG,QAAQ,CAAA,EAAE;gBACtG,KAAK,CAAC,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;oBACnD,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBACrD,CAAC,CAAC;gBACH,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC;oBAChD,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBACrD,CAAC,CAAC;aACJ;iBAAM;gBACL,4DAA4D;aAC7D;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;SACjF;IACH,CAAC;CACF;AArMD,gEAqMC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasmotaSensorService.d.ts","sourceRoot":"","sources":["../src/tasmotaSensorService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMlD;;;;GAIG;AAGH,qBAAa,oBAAqB,SAAQ,cAAc;aAEpC,QAAQ,EAAE,eAAe;aACzB,SAAS,EAAE,iBAAiB;IAC5C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM;gBAFlB,QAAQ,EAAE,eAAe,EACzB,SAAS,EAAE,iBAAiB,EACzB,OAAO,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"tasmotaSensorService.d.ts","sourceRoot":"","sources":["../src/tasmotaSensorService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMlD;;;;GAIG;AAGH,qBAAa,oBAAqB,SAAQ,cAAc;aAEpC,QAAQ,EAAE,eAAe;aACzB,SAAS,EAAE,iBAAiB;IAC5C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM;gBAFlB,QAAQ,EAAE,eAAe,EACzB,SAAS,EAAE,iBAAiB,EACzB,OAAO,EAAE,MAAM;IAoLpC,YAAY,CAAC,KAAK,KAAA,EAAE,OAAO,KAAA;IA6F3B,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAuBxE"}
|
|
@@ -123,7 +123,8 @@ class tasmotaSensorService extends TasmotaService_1.TasmotaService {
|
|
|
123
123
|
break;
|
|
124
124
|
case undefined:
|
|
125
125
|
// This is this Device status object
|
|
126
|
-
|
|
126
|
+
// _status is a Tasmota device, and rssi is an OpenMQTTGateway
|
|
127
|
+
if (this.uniq_id.replace(accessory.context.identifier, '').toLowerCase() === '_status' || this.uniq_id.replace(accessory.context.identifier, '').toLowerCase() === 'rssi') {
|
|
127
128
|
hostname = os_1.default.hostname().replace(/[^-_ a-zA-Z0-9]/gi, '');
|
|
128
129
|
this.platform.log.debug('Setting accessory information', accessory.context.device[this.uniq_id].name);
|
|
129
130
|
if (accessory.context.device[this.uniq_id].dev.mf && accessory.context.device[this.uniq_id].dev.mdl &&
|
|
@@ -162,9 +163,12 @@ class tasmotaSensorService extends TasmotaService_1.TasmotaService {
|
|
|
162
163
|
// Sensor value tweaks or adjustments needed for homekit
|
|
163
164
|
switch (this.device_class) {
|
|
164
165
|
case 'temperature':
|
|
165
|
-
if (this.accessory.context.device[this.uniq_id].unit_of_meas.toUpperCase() === 'F') {
|
|
166
|
+
if (this.accessory.context.device[this.uniq_id].unit_of_meas.toUpperCase() === '°F') {
|
|
166
167
|
value = Math.round((value - 32) * 5 / 9 * 10) / 10;
|
|
167
168
|
}
|
|
169
|
+
else {
|
|
170
|
+
value = Math.round(value * 10) / 10;
|
|
171
|
+
}
|
|
168
172
|
break;
|
|
169
173
|
case 'illuminance':
|
|
170
174
|
// normalize LX in the range homebridge expects
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasmotaSensorService.js","sourceRoot":"","sources":["../src/tasmotaSensorService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tasmotaSensorService.js","sourceRoot":"","sources":["../src/tasmotaSensorService.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"displayName": "Homebridge Tasmota",
|
|
3
3
|
"name": "homebridge-tasmota",
|
|
4
|
-
"version": "0.0.
|
|
4
|
+
"version": "0.0.128",
|
|
5
5
|
"description": "Homebridge plugin for Tasmota devices leveraging home assistant auto discovery.",
|
|
6
6
|
"license": "Apache-2.0",
|
|
7
7
|
"repository": {
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
],
|
|
30
30
|
"ext": "ts",
|
|
31
31
|
"ignore": [],
|
|
32
|
-
"exec": "DEBUG= tsc && homebridge -T -
|
|
32
|
+
"exec": "DEBUG= tsc && homebridge -T -D -P ..",
|
|
33
33
|
"signal": "SIGTERM",
|
|
34
34
|
"env": {
|
|
35
35
|
"NODE_OPTIONS": "--trace-warnings"
|