Fix for issue#10

ThomasHoussin · ThomasHoussin · commit ec85322158cc · 2021-04-06T22:44:57.000+02:00
Bug with smartmeter and 3phase
diff --git a/.homeychangelog.json b/.homeychangelog.json
@@ -28,5 +28,8 @@
   },
   "0.0.12": {
     "en": "Fixed bug at beginning of the month in device Reporting"
+  },
+  "0.0.13": {
+    "en": "Fixed bug with smartmeter and 3-phase (#10)"
   }
 }
diff --git a/.homeycompose/app.json b/.homeycompose/app.json
@@ -1,6 +1,6 @@
 {
   "id": "com.thomashoussin.fronius",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "compatibility": ">=3.1.0",
   "sdk": 2,
   "name": {
diff --git a/app.json b/app.json
@@ -1,7 +1,7 @@
 {
   "_comment": "This file is generated. Please edit .homeycompose/app.json instead.",
   "id": "com.thomashoussin.fronius",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "compatibility": ">=3.1.0",
   "sdk": 2,
   "name": {
diff --git a/drivers/smartmeter/device.js b/drivers/smartmeter/device.js
@@ -27,7 +27,7 @@ class Smartmeter extends FroniusDevice {
             //Current, in A ; default to 0 
             let current = 0;
             if (typeof data.Current_AC_Sum == 'number') current = data.Current_AC_Sum;
-            else if (typeof data.Current_AC_Phase_1 == 'number' && typeof data.Current_AC_Phase_2 == 'number' && typeof data.Current_AC_Phase_3 == 'number') current = data.Current_AC_Phase_1 + data.Current_AC_Phase_2 + Current_AC_Phase_3;
+            else if (typeof data.Current_AC_Phase_1 == 'number' && typeof data.Current_AC_Phase_2 == 'number' && typeof data.Current_AC_Phase_3 == 'number') current = data.Current_AC_Phase_1 + data.Current_AC_Phase_2 + data.Current_AC_Phase_3;
             this.setCapabilityValue('measure_current', current);
 
             //Voltage, in V ; default to 0 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.thomashoussin.fronius",
-  "version": "0.0.9",
+  "version": "0.0.13",
   "main": "app.js",
   "dependencies": {
     "node-fetch": "^2.6.1",

Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,8 @@`
`28`	`28`	`},`
`29`	`29`	`"0.0.12": {`
`30`	`30`	`"en": "Fixed bug at beginning of the month in device Reporting"`
	`31`	`+ },`
	`32`	`+ "0.0.13": {`
	`33`	`+ "en": "Fixed bug with smartmeter and 3-phase (#10)"`
`31`	`34`	`}`
`32`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "com.thomashoussin.fronius",`
`3`		`- "version": "0.0.12",`
	`3`	`+ "version": "0.0.13",`
`4`	`4`	`"compatibility": ">=3.1.0",`
`5`	`5`	`"sdk": 2,`
`6`	`6`	`"name": {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"_comment": "This file is generated. Please edit .homeycompose/app.json instead.",`
`3`	`3`	`"id": "com.thomashoussin.fronius",`
`4`		`- "version": "0.0.12",`
	`4`	`+ "version": "0.0.13",`
`5`	`5`	`"compatibility": ">=3.1.0",`
`6`	`6`	`"sdk": 2,`
`7`	`7`	`"name": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.thomashoussin.fronius",`
`3`		`- "version": "0.0.9",`
	`3`	`+ "version": "0.0.13",`
`4`	`4`	`"main": "app.js",`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"node-fetch": "^2.6.1",`