From 9564016bc909a000b15f16295fc22daf2be5c6e5 Mon Sep 17 00:00:00 2001 From: Nico Melone Date: Tue, 24 Mar 2020 14:10:42 -0500 Subject: [PATCH] added 525 capabilities --- piflow/VFD525/PiFlow.py | 4 ++-- piflow/VFD525/Tags.py | 1 + piflow/VFD525/config.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/piflow/VFD525/PiFlow.py b/piflow/VFD525/PiFlow.py index 2d93c87..bdc1fd3 100644 --- a/piflow/VFD525/PiFlow.py +++ b/piflow/VFD525/PiFlow.py @@ -48,7 +48,7 @@ except: persistence.store(PERSIST) try: - isVFD = PERSIST['plc_ip'] + plc_ip = PERSIST['plc_ip'] except: PERSIST['plc_ip'] = '192.168.1.12' persistence.store(PERSIST) @@ -69,7 +69,7 @@ class start(threading.Thread, deviceBase): mqtt=mqtt, Nodes=Nodes) self.daemon = True - self.version = "21" + self.version = "22" self.finished = threading.Event() self.force_send = False self.public_ip_address = "" diff --git a/piflow/VFD525/Tags.py b/piflow/VFD525/Tags.py index 5d9c00b..4ec6114 100644 --- a/piflow/VFD525/Tags.py +++ b/piflow/VFD525/Tags.py @@ -41,6 +41,7 @@ if isVFD: PLCChannel(plc_ip,'volume_flow','Val_FlowmeterFR','REAL',5,3600,plc_type='Micro800'), PLCChannel(plc_ip,'current','val_VFD_OutputCurrent','REAL',5,3600,plc_type='Micro800'), PLCChannel(plc_ip,'frequency','val_VFD_ActualSpeed','REAL',5,3600,plc_type='Micro800'), + PLCChannel(plc_ip,'pid_feedback','val_FluidLevel','REAL',5,3600,plc_type='Micro800'), PLCChannel(plc_ip,'totalizer_1','Val_FlowMeterT1','REAL',5,3600,plc_type='Micro800'), PLCChannel(plc_ip,'totalizer_2','Val_FlowMeterT2','REAL',5,3600,plc_type='Micro800'), PLCChannel(plc_ip,'totalizer_3','Val_FlowMeterT3','REAL',5,3600,plc_type='Micro800'), diff --git a/piflow/VFD525/config.txt b/piflow/VFD525/config.txt index ade265f..002e3b9 100644 --- a/piflow/VFD525/config.txt +++ b/piflow/VFD525/config.txt @@ -3,7 +3,7 @@ "driverFileName":"PiFlow.py", "deviceName":"piflow", "driverId":"0280", -"releaseVersion":"21", +"releaseVersion":"22", "files": { "file1":"PiFlow.py", "file2":"Channel.py",