From a2a6b9c4e931bd8b259022f3fbcad0baea467367 Mon Sep 17 00:00:00 2001 From: Paul Warren Date: Wed, 16 Oct 2024 21:33:28 +1100 Subject: [PATCH] Adjust examples to generated registers --- examples/check_peak.py | 6 +++--- examples/force_charge.py | 8 ++++---- examples/read_regs.py | 8 ++++---- examples/reset_charge.py | 14 +++++++------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/check_peak.py b/examples/check_peak.py index 0972290..969ea30 100755 --- a/examples/check_peak.py +++ b/examples/check_peak.py @@ -14,15 +14,15 @@ fronius1.connect() current_time = datetime.now() -soc = gen24_registers.scaledStateOfCharge.get(fronius1) +soc = gen24_registers.scaledChaState.get(fronius1) charge_data = [] discharge_data = [] print("Gathering 20 second average of battery Charge") while( (datetime.now() - current_time).seconds < 20): - charge_data.append(gen24_registers.scaledToBattery.get(fronius1)) - discharge_data.append(gen24_registers.scaledFromBattery.get(fronius1)) + charge_data.append(gen24_registers.scaledmodule_3_DCW.get(fronius1)) + discharge_data.append(gen24_registers.scaledmodule_4_DCW.get(fronius1)) avg_charge = statistics.mean(charge_data) avg_discharge = statistics.mean(discharge_data) diff --git a/examples/force_charge.py b/examples/force_charge.py index c63232e..dc23ace 100755 --- a/examples/force_charge.py +++ b/examples/force_charge.py @@ -7,7 +7,7 @@ from pymodbus.client.tcp import ModbusTcpClient fronius1 = ModbusTcpClient("172.19.107.211", port=502, timeout=10) fronius1.connect() -soc = gen24_registers.scaledStateOfCharge.get(fronius1) +soc = gen24_registers.scaledChaState.get(fronius1) print(" SOC: %s%%" % soc) discharge = gen24_registers.scaledOutWRte.get(fronius1) @@ -16,12 +16,12 @@ print("Pre DRate: %d%%" % discharge) charge = gen24_registers.scaledInWRte.get(fronius1) print("Pre CRate: %d%%" % charge) -mode = gen24_registers.StorCtl_Mode.get(fronius1) +mode = gen24_registers.StorCtl_Mod.get(fronius1) print("Pre Mode: %d" % mode) # This should be 'limit discharge' mode print("Setting control mode to limit discharge") -err = gen24_registers.StorCtl_Mode.set(fronius1, 2) +err = gen24_registers.StorCtl_Mod.set(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 @@ -36,5 +36,5 @@ print("Post DRate: %d%%" % discharge) charge = gen24_registers.scaledInWRte.get(fronius1) print("Post CRate: %d%%" % charge) -mode = gen24_registers.StorCtl_Mode.get(fronius1) +mode = gen24_registers.StorCtl_Mod.get(fronius1) print("Post Mode: %d" % mode) diff --git a/examples/read_regs.py b/examples/read_regs.py index ffc9b66..8f7d318 100755 --- a/examples/read_regs.py +++ b/examples/read_regs.py @@ -11,10 +11,10 @@ fronius1.connect() print(" Manufacturer: %s" % gen24_registers.Mn.get(fronius1)) print(" Model: %s" % gen24_registers.Md.get(fronius1)) print(" Version: %s" % gen24_registers.Vr.get(fronius1)) -print(" SOC: %s%%" % gen24_registers.scaledStateOfCharge.get(fronius1)) +print(" SOC: %s%%" % gen24_registers.scaledChaState.get(fronius1)) print("Max DCharg Rate: %d%%" % gen24_registers.scaledOutWRte.get(fronius1)) print("Max Charge Rate: %d%%" % gen24_registers.scaledInWRte.get(fronius1)) -print(" Reserve: %d%%" % gen24_registers.scaledReserve.get(fronius1)) +print(" Reserve: %d%%" % gen24_registers.scaledMinRsvPct.get(fronius1)) print("Max Charge rate: %dW" % gen24_registers.scaledMaxChaRte.get(fronius1)) -print(" Current charge: %dW" % gen24_registers.scaledToBattery.get(fronius1)) -print(" Current dCharg: %dW" % gen24_registers.scaledFromBattery.get(fronius1)) +print(" Current charge: %dW" % gen24_registers.scaledmodule_3_DCW.get(fronius1)) +print(" Current dCharg: %dW" % gen24_registers.scaledmodule_4_DCW.get(fronius1)) diff --git a/examples/reset_charge.py b/examples/reset_charge.py index 3fb3149..560ff52 100755 --- a/examples/reset_charge.py +++ b/examples/reset_charge.py @@ -7,7 +7,7 @@ from pymodbus.client.tcp import ModbusTcpClient fronius1 = ModbusTcpClient("172.19.107.211", port=502, timeout=10) fronius1.connect() -soc = gen24_registers.scaledStateOfCharge.get(fronius1) +soc = gen24_registers.scaledChaState.get(fronius1) print(" SOC: %s%%" % soc) discharge = gen24_registers.scaledOutWRte.get(fronius1) @@ -16,20 +16,20 @@ print("Pre DRate: %d%%" % discharge) charge = gen24_registers.scaledInWRte.get(fronius1) print("Pre CRate: %d%%" % charge) -mode = gen24_registers.StorCtl_Mode.get(fronius1) +mode = gen24_registers.StorCtl_Mod.get(fronius1) print("Pre Mode: %d" % mode) -reserve = gen24_registers.scaledReserve.get(fronius1) +reserve = gen24_registers.scaledMinRsvPct.get(fronius1) print("Pre Res: %d" % reserve) # This should be 'no limits' mode -err = gen24_registers.StorCtl_Mode.set(fronius1, 0) +err = gen24_registers.StorCtl_Mod.set(fronius1, 0) # discharge at 100% allowed charge rate err = gen24_registers.scaledOutWRte.set(fronius1, 100) err = gen24_registers.scaledInWRte.set(fronius1, 100) # charge to 7% -err = gen24_registers.scaledReserve.set(fronius1, 7) +err = gen24_registers.scaledMinRsvPct.set(fronius1, 7) discharge = gen24_registers.scaledOutWRte.get(fronius1) print("Post DRate: %d%%" % discharge) @@ -37,8 +37,8 @@ print("Post DRate: %d%%" % discharge) charge = gen24_registers.scaledInWRte.get(fronius1) print("Post CRate: %d%%" % charge) -mode = gen24_registers.StorCtl_Mode.get(fronius1) +mode = gen24_registers.StorCtl_Mod.get(fronius1) print("Post Mode: %d" % mode) -reserve = gen24_registers.scaledReserve.get(fronius1) +reserve = gen24_registers.scaledMinRsvPct.get(fronius1) print("Post Res: %d" % reserve)