homebridge-tasmota-control 1.6.1-beta.7 → 1.6.1-beta.9

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 +44 -43
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "displayName": "Tasmota Control",
3
3
  "name": "homebridge-tasmota-control",
4
- "version": "1.6.1-beta.7",
4
+ "version": "1.6.1-beta.9",
5
5
  "description": "Homebridge plugin to control Tasmota flashed devices.",
6
6
  "license": "MIT",
7
7
  "author": "grzegorz914",
package/src/sensors.js CHANGED
@@ -134,52 +134,53 @@ class Sensors extends EventEmitter {
134
134
 
135
135
  const sensor = key === 'ENERGY' ? { ...obj, ...energy } : obj;
136
136
  const debug1 = this.enableDebugMode ? this.emit('debug', `Sensor: ${JSON.stringify(sensor, null, 2)}`) : false;
137
-
138
137
  this.sensors.push(sensor);
139
138
 
140
139
  //update characteristics
141
- const update = (servicesArray, subtype, charName, value) => {
142
- const service = servicesArray[i].find(s => s.subtype === subtype);
143
- if (service && Characteristic[charName]) {
144
- service.updateCharacteristic(Characteristic[charName], value);
145
- }
146
- };
147
-
148
- // temperature
149
- update(this.sensorServices, `sensorTemperatureService${i}`, 'CurrentTemperature', sensor.temperature);
150
- update(this.sensorServices, `sensorReferenceTemperatureService${i}`, 'CurrentTemperature', sensor.referenceTemperature);
151
- update(this.sensorServices, `sensorObjTemperatureService${i}`, 'CurrentTemperature', sensor.objTemperature);
152
- update(this.sensorServices, `sensorAmbTemperatureService${i}`, 'CurrentTemperature', sensor.ambTemperature);
153
- update(this.sensorServices, `sensorDewPointTemperatureService${i}`, 'CurrentTemperature', sensor.dewPointTemperature);
154
-
155
- // humidity
156
- update(this.sensorServices, `sensorHumidityService${i}`, 'CurrentRelativeHumidity', sensor.humidity);
157
-
158
- // CO₂
159
- update(this.sensorServices, `sensorCarbonDioxydeService${i}`, 'CarbonDioxideDetected', sensor.carbonDioxyde > 1000);
160
- update(this.sensorServices, `sensorCarbonDioxydeService${i}`, 'CarbonDioxideLevel', sensor.carbonDioxyde);
161
- update(this.sensorServices, `sensorCarbonDioxydeService${i}`, 'CarbonDioxidePeakLevel', sensor.carbonDioxyde);
162
-
163
- // ambient light
164
- update(this.sensorServices, `sensorAmbientLightService${i}`, 'CurrentAmbientLightLevel', sensor.ambientLight);
165
-
166
- // motion
167
- update(this.sensorServices, `sensorMotionService${i}`, 'MotionDetected', sensor.motion);
168
-
169
- // energy
170
- update(this.sensorServices, `sensorEnergyService${i}`, 'Power', sensor.power);
171
- update(this.sensorServices, `sensorEnergyService${i}`, 'ApparentPower', sensor.apparentPower);
172
- update(this.sensorServices, `sensorEnergyService${i}`, 'ReactivePower', sensor.reactivePower);
173
- update(this.sensorServices, `sensorEnergyService${i}`, 'EnergyToday', sensor.energyToday);
174
- update(this.sensorServices, `sensorEnergyService${i}`, 'EnergyLastDay', sensor.energyLastDay);
175
- update(this.sensorServices, `sensorEnergyService${i}`, 'EnergyLifetime', sensor.energyLifetime);
176
- update(this.sensorServices, `sensorEnergyService${i}`, 'Current', sensor.current);
177
- update(this.sensorServices, `sensorEnergyService${i}`, 'Voltage', sensor.voltage);
178
- update(this.sensorServices, `sensorEnergyService${i}`, 'Factor', sensor.factor);
179
- update(this.sensorServices, `sensorEnergyService${i}`, 'Frequency', sensor.frequency);
180
- update(this.sensorServices, `sensorEnergyService${i}`, 'ReadingTime', sensor.time);
181
-
182
- i++;
140
+ if (this.sensorServices?.[i]) {
141
+ const update = (servicesArray, subtype, charName, value) => {
142
+ const service = servicesArray.find(s => s.subtype === subtype);
143
+ if (service && Characteristic[charName]) {
144
+ service.updateCharacteristic(Characteristic[charName], value);
145
+ }
146
+ };
147
+
148
+ // temperature
149
+ update(this.sensorServices[i], `sensorTemperatureService${i}`, 'CurrentTemperature', sensor.temperature);
150
+ update(this.sensorServices[i], `sensorReferenceTemperatureService${i}`, 'CurrentTemperature', sensor.referenceTemperature);
151
+ update(this.sensorServices[i], `sensorObjTemperatureService${i}`, 'CurrentTemperature', sensor.objTemperature);
152
+ update(this.sensorServices[i], `sensorAmbTemperatureService${i}`, 'CurrentTemperature', sensor.ambTemperature);
153
+ update(this.sensorServices[i], `sensorDewPointTemperatureService${i}`, 'CurrentTemperature', sensor.dewPointTemperature);
154
+
155
+ // humidity
156
+ update(this.sensorServices[i], `sensorHumidityService${i}`, 'CurrentRelativeHumidity', sensor.humidity);
157
+
158
+ // CO₂
159
+ update(this.sensorServices[i], `sensorCarbonDioxydeService${i}`, 'CarbonDioxideDetected', sensor.carbonDioxyde > 1000);
160
+ update(this.sensorServices[i], `sensorCarbonDioxydeService${i}`, 'CarbonDioxideLevel', sensor.carbonDioxyde);
161
+ update(this.sensorServices[i], `sensorCarbonDioxydeService${i}`, 'CarbonDioxidePeakLevel', sensor.carbonDioxyde);
162
+
163
+ // ambient light
164
+ update(this.sensorServices[i], `sensorAmbientLightService${i}`, 'CurrentAmbientLightLevel', sensor.ambientLight);
165
+
166
+ // motion
167
+ update(this.sensorServices[i], `sensorMotionService${i}`, 'MotionDetected', sensor.motion);
168
+
169
+ // energy
170
+ update(this.sensorServices[i], `sensorEnergyService${i}`, 'Power', sensor.power);
171
+ update(this.sensorServices[i], `sensorEnergyService${i}`, 'ApparentPower', sensor.apparentPower);
172
+ update(this.sensorServices[i], `sensorEnergyService${i}`, 'ReactivePower', sensor.reactivePower);
173
+ update(this.sensorServices[i], `sensorEnergyService${i}`, 'EnergyToday', sensor.energyToday);
174
+ update(this.sensorServices[i], `sensorEnergyService${i}`, 'EnergyLastDay', sensor.energyLastDay);
175
+ update(this.sensorServices[i], `sensorEnergyService${i}`, 'EnergyLifetime', sensor.energyLifetime);
176
+ update(this.sensorServices[i], `sensorEnergyService${i}`, 'Current', sensor.current);
177
+ update(this.sensorServices[i], `sensorEnergyService${i}`, 'Voltage', sensor.voltage);
178
+ update(this.sensorServices[i], `sensorEnergyService${i}`, 'Factor', sensor.factor);
179
+ update(this.sensorServices[i], `sensorEnergyService${i}`, 'Frequency', sensor.frequency);
180
+ update(this.sensorServices[i], `sensorEnergyService${i}`, 'ReadingTime', sensor.time);
181
+
182
+ i++;
183
+ }
183
184
  }
184
185
  }
185
186
  this.sensorsCount = this.sensors.length;