From 6f709039932c33dea814ff415304e1fc5e2b8d2b Mon Sep 17 00:00:00 2001 From: Paul Warren Date: Fri, 11 Oct 2024 15:00:51 +1100 Subject: [PATCH] examples now work on installed library --- examples/force_charge.py | 26 +++++++++++++++----------- examples/read_regs.py | 18 +++++++++--------- examples/reset_charge.py | 28 ++++++++++++++-------------- read_regs.py | 32 -------------------------------- 4 files changed, 38 insertions(+), 66 deletions(-) delete mode 100755 read_regs.py diff --git a/examples/force_charge.py b/examples/force_charge.py index 8ab10b9..a1f9dba 100755 --- a/examples/force_charge.py +++ b/examples/force_charge.py @@ -1,37 +1,41 @@ #!/usr/bin/env python3 -from froniusreg import froniusreg +from pyfroniusreg import gen24_registers as froniusreg from pymodbus.client.tcp import ModbusTcpClient fronius1 = ModbusTcpClient("172.19.107.211", port=502, timeout=10) fronius1.connect() -soc = FroniusReg.scaledStateOfCharge.getValue(fronius1) +soc = froniusreg.scaledStateOfCharge.getValue(fronius1) print(" SOC: %s%%" % soc) -discharge = FroniusReg.scaledOutWRte.getValue(fronius1) +discharge = froniusreg.scaledOutWRte.getValue(fronius1) print("Pre DRate: %d%%" % discharge) -charge = FroniusReg.scaledInWRte.getValue(fronius1) +charge = froniusreg.scaledInWRte.getValue(fronius1) print("Pre CRate: %d%%" % charge) -mode = FroniusReg.StorCtl_Mode.getValue(fronius1) +mode = froniusreg.StorCtl_Mode.getValue(fronius1) print("Pre Mode: %d" % mode) # This should be 'limit discharge' mode -err = FroniusReg.StorCtl_Mode.setValue(fronius1, 2) +print("Setting control mode to limit discharge") +err = froniusreg.StorCtl_Mode.setValue(fronius1, 2) + # Charge battery at a rate from -2% discharge to 100% charge # as a percentage of the MaxChaRte, which in our case is 25600W -err = FroniusReg.scaledOutWRte.setValue(fronius1, -10) -err = FroniusReg.scaledInWRte.setValue(fronius1, 100) +print("Setting discharge rate to -10%") +err = froniusreg.scaledOutWRte.setValue(fronius1, int(-10)) +print("Setting charge rate to 100%") +err = froniusreg.scaledInWRte.setValue(fronius1, int(100)) -discharge = FroniusReg.scaledOutWRte.getValue(fronius1) +discharge = froniusreg.scaledOutWRte.getValue(fronius1) print("Post DRate: %d%%" % discharge) -charge = FroniusReg.scaledInWRte.getValue(fronius1) +charge = froniusreg.scaledInWRte.getValue(fronius1) print("Post CRate: %d%%" % charge) -mode = FroniusReg.StorCtl_Mode.getValue(fronius1) +mode = froniusreg.StorCtl_Mode.getValue(fronius1) print("Post Mode: %d" % mode) diff --git a/examples/read_regs.py b/examples/read_regs.py index 8796b6e..77bc649 100755 --- a/examples/read_regs.py +++ b/examples/read_regs.py @@ -1,32 +1,32 @@ #!/usr/bin/env python3 -from froniusreg import froniusreg +from pyfroniusreg import gen24_registers as froniusreg from pymodbus.client.tcp import ModbusTcpClient fronius1 = ModbusTcpClient("172.19.107.211", port=502, timeout=10) fronius1.connect() -soc = FroniusReg.scaledStateOfCharge.getValue(fronius1) +soc = froniusreg.scaledStateOfCharge.getValue(fronius1) print(" SOC: %s%%" % soc) -discharge = FroniusReg.scaledOutWRte.getValue(fronius1) +discharge = froniusreg.scaledOutWRte.getValue(fronius1) print("Pre DRate: %d%%" % discharge) -charge = FroniusReg.scaledInWRte.getValue(fronius1) +charge = froniusreg.scaledInWRte.getValue(fronius1) print("Pre CRate: %d%%" % charge) -mode = FroniusReg.StorCtl_Mode.getValue(fronius1) +mode = froniusreg.StorCtl_Mode.getValue(fronius1) print("Pre Mode: %d" % mode) -reserve = FroniusReg.scaledReserve.getValue(fronius1) +reserve = froniusreg.scaledReserve.getValue(fronius1) print("Pre Res: %d" % reserve) -rate = FroniusReg.scaledMaxChaRte.getValue(fronius1) +rate = froniusreg.scaledMaxChaRte.getValue(fronius1) print("Pre rate: %d" % rate) -rate = FroniusReg.scaledMaxWChaGra.getValue(fronius1) +rate = froniusreg.scaledMaxWChaGra.getValue(fronius1) print("Pre WGra rate: %d" % rate) -revert = FroniusReg.InOutWRte_RvrtTms.getValue(fronius1) +revert = froniusreg.InOutWRte_RvrtTms.getValue(fronius1) print("Timer: %d" % revert) diff --git a/examples/reset_charge.py b/examples/reset_charge.py index df624f2..cdd1cc5 100755 --- a/examples/reset_charge.py +++ b/examples/reset_charge.py @@ -1,44 +1,44 @@ #!/usr/bin/env python3 -import FroniusReg +from pyfroniusreg import gen24_registers as froniusreg from pymodbus.client.tcp import ModbusTcpClient fronius1 = ModbusTcpClient("172.19.107.211", port=502, timeout=10) fronius1.connect() -soc = FroniusReg.scaledStateOfCharge.getValue(fronius1) +soc = froniusreg.scaledStateOfCharge.getValue(fronius1) print(" SOC: %s%%" % soc) -discharge = FroniusReg.scaledOutWRte.getValue(fronius1) +discharge = froniusreg.scaledOutWRte.getValue(fronius1) print("Pre DRate: %d%%" % discharge) -charge = FroniusReg.scaledInWRte.getValue(fronius1) +charge = froniusreg.scaledInWRte.getValue(fronius1) print("Pre CRate: %d%%" % charge) -mode = FroniusReg.StorCtl_Mode.getValue(fronius1) +mode = froniusreg.StorCtl_Mode.getValue(fronius1) print("Pre Mode: %d" % mode) -reserve = FroniusReg.scaledReserve.getValue(fronius1) +reserve = froniusreg.scaledReserve.getValue(fronius1) print("Pre Res: %d" % reserve) # This should be 'no limits' mode -err = FroniusReg.StorCtl_Mode.setValue(fronius1, 0) +err = froniusreg.StorCtl_Mode.setValue(fronius1, 0) # discharge at 100% allowed charge rate -err = FroniusReg.scaledOutWRte.setValue(fronius1, 100) -err = FroniusReg.scaledInWRte.setValue(fronius1, 100) +err = froniusreg.scaledOutWRte.setValue(fronius1, 100) +err = froniusreg.scaledInWRte.setValue(fronius1, 100) # charge to 7% -err = FroniusReg.scaledReserve.setValue(fronius1, 7) +err = froniusreg.scaledReserve.setValue(fronius1, 7) -discharge = FroniusReg.scaledOutWRte.getValue(fronius1) +discharge = froniusreg.scaledOutWRte.getValue(fronius1) print("Post DRate: %d%%" % discharge) -charge = FroniusReg.scaledInWRte.getValue(fronius1) +charge = froniusreg.scaledInWRte.getValue(fronius1) print("Post CRate: %d%%" % charge) -mode = FroniusReg.StorCtl_Mode.getValue(fronius1) +mode = froniusreg.StorCtl_Mode.getValue(fronius1) print("Post Mode: %d" % mode) -reserve = FroniusReg.scaledReserve.getValue(fronius1) +reserve = froniusreg.scaledReserve.getValue(fronius1) print("Post Res: %d" % reserve) diff --git a/read_regs.py b/read_regs.py deleted file mode 100755 index 77bc649..0000000 --- a/read_regs.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python3 - -from pyfroniusreg import gen24_registers as froniusreg - -from pymodbus.client.tcp import ModbusTcpClient - -fronius1 = ModbusTcpClient("172.19.107.211", port=502, timeout=10) -fronius1.connect() - -soc = froniusreg.scaledStateOfCharge.getValue(fronius1) -print(" SOC: %s%%" % soc) - -discharge = froniusreg.scaledOutWRte.getValue(fronius1) -print("Pre DRate: %d%%" % discharge) - -charge = froniusreg.scaledInWRte.getValue(fronius1) -print("Pre CRate: %d%%" % charge) - -mode = froniusreg.StorCtl_Mode.getValue(fronius1) -print("Pre Mode: %d" % mode) - -reserve = froniusreg.scaledReserve.getValue(fronius1) -print("Pre Res: %d" % reserve) - -rate = froniusreg.scaledMaxChaRte.getValue(fronius1) -print("Pre rate: %d" % rate) - -rate = froniusreg.scaledMaxWChaGra.getValue(fronius1) -print("Pre WGra rate: %d" % rate) - -revert = froniusreg.InOutWRte_RvrtTms.getValue(fronius1) -print("Timer: %d" % revert)