homebridge-tasmota-control 1.6.2-beta.11 → 1.6.2-beta.13
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/package.json +1 -1
- package/src/sensors.js +19 -33
package/package.json
CHANGED
package/src/sensors.js
CHANGED
|
@@ -131,7 +131,7 @@ class Sensors extends EventEmitter {
|
|
|
131
131
|
|
|
132
132
|
this.sensors.push(obj);
|
|
133
133
|
|
|
134
|
-
const
|
|
134
|
+
const servicesMap = [
|
|
135
135
|
[this.sensorTemperatureServices?.[i], Characteristic.CurrentTemperature, obj.temperature],
|
|
136
136
|
[this.sensorReferenceTemperatureServices?.[i], Characteristic.CurrentTemperature, obj.referenceTemperature],
|
|
137
137
|
[this.sensorObjTemperatureServices?.[i], Characteristic.CurrentTemperature, obj.objTemperature],
|
|
@@ -145,49 +145,35 @@ class Sensors extends EventEmitter {
|
|
|
145
145
|
[this.sensorMotionServices?.[i], Characteristic.MotionDetected, obj.motion],
|
|
146
146
|
];
|
|
147
147
|
|
|
148
|
-
for (const [service, charType, value] of
|
|
149
|
-
|
|
150
|
-
service?.getCharacteristic(charType)?.updateValue(value);
|
|
151
|
-
} catch (err) {
|
|
152
|
-
this.emit?.('warn', `Failed to update ${charType.displayName}: ${err.message}`);
|
|
153
|
-
}
|
|
148
|
+
for (const [service, charType, value] of servicesMap) {
|
|
149
|
+
service?.getCharacteristic(charType)?.updateValue(value);
|
|
154
150
|
}
|
|
155
151
|
|
|
156
152
|
// ENERGY section
|
|
157
153
|
const isEnergy = key === 'ENERGY';
|
|
158
154
|
if (isEnergy) {
|
|
159
|
-
const energyService = this.sensorEnergyServices?.[i];
|
|
160
|
-
|
|
161
155
|
const energyMap = [
|
|
162
|
-
[Characteristic.Power, obj.power],
|
|
163
|
-
[Characteristic.ApparentPower, obj.apparentPower],
|
|
164
|
-
[Characteristic.ReactivePower, obj.reactivePower],
|
|
165
|
-
[Characteristic.EnergyToday, obj.energyToday],
|
|
166
|
-
[Characteristic.EnergyLastDay, obj.energyLastDay],
|
|
167
|
-
[Characteristic.EnergyLifetime, obj.energyLifetime],
|
|
168
|
-
[Characteristic.Current, obj.current],
|
|
169
|
-
[Characteristic.Voltage, obj.voltage],
|
|
170
|
-
[Characteristic.Factor, obj.factor],
|
|
171
|
-
[Characteristic.Frequency, obj.frequency],
|
|
172
|
-
[Characteristic.ReadingTime, obj.time],
|
|
156
|
+
[this.sensorEnergyServices?.[i], Characteristic.Power, obj.power],
|
|
157
|
+
[this.sensorEnergyServices?.[i], Characteristic.ApparentPower, obj.apparentPower],
|
|
158
|
+
[this.sensorEnergyServices?.[i], Characteristic.ReactivePower, obj.reactivePower],
|
|
159
|
+
[this.sensorEnergyServices?.[i], Characteristic.EnergyToday, obj.energyToday],
|
|
160
|
+
[this.sensorEnergyServices?.[i], Characteristic.EnergyLastDay, obj.energyLastDay],
|
|
161
|
+
[this.sensorEnergyServices?.[i], Characteristic.EnergyLifetime, obj.energyLifetime],
|
|
162
|
+
[this.sensorEnergyServices?.[i], Characteristic.Current, obj.current],
|
|
163
|
+
[this.sensorEnergyServices?.[i], Characteristic.Voltage, obj.voltage],
|
|
164
|
+
[this.sensorEnergyServices?.[i], Characteristic.Factor, obj.factor],
|
|
165
|
+
[this.sensorEnergyServices?.[i], Characteristic.Frequency, obj.frequency],
|
|
166
|
+
[this.sensorEnergyServices?.[i], Characteristic.ReadingTime, obj.time],
|
|
173
167
|
];
|
|
174
168
|
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
} catch (err) {
|
|
180
|
-
this.emit?.('warn', `Failed to update ${charType.displayName}: ${err.message}`);
|
|
181
|
-
}
|
|
182
|
-
});
|
|
169
|
+
for (const [service, charType, value] of energyMap) {
|
|
170
|
+
service?.getCharacteristic(charType)?.updateValue(value);
|
|
171
|
+
this.emit?.('debug', `Updated ${charType}: ${value}`);
|
|
172
|
+
}
|
|
183
173
|
|
|
184
174
|
this.emit('warn', `Power: ${JSON.stringify(obj, null, 2)}`);
|
|
185
175
|
}
|
|
186
|
-
|
|
187
|
-
if (this.enableDebugMode) {
|
|
188
|
-
this.emit('debug', `Sensor: ${JSON.stringify(obj, null, 2)}`);
|
|
189
|
-
}
|
|
190
|
-
|
|
176
|
+
const debug1 = this.enableDebugMode ? this.emit('debug', `Sensor: ${JSON.stringify(obj, null, 2)}`) : false;
|
|
191
177
|
i++;
|
|
192
178
|
}
|
|
193
179
|
|