homebridge-tasmota-control 1.6.1-beta.3 → 1.6.1-beta.5

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 +35 -50
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.3",
4
+ "version": "1.6.1-beta.5",
5
5
  "description": "Homebridge plugin to control Tasmota flashed devices.",
6
6
  "license": "MIT",
7
7
  "author": "grzegorz914",
package/src/sensors.js CHANGED
@@ -138,54 +138,47 @@ class Sensors extends EventEmitter {
138
138
  this.sensors.push(sensor);
139
139
 
140
140
  //update characteristics
141
- const update = (servicesArray, expectedDisplayName, charName, value) => {
141
+ const update = (servicesArray, subtype, charName, value) => {
142
142
  const service = servicesArray?.[i];
143
143
  const characteristic = service?.Characteristic?.[charName];
144
- if (service?.displayName === expectedDisplayName && characteristic && Characteristic?.[charName]) {
144
+ if (service?.subtype === subtype && characteristic && Characteristic?.[charName]) {
145
145
  characteristic.updateCharacteristic(Characteristic[charName], value);
146
146
  }
147
147
  };
148
148
 
149
- const updates = [
150
- // Temperature
151
- { service: 'sensorTemperatureService', char: 'CurrentTemperature', key: 'temperature' },
152
- { service: 'sensorReferenceTemperatureService', char: 'CurrentTemperature', key: 'referenceTemperature' },
153
- { service: 'sensorObjTemperatureService', char: 'CurrentTemperature', key: 'objTemperature' },
154
- { service: 'sensorAmbTemperatureService', char: 'CurrentTemperature', key: 'ambTemperature' },
155
- { service: 'sensorDewPointTemperatureService', char: 'CurrentTemperature', key: 'dewPointTemperature' },
156
-
157
- // Humidity
158
- { service: 'sensorHumidityService', char: 'CurrentRelativeHumidity', key: 'humidity' },
159
-
160
- // CO₂
161
- { service: 'sensorCarbonDioxydeService', char: 'CarbonDioxideDetected', key: 'carbonDioxyde', transform: v => v > 1000 },
162
- { service: 'sensorCarbonDioxydeService', char: 'CarbonDioxideLevel', key: 'carbonDioxyde' },
163
- { service: 'sensorCarbonDioxydeService', char: 'CarbonDioxidePeakLevel', key: 'carbonDioxyde' },
164
-
165
- // Ambient Light
166
- { service: 'sensorAmbientLightService', char: 'CurrentAmbientLightLevel', key: 'ambientLight' },
167
-
168
- // Motion
169
- { service: 'sensorMotionService', char: 'MotionDetected', key: 'motion' },
170
-
171
- // Energy
172
- { service: 'sensorEnergyService', char: 'Power', key: 'power' },
173
- { service: 'sensorEnergyService', char: 'ApparentPower', key: 'apparentPower' },
174
- { service: 'sensorEnergyService', char: 'ReactivePower', key: 'reactivePower' },
175
- { service: 'sensorEnergyService', char: 'EnergyToday', key: 'energyToday' },
176
- { service: 'sensorEnergyService', char: 'EnergyLastDay', key: 'energyLastDay' },
177
- { service: 'sensorEnergyService', char: 'EnergyLifetime', key: 'energyLifetime' },
178
- { service: 'sensorEnergyService', char: 'Current', key: 'current' },
179
- { service: 'sensorEnergyService', char: 'Voltage', key: 'voltage' },
180
- { service: 'sensorEnergyService', char: 'Factor', key: 'factor' },
181
- { service: 'sensorEnergyService', char: 'Frequency', key: 'frequency' },
182
- { service: 'sensorEnergyService', char: 'ReadingTime', key: 'time' },
183
- ];
184
-
185
- for (const { service, char, key, transform } of updates) {
186
- const value = transform ? transform(sensor[key]) : sensor[key];
187
- update(this.sensorServices, `${service}${i}`, char, value);
188
- }
149
+ // temperature
150
+ update(this.sensorServices, `sensorTemperatureService${i}`, 'CurrentTemperature', sensor.temperature);
151
+ update(this.sensorServices, `sensorReferenceTemperatureService${i}`, 'CurrentTemperature', sensor.referenceTemperature);
152
+ update(this.sensorServices, `sensorObjTemperatureService${i}`, 'CurrentTemperature', sensor.objTemperature);
153
+ update(this.sensorServices, `sensorAmbTemperatureService${i}`, 'CurrentTemperature', sensor.ambTemperature);
154
+ update(this.sensorServices, `sensorDewPointTemperatureService${i}`, 'CurrentTemperature', sensor.dewPointTemperature);
155
+
156
+ // humidity
157
+ update(this.sensorServices, `sensorHumidityService${i}`, 'CurrentRelativeHumidity', sensor.humidity);
158
+
159
+ // CO₂
160
+ update(this.sensorServices, `sensorCarbonDioxydeService${i}`, 'CarbonDioxideDetected', sensor.carbonDioxyde > 1000);
161
+ update(this.sensorServices, `sensorCarbonDioxydeService${i}`, 'CarbonDioxideLevel', sensor.carbonDioxyde);
162
+ update(this.sensorServices, `sensorCarbonDioxydeService${i}`, 'CarbonDioxidePeakLevel', sensor.carbonDioxyde);
163
+
164
+ // ambient light
165
+ update(this.sensorServices, `sensorAmbientLightService${i}`, 'CurrentAmbientLightLevel', sensor.ambientLight);
166
+
167
+ // motion
168
+ update(this.sensorServices, `sensorMotionService${i}`, 'MotionDetected', sensor.motion);
169
+
170
+ // energy
171
+ update(this.sensorServices, `sensorEnergyService${i}`, 'Power', sensor.power);
172
+ update(this.sensorServices, `sensorEnergyService${i}`, 'ApparentPower', sensor.apparentPower);
173
+ update(this.sensorServices, `sensorEnergyService${i}`, 'ReactivePower', sensor.reactivePower);
174
+ update(this.sensorServices, `sensorEnergyService${i}`, 'EnergyToday', sensor.energyToday);
175
+ update(this.sensorServices, `sensorEnergyService${i}`, 'EnergyLastDay', sensor.energyLastDay);
176
+ update(this.sensorServices, `sensorEnergyService${i}`, 'EnergyLifetime', sensor.energyLifetime);
177
+ update(this.sensorServices, `sensorEnergyService${i}`, 'Current', sensor.current);
178
+ update(this.sensorServices, `sensorEnergyService${i}`, 'Voltage', sensor.voltage);
179
+ update(this.sensorServices, `sensorEnergyService${i}`, 'Factor', sensor.factor);
180
+ update(this.sensorServices, `sensorEnergyService${i}`, 'Frequency', sensor.frequency);
181
+ update(this.sensorServices, `sensorEnergyService${i}`, 'ReadingTime', sensor.time);
189
182
 
190
183
  i++;
191
184
  }
@@ -240,14 +233,6 @@ class Sensors extends EventEmitter {
240
233
  return;
241
234
  }
242
235
 
243
- createSensorService({ accessory, serviceType, serviceName, characteristicType, getValue }) {
244
- const service = accessory.addService(serviceType, serviceName, serviceName);
245
- service.addOptionalCharacteristic(Characteristic.ConfiguredName);
246
- service.setCharacteristic(Characteristic.ConfiguredName, serviceName);
247
- service.getCharacteristic(characteristicType).onGet(getValue);
248
- return service;
249
- }
250
-
251
236
  //prepare accessory
252
237
  async prepareAccessory() {
253
238
  const debug = this.enableDebugMode ? this.emit('debug', `Prepare Accessory`) : false;