homebridge-tasmota-control 1.5.0 → 1.5.1-beta.1

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 (4) hide show
  1. package/index.js +1 -1
  2. package/package.json +1 -1
  3. package/src/deviceinfo.js +1 -0
  4. package/src/sensors.js +27 -21
package/index.js CHANGED
@@ -144,7 +144,7 @@ class tasmotaPlatform {
144
144
  const emitLog = disableLogInfo ? false : log.info(`Device: ${host} ${deviceName}, ${info}.`);
145
145
  })
146
146
  .on('debug', (debug) => {
147
- const emitLog = !enableDebugMode ? false : log.info(`Device: ${host} ${deviceName}, debug: ${debug}.`);
147
+ const emitLog = enableDebugMode ? false : log.info(`Device: ${host} ${deviceName}, debug: ${debug}.`);
148
148
  })
149
149
  .on('warn', (warn) => {
150
150
  const emitLog = disableLogWarn ? false : log.warn(`Device: ${host} ${deviceName}, ${warn}.`);
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.0",
4
+ "version": "1.5.1-beta.1",
5
5
  "description": "Homebridge plugin to control Tasmota flashed devices.",
6
6
  "license": "MIT",
7
7
  "author": "grzegorz914",
package/src/deviceinfo.js CHANGED
@@ -55,6 +55,7 @@ class DeviceInfo extends EventEmitter {
55
55
  const statusSns = deviceInfo.StatusSNS ?? {};
56
56
  const statusSnsKeys = Object.keys(statusSns);
57
57
 
58
+
58
59
  //status STS
59
60
  const statusSts = deviceInfo.StatusSTS ?? {};
60
61
  const statusStsKeys = Object.keys(statusSts);
package/src/sensors.js CHANGED
@@ -87,19 +87,23 @@ class Sensors extends EventEmitter {
87
87
  //status SNS
88
88
  if (statusSnsSupported) {
89
89
  this.sensors = [];
90
- const sensor = Object.entries(statusSns)
90
+ const sensorData = Object.entries(statusSns)
91
91
  .filter(([key]) => SensorKeys.some(type => key.includes(type)))
92
92
  .reduce((obj, [key, value]) => {
93
93
  obj[key] = value;
94
94
  return obj;
95
95
  }, {});
96
96
 
97
- for (const [key, value] of Object.entries(sensor)) {
97
+ for (const [key, value] of Object.entries(sensorData)) {
98
98
  const sensorData = value;
99
99
 
100
100
  //sensor
101
101
  const obj = {
102
- name: key ?? `Sensor`,
102
+ name: key,
103
+ time: sensorStatus.Time,
104
+ tempUnit: sensorStatus.TempUnit === 'C' ? '°C' : 'F',
105
+ pressureUnit: sensorStatus.PressureUnit ?? 'hPa',
106
+
103
107
  temperature: sensorData.Temperature,
104
108
  referenceTemperature: sensorData.ReferenceTemperature,
105
109
  objTemperature: sensorData.OBJTMP,
@@ -110,27 +114,29 @@ class Sensors extends EventEmitter {
110
114
  gas: sensorData.Gas,
111
115
  carbonDioxyde: sensorData.CarbonDioxyde,
112
116
  ambientLight: sensorData.Ambient,
113
- motion: sensorData === 'ON',
114
- //energy
115
- energyTotalStartTime: sensorData.TotalStartTime ?? '',
116
- energyTotal: sensorData.Total ?? 0,
117
- energyPeriod: sensorData.Period ?? 0,
118
- energyYesterday: sensorData.Yesterday ?? 0,
119
- energyToday: sensorData.Today ?? 0,
120
- power: sensorData.Power ?? 0,
121
- apparentPower: sensorData.ApparentPower ?? 0,
122
- reactivePower: sensorData.ReactivePower ?? 0,
123
- factor: sensorData.Factor ?? 0,
124
- voltage: sensorData.Voltage ?? 0,
125
- current: sensorData.Current ?? 0,
126
- load: sensorData.Load ?? 0,
127
- time: sensorStatus.Time ?? '',
128
- tempUnit: sensorStatus.TempUnit === 'C' ? '°C' : 'F',
129
- pressureUnit: sensorStatus.PressureUnit ?? 'hPa'
117
+ motion: sensorData.Motion === 'ON',
118
+ }
119
+
120
+ //energy
121
+ const obj1 = {
122
+ energyTotalStartTime: sensorData.TotalStartTime,
123
+ energyTotal: sensorData.Total,
124
+ energyPeriod: sensorData.Period,
125
+ energyYesterday: sensorData.Yesterday,
126
+ energyToday: sensorData.Today,
127
+ power: sensorData.Power,
128
+ apparentPower: sensorData.ApparentPower,
129
+ reactivePower: sensorData.ReactivePower,
130
+ factor: sensorData.Factor,
131
+ voltage: sensorData.Voltage,
132
+ current: sensorData.Current,
133
+ load: sensorData.Load,
130
134
  }
135
+ const sensor = key === 'ENERGY' ? { ...obj, ...obj1 } : obj;
136
+ this.emit('debug', `Sensors status: ${JSON.stringify(sensor, null, 2)}`)
131
137
 
132
138
  //push to array
133
- this.sensors.push(obj);
139
+ this.sensors.push(sensor);
134
140
  }
135
141
  this.sensorsCount = this.sensors.length;
136
142