fix UIID 182/190 power readings

bwp91 · Mar 26, 2024 · ec8bc4e · ec8bc4e
1 parent 9f0bef5
commit ec8bc4e
Show file tree

Hide file tree

Showing 6 changed files with 171 additions and 106 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,10 @@ This project tries to adhere to [Semantic Versioning](http://semver.org/). In pr
 - Bump `node` recommended versions to v18.19.1 or v20.11.1
 - Updated dependencies
 
+### Fixed
+
+- Fix UIID 182/190 power readings
+
 ## 12.1.0 (2023-12-16)
 
 ### Added

diff --git a/lib/device/outlet-single-inched.js b/lib/device/outlet-single-inched.js
@@ -63,7 +63,6 @@ export default class {
 
  switch (this.accessory.context.eweUIID) {
  case 5:
- case 182:
  // Add Eve power characteristics
  this.powerReadings = true;
  if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
@@ -90,6 +89,8 @@ export default class {
  }
  break;
  case 32:
+ case 182:
+ case 190:
  // Add Eve power characteristics
  this.powerReadings = true;
  if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {

diff --git a/lib/device/outlet-single.js b/lib/device/outlet-single.js
@@ -65,8 +65,6 @@ export default class {
 
  switch (this.accessory.context.eweUIID) {
  case 5:
- case 182:
- case 190:
  // Add Eve power characteristics
  this.powerReadings = true;
  if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
@@ -91,12 +89,10 @@ export default class {
  if (this.service.testCharacteristic(this.eveChar.Voltage)) {
  this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage));
  }
-
- if (this.accessory.context.eweUIID === 190) {
- this.divisor = 100;
- }
  break;
  case 32:
+ case 182:
+ case 190:
  // Add Eve power characteristics
  this.powerReadings = true;
  if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
@@ -117,6 +113,9 @@ export default class {
  if (!this.service.testCharacteristic(this.eveChar.ResetTotal)) {
  this.service.addCharacteristic(this.eveChar.ResetTotal);
  }
+ if (this.accessory.context.eweUIID === 190) {
+ this.divisor = 100;
+ }
  break;
  default:
  // Remove unused Eve characteristics

diff --git a/lib/device/switch-single-inched.js b/lib/device/switch-single-inched.js
@@ -63,8 +63,6 @@ export default class {
 
  switch (this.accessory.context.eweUIID) {
  case 5:
- case 182:
- case 190:
  // Add Eve power characteristics
  this.powerReadings = true;
  if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
@@ -85,6 +83,8 @@ export default class {
  }
  break;
  case 32:
+ case 182:
+ case 190:
  // Add Eve power characteristics
  this.powerReadings = true;
  if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {

diff --git a/lib/device/switch-single.js b/lib/device/switch-single.js
@@ -65,8 +65,6 @@ export default class {
 
  switch (this.accessory.context.eweUIID) {
  case 5:
- case 182:
- case 190:
  // Add Eve power characteristics
  this.powerReadings = true;
  if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
@@ -85,12 +83,10 @@ export default class {
  if (this.service.testCharacteristic(this.eveChar.Voltage)) {
  this.service.removeCharacteristic(this.service.getCharacteristic(this.eveChar.Voltage));
  }
-
- if (this.accessory.context.eweUIID === 190) {
- this.divisor = 100;
- }
  break;
  case 32:
+ case 182:
+ case 190:
  // Add Eve power characteristics
  this.powerReadings = true;
  if (!this.service.testCharacteristic(this.hapChar.OutletInUse)) {
@@ -105,6 +101,10 @@ export default class {
  if (!this.service.testCharacteristic(this.eveChar.Voltage)) {
  this.service.addCharacteristic(this.eveChar.Voltage);
  }
+
+ if (this.accessory.context.eweUIID === 190) {
+ this.divisor = 100;
+ }
  break;
  default:
  // Remove unused Eve characteristics