homebridge-tasmota-control 1.5.1-beta.20 → 1.5.1-beta.22

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 +23 -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.5.1-beta.20",
4
+ "version": "1.5.1-beta.22",
5
5
  "description": "Homebridge plugin to control Tasmota flashed devices.",
6
6
  "license": "MIT",
7
7
  "author": "grzegorz914",
package/src/sensors.js CHANGED
@@ -254,7 +254,7 @@ class Sensors extends EventEmitter {
254
254
  let i = 0;
255
255
  for (const sensor of this.sensors) {
256
256
  const sensorName = sensor.name;
257
- if (sensor.temperature !== undefined) {
257
+ if (sensor.temperature) {
258
258
  const debug = this.enableDebugMode ? this.emit('debug', `Prepare Temperature Sensor Services`) : false;
259
259
  this.sensorTemperatureServices = [];
260
260
  const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Temperature` : `${sensorName} Temperature`;
@@ -271,7 +271,7 @@ class Sensors extends EventEmitter {
271
271
  }
272
272
 
273
273
  //reference temperature
274
- if (sensor.referenceTemperature !== undefined) {
274
+ if (sensor.referenceTemperature) {
275
275
  const debug = this.enableDebugMode ? this.emit('debug', `Prepare Reference Temperature Sensor Services`) : false;
276
276
  this.sensorReferenceTemperatureServices = [];
277
277
  const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Reference Temperature` : `${sensorName} Reference Temperature`;
@@ -288,7 +288,7 @@ class Sensors extends EventEmitter {
288
288
  }
289
289
 
290
290
  //object temperature
291
- if (sensor.objTemperature !== undefined) {
291
+ if (sensor.objTemperature) {
292
292
  const debug = this.enableDebugMode ? this.emit('debug', `Prepare Obj Temperature Sensor Services`) : false;
293
293
  this.sensorObjTemperatureServices = [];
294
294
  const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Obj Temperature` : `${sensorName} Obj Temperature`;
@@ -305,7 +305,7 @@ class Sensors extends EventEmitter {
305
305
  }
306
306
 
307
307
  //ambient temperature
308
- if (sensor.ambTemperature !== undefined) {
308
+ if (sensor.ambTemperature) {
309
309
  const debug = this.enableDebugMode ? this.emit('debug', `Prepare Amb Temperature Sensor Services`) : false;
310
310
  this.sensorAmbTemperatureServices = [];
311
311
  const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Amb Temperature` : `${sensorName} Amb Temperature`;
@@ -322,7 +322,7 @@ class Sensors extends EventEmitter {
322
322
  }
323
323
 
324
324
  //dew point temperature
325
- if (sensor.dewPointTemperature !== undefined) {
325
+ if (sensor.dewPointTemperature) {
326
326
  const debug = this.enableDebugMode ? this.emit('debug', `Prepare Dew Point Temperature Sensor Services`) : false;
327
327
  this.sensorDewPointTemperatureServices = [];
328
328
  const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Dew Point` : `${sensorName} Dew Point`;
@@ -339,7 +339,7 @@ class Sensors extends EventEmitter {
339
339
  }
340
340
 
341
341
  //humidity
342
- if (sensor.humidity !== undefined) {
342
+ if (sensor.humidity) {
343
343
  const debug = this.enableDebugMode ? this.emit('debug', `Prepare Humidity Sensor Services`) : false;
344
344
  this.sensorHumidityServices = [];
345
345
  const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Humidity` : `${sensorName} Humidity`;
@@ -360,7 +360,7 @@ class Sensors extends EventEmitter {
360
360
  //gas
361
361
 
362
362
  //carbon dioxyde
363
- if (sensor.carbonDioxyde !== undefined) {
363
+ if (sensor.carbonDioxyde) {
364
364
  const debug = this.enableDebugMode ? this.emit('debug', `Prepare Carbon Dioxyde Sensor Services`) : false;
365
365
  this.sensorCarbonDioxydeServices = [];
366
366
  const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Carbon Dioxyde` : `${sensorName} Carbon Dioxyde`;
@@ -389,7 +389,7 @@ class Sensors extends EventEmitter {
389
389
  }
390
390
 
391
391
  //ambient light
392
- if (sensor.ambientLight !== undefined) {
392
+ if (sensor.ambientLight) {
393
393
  const debug = this.enableDebugMode ? this.emit('debug', `Prepare Ambient Light Sensor Services`) : false;
394
394
  this.sensorAmbientLightServices = [];
395
395
  const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Ambient Light` : `${sensorName} Ambient Light`;
@@ -406,7 +406,7 @@ class Sensors extends EventEmitter {
406
406
  }
407
407
 
408
408
  //motion
409
- if (sensor.motion !== undefined) {
409
+ if (sensor.motion) {
410
410
  const debug = this.enableDebugMode ? this.emit('debug', `Prepare Motion Sensor Services`) : false;
411
411
  this.sensorMotionServices = [];
412
412
  const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Motion` : `${sensorName} Motion`;
@@ -426,13 +426,14 @@ class Sensors extends EventEmitter {
426
426
  if (sensor.name === 'ENERGY') {
427
427
  const debug4 = this.enableDebugMode ? this.emit('debug', `Prepare Power And Energy Service`) : false;
428
428
  this.sensorEnergyServices = [];
429
- const energyService = accessory.addService(Service.PowerAndEnergyService, `Power And Energy`, 'energyService');
430
- energyService.setCharacteristic(Characteristic.ConfiguredName, `Power And Energy `);
429
+ const serviceName = this.sensorsNamePrefix ? `${accessoryName} ${sensorName} Power And Energy` : `${sensorName} Power And Energy`;
430
+ const energyService = accessory.addService(Service.PowerAndEnergyService, serviceName, 'energyService');
431
+ energyService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
431
432
  if (sensor.power) {
432
433
  energyService.getCharacteristic(Characteristic.Power)
433
434
  .onGet(async () => {
434
435
  const value = sensor.power;
435
- const info = this.disableLogInfo ? false : this.emit('info', ` power: ${value} W`);
436
+ const info = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} power: ${value} W`);
436
437
  return value;
437
438
  });
438
439
  }
@@ -440,7 +441,7 @@ class Sensors extends EventEmitter {
440
441
  energyService.getCharacteristic(Characteristic.ApparentPower)
441
442
  .onGet(async () => {
442
443
  const value = sensor.apparentPower;
443
- const info = this.disableLogInfo ? false : this.emit('info', ` apparent power: ${value} VA`);
444
+ const info = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} apparent power: ${value} VA`);
444
445
  return value;
445
446
  });
446
447
  }
@@ -448,7 +449,7 @@ class Sensors extends EventEmitter {
448
449
  energyService.getCharacteristic(Characteristic.ReactivePower)
449
450
  .onGet(async () => {
450
451
  const value = sensor.reactivePower;
451
- const info = this.disableLogInfo ? false : this.emit('info', ` reactive power: ${value} VAr`);
452
+ const info = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} reactive power: ${value} VAr`);
452
453
  return value;
453
454
  });
454
455
  }
@@ -456,7 +457,7 @@ class Sensors extends EventEmitter {
456
457
  energyService.getCharacteristic(Characteristic.EnergyToday)
457
458
  .onGet(async () => {
458
459
  const value = sensor.energyToday;
459
- const info = this.disableLogInfo ? false : this.emit('info', ` energy today: ${value} kWh`);
460
+ const info = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} energy today: ${value} kWh`);
460
461
  return value;
461
462
  });
462
463
  }
@@ -464,7 +465,7 @@ class Sensors extends EventEmitter {
464
465
  energyService.getCharacteristic(Characteristic.EnergyLastDay)
465
466
  .onGet(async () => {
466
467
  const value = sensor.energyLastDay;
467
- const info = this.disableLogInfo ? false : this.emit('info', ` energy last seven days: ${value} kWh`);
468
+ const info = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} energy last day: ${value} kWh`);
468
469
  return value;
469
470
  });
470
471
  }
@@ -472,7 +473,7 @@ class Sensors extends EventEmitter {
472
473
  energyService.getCharacteristic(Characteristic.EnergyLifetime)
473
474
  .onGet(async () => {
474
475
  const value = sensor.energyLifetime;
475
- const info = this.disableLogInfo ? false : this.emit('info', ` energy lifetime: ${value} kWh`);
476
+ const info = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} energy lifetime: ${value} kWh`);
476
477
  return value;
477
478
  });
478
479
  }
@@ -480,7 +481,7 @@ class Sensors extends EventEmitter {
480
481
  energyService.getCharacteristic(Characteristic.Current)
481
482
  .onGet(async () => {
482
483
  const value = sensor.current;
483
- const info = this.disableLogInfo ? false : this.emit('info', ` current: ${value} A`);
484
+ const info = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} current: ${value} A`);
484
485
  return value;
485
486
  });
486
487
  }
@@ -488,7 +489,7 @@ class Sensors extends EventEmitter {
488
489
  energyService.getCharacteristic(Characteristic.Voltage)
489
490
  .onGet(async () => {
490
491
  const value = sensor.voltage;
491
- const info = this.disableLogInfo ? false : this.emit('info', ` voltage: ${value} V`);
492
+ const info = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} voltage: ${value} V`);
492
493
  return value;
493
494
  });
494
495
  }
@@ -496,7 +497,7 @@ class Sensors extends EventEmitter {
496
497
  energyService.getCharacteristic(Characteristic.Factor)
497
498
  .onGet(async () => {
498
499
  const value = sensor.factor;
499
- const info = this.disableLogInfo ? false : this.emit('info', ` power factor: ${value} cos φ`);
500
+ const info = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} power factor: ${value} cos φ`);
500
501
  return value;
501
502
  });
502
503
  }
@@ -504,7 +505,7 @@ class Sensors extends EventEmitter {
504
505
  energyService.getCharacteristic(Characteristic.Freqency)
505
506
  .onGet(async () => {
506
507
  const value = sensor.frequency;
507
- const info = this.disableLogInfo ? false : this.emit('info', ` frequency: ${value} Hz`);
508
+ const info = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} frequency: ${value} Hz`);
508
509
  return value;
509
510
  });
510
511
  }
@@ -512,7 +513,7 @@ class Sensors extends EventEmitter {
512
513
  energyService.getCharacteristic(Characteristic.ReadingTime)
513
514
  .onGet(async () => {
514
515
  const value = sensor.time;
515
- const info = this.disableLogInfo ? false : this.emit('info', ` last report: ${value}`);
516
+ const info = this.disableLogInfo ? false : this.emit('info', `sensor: ${sensorName} last report: ${value}`);
516
517
  return value;
517
518
  });
518
519
  }