homebridge-tasmota-control 1.4.1-beta.10 → 1.4.1-beta.11

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.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/sensors.js +20 -22
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "displayName": "Tasmota Control",
3
3
  "name": "homebridge-tasmota-control",
4
- "version": "1.4.1-beta.10",
4
+ "version": "1.4.1-beta.11",
5
5
  "description": "Homebridge plugin to control Tasmota flashed devices.",
6
6
  "license": "MIT",
7
7
  "author": "grzegorz914",
package/src/sensors.js CHANGED
@@ -111,7 +111,6 @@ class Sensors extends EventEmitter {
111
111
  carbonDioxyde: sensorData.CarbonDioxyde,
112
112
  ambientLight: sensorData.Ambient,
113
113
  motion: sensorData === 'ON',
114
-
115
114
  //energy
116
115
  energyTotalStartTime: sensorData.TotalStartTime ?? '',
117
116
  energyTotal: sensorData.Total ?? 0,
@@ -124,16 +123,15 @@ class Sensors extends EventEmitter {
124
123
  factor: sensorData.Factor ?? 0,
125
124
  voltage: sensorData.Voltage ?? 0,
126
125
  current: sensorData.Current ?? 0,
127
- load: sensorData.Load ?? 0
126
+ load: sensorData.Load ?? 0,
127
+ time: sensorStatus.Time ?? '',
128
+ tempUnit: sensorStatus.TempUnit === 'C' ? '°C' : 'F',
129
+ pressureUnit: sensorStatus.PressureUnit ?? 'hPa'
128
130
  }
129
131
 
130
132
  //push to array
131
133
  this.sensors.push(obj);
132
134
  }
133
-
134
- this.time = sensorStatus.Time ?? '';
135
- this.tempUnit = sensorStatus.TempUnit === 'C' ? '°C' : 'F';
136
- this.pressureUnit = sensorStatus.PressureUnit ?? 'hPa';
137
135
  this.sensorsCount = this.sensors.length;
138
136
 
139
137
  //update characteristics
@@ -240,8 +238,8 @@ class Sensors extends EventEmitter {
240
238
  sensorTemperatureService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
241
239
  sensorTemperatureService.getCharacteristic(Characteristic.CurrentTemperature)
242
240
  .onGet(async () => {
243
- const value = this.sensorsTemperature[i];
244
- const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} temperature: ${value} °${this.tempUnit}`);
241
+ const value = sensor.temperature;
242
+ const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} temperature: ${value} °${sensor.tempUnit}`);
245
243
  return value;
246
244
  });
247
245
  this.sensorTemperatureServices.push(sensorTemperatureService);
@@ -257,8 +255,8 @@ class Sensors extends EventEmitter {
257
255
  sensorReferenceTemperatureService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
258
256
  sensorReferenceTemperatureService.getCharacteristic(Characteristic.CurrentTemperature)
259
257
  .onGet(async () => {
260
- const value = this.sensorsReferenceTemperature[i];
261
- const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} reference temperature: ${value} °${this.tempUnit}`);
258
+ const value = sensor.referenceTemperature;
259
+ const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} reference temperature: ${value} °${sensor.tempUnit}`);
262
260
  return value;
263
261
  });
264
262
  this.sensorReferenceTemperatureServices.push(sensorReferenceTemperatureService);
@@ -274,8 +272,8 @@ class Sensors extends EventEmitter {
274
272
  sensorObjTemperatureService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
275
273
  sensorObjTemperatureService.getCharacteristic(Characteristic.CurrentTemperature)
276
274
  .onGet(async () => {
277
- const value = this.sensorsObjTemperature[i];
278
- const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} obj temperature: ${value} °${this.tempUnit}`);
275
+ const value = sensor.objTemperature;
276
+ const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} obj temperature: ${value} °${sensor.tempUnit}`);
279
277
  return value;
280
278
  });
281
279
  this.sensorObjTemperatureServices.push(sensorObjTemperatureService);
@@ -291,8 +289,8 @@ class Sensors extends EventEmitter {
291
289
  sensorAmbTemperatureService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
292
290
  sensorAmbTemperatureService.getCharacteristic(Characteristic.CurrentTemperature)
293
291
  .onGet(async () => {
294
- const value = this.sensorsAmbTemperature[i];
295
- const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} amb temperature: ${value} °${this.tempUnit}`);
292
+ const value = sensor.ambTemperature;
293
+ const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} amb temperature: ${value} °${sensor.tempUnit}`);
296
294
  return value;
297
295
  });
298
296
  this.sensorAmbTemperatureServices.push(sensorAmbTemperatureService);
@@ -308,8 +306,8 @@ class Sensors extends EventEmitter {
308
306
  sensorDewPointTemperatureService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
309
307
  sensorDewPointTemperatureService.getCharacteristic(Characteristic.CurrentTemperature)
310
308
  .onGet(async () => {
311
- const value = this.sensorsDewPointTemperature[i];
312
- const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} dew point: ${value} °${this.tempUnit}`);
309
+ const value = sensor.dewPointTemperature;
310
+ const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} dew point: ${value} °${sensor.tempUnit}`);
313
311
  return value;
314
312
  });
315
313
  this.sensorDewPointTemperatureServices.push(sensorDewPointTemperatureService);
@@ -325,7 +323,7 @@ class Sensors extends EventEmitter {
325
323
  sensorHumidityService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
326
324
  sensorHumidityService.getCharacteristic(Characteristic.CurrentRelativeHumidity)
327
325
  .onGet(async () => {
328
- const value = this.sensorsHumidity[i];
326
+ const value = sensor.humidity;
329
327
  const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} humidity: ${value} %`);
330
328
  return value;
331
329
  });
@@ -346,19 +344,19 @@ class Sensors extends EventEmitter {
346
344
  sensorCarbonDioxydeService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
347
345
  sensorCarbonDioxydeService.getCharacteristic(Characteristic.CarbonDioxideDetected)
348
346
  .onGet(async () => {
349
- const state = this.sensorsCarbonDioxyde[i] > 1000;
347
+ const state = sensor.carbonDioxyde > 1000;
350
348
  const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} carbon dioxyde detected: ${state ? 'Yes' : 'No'}`);
351
349
  return state;
352
350
  });
353
351
  sensorCarbonDioxydeService.getCharacteristic(Characteristic.CarbonDioxideLevel)
354
352
  .onGet(async () => {
355
- const value = this.sensorsCarbonDioxyde[i];
353
+ const value = sensor.carbonDioxyde;
356
354
  const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} carbon dioxyde level: ${value} ppm`);
357
355
  return value;
358
356
  });
359
357
  sensorCarbonDioxydeService.getCharacteristic(Characteristic.CarbonDioxidePeakLevel)
360
358
  .onGet(async () => {
361
- const value = this.sensorsCarbonDioxyde[i];
359
+ const value = sensor.carbonDioxyde;
362
360
  const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} carbon dioxyde peak level: ${value} ppm`);
363
361
  return value;
364
362
  });
@@ -375,7 +373,7 @@ class Sensors extends EventEmitter {
375
373
  sensorAmbientLightService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
376
374
  sensorAmbientLightService.getCharacteristic(Characteristic.CurrentAmbientLightLevel)
377
375
  .onGet(async () => {
378
- const value = this.sensorsAmbientLight[i];
376
+ const value = sensor.ambientLight;
379
377
  const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} ambient light: ${value} lx`);
380
378
  return value;
381
379
  });
@@ -392,7 +390,7 @@ class Sensors extends EventEmitter {
392
390
  sensorMotionService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
393
391
  sensorMotionService.getCharacteristic(Characteristic.MotionDetected)
394
392
  .onGet(async () => {
395
- const state = this.sensorsMotion[i];
393
+ const state = sensor.motion;
396
394
  const logInfo = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} motion: ${state ? 'ON' : 'OFF'}`);
397
395
  return state;
398
396
  });