V1.19.04

jgyates · Oct 25, 2024 · f818790 · f818790
1 parent b5a81ca
commit f818790
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/changelog.md b/changelog.md
@@ -20,6 +20,7 @@ All notable changes to this project will be documented in this file.
 - Minor update to correct formatting issue with bus voltage on PowerZone Sync
 - Added new alarm ID for internal controller fault for Evolution / Nexus
 - Updated External Temp Sensor add on to support non zero minimum values
+- More updates to allow for correct display on PowerZone Sync
 
 ## V1.19.03 -2024-04-19
 - New add on program genmqttin.py. See wiki and add on page for details

diff --git a/genmonlib/generac_powerzone.py b/genmonlib/generac_powerzone.py
@@ -803,7 +803,7 @@ def SetupTiles(self):
                         callbackparameters=(
                             self.Reg.TOTAL_POWER_KW[REGISTER],
                             None,
-                            None,
+                            1000,       # Divider 1000?
                             False,
                             True,
                             False,
@@ -820,7 +820,7 @@ def SetupTiles(self):
                         callbackparameters=(
                             self.Reg.TOTAL_POWER_KW[REGISTER],
                             None,
-                            None,
+                            1000,       # Divider 1000?
                             False,
                             True,
                             False,
@@ -2113,7 +2113,8 @@ def DisplayStatus(self, DictOut=False, JSONNum=False):
                 {
                     "Current Phase A": self.ValueOut(
                         self.GetParameter(
-                            self.Reg.GEN_PHASE_A_CURRENT[REGISTER], ReturnInt=True
+                            self.Reg.GEN_PHASE_A_CURRENT[REGISTER], ReturnFloat=True,
+                                Divider=10.0,
                         ),
                         "A",
                         JSONNum,
@@ -2124,7 +2125,8 @@ def DisplayStatus(self, DictOut=False, JSONNum=False):
                 {
                     "Current Phase B": self.ValueOut(
                         self.GetParameter(
-                            self.Reg.GEN_PHASE_B_CURRENT[REGISTER], ReturnInt=True
+                            self.Reg.GEN_PHASE_B_CURRENT[REGISTER], ReturnFloat=True,
+                                Divider=10.0,
                         ),
                         "A",
                         JSONNum,
@@ -2135,7 +2137,8 @@ def DisplayStatus(self, DictOut=False, JSONNum=False):
                 {
                     "Current Phase C": self.ValueOut(
                         self.GetParameter(
-                            self.Reg.GEN_PHASE_C_CURRENT[REGISTER], ReturnInt=True
+                            self.Reg.GEN_PHASE_C_CURRENT[REGISTER], ReturnFloat=True,
+                                Divider=10.0,
                         ),
                         "A",
                         JSONNum,
@@ -2146,7 +2149,8 @@ def DisplayStatus(self, DictOut=False, JSONNum=False):
                 {
                     "Average Current": self.ValueOut(
                         self.GetParameter(
-                            self.Reg.GEN_AVERAGE_CURRENT[REGISTER], ReturnInt=True
+                            self.Reg.GEN_AVERAGE_CURRENT[REGISTER], ReturnFloat=True,
+                                Divider=10.0,
                         ),
                         "A",
                         JSONNum,
@@ -3080,11 +3084,11 @@ def GetPowerOutput(self, ReturnFloat=False):
             return self.GetPowerOutputAlt(ReturnFloat=ReturnFloat)
         if ReturnFloat:
             return self.GetParameter(
-                self.Reg.TOTAL_POWER_KW[REGISTER], ReturnFloat=True
+                self.Reg.TOTAL_POWER_KW[REGISTER], ReturnFloat=True, Divider = 1000
             )
         else:
             return self.GetParameter(
-                self.Reg.TOTAL_POWER_KW[REGISTER], "kW", ReturnFloat=False
+                self.Reg.TOTAL_POWER_KW[REGISTER], "kW", ReturnFloat=False,  Divider = 1000
             )
 
     # ------------ PowerZone:GetPowerOutputAlt ----------------------------------