nmelone/HenryPump-Drivers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates to Piflow, removed html folders

Browse Source
This commit is contained in:
Nico Melone
2020-05-29 12:13:07 -05:00
parent eb1f7bc33c
commit eb7da58d75
66 changed files with 401 additions and 3505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dual_flowmeter/Tags.py
View File

@@ -3,7 +3,7 @@ from dual_flowmeter import PLC_IP_ADDRESS
tags = [
PLCChannel(PLC_IP_ADDRESS, "pump_1_daily_total","Pump_1_Daily_Flow_Rate_Total","REAL", 100, 3600, plc_type="Micro800"),
PLCChannel(PLC_IP_ADDRESS, "pump_1_run_status","Pump_1_Run_Status","BOOL", 1, 3600, plc_type="Micro800", map_={0: "Off", 1: "On"}),
PLCChannel(PLC_IP_ADDRESS, "pump_1_run_status","Pump_1_Run_Status","BOOL", 1, 3600, plc_type="Micro800", map_={0: "Off", 1: "On", None: "N/A"}),
PLCChannel(PLC_IP_ADDRESS, "pump_1_flowrate","Pump_1_SCL_Flow_Meter","REAL", 1000, 3600, plc_type="Micro800"),
PLCChannel(PLC_IP_ADDRESS, "pump_1_yesterdays_total","Pump_1_Yesterdays_Total","REAL", 1000, 3600, plc_type="Micro800"),
PLCChannel(PLC_IP_ADDRESS, "pump_1_prevmonth_total","Pump_1_PrevMonth_Total","REAL", 1000, 3600, plc_type="Micro800"),
@@ -11,7 +11,7 @@ tags = [
PLCChannel(PLC_IP_ADDRESS, "pump_1_lifetime_total","Pump_1_Lifetime_Flow","REAL", 1000, 3600, plc_type="Micro800"),
PLCChannel(PLC_IP_ADDRESS, "pump_1_suction","Suction_PSI_TP1_Scaled","REAL", 10, 3600, plc_type="Micro800"),
PLCChannel(PLC_IP_ADDRESS, "pump_2_daily_total","Pump_2_Daily_Flow_Rate_Total","REAL", 100, 3600, plc_type="Micro800"),
PLCChannel(PLC_IP_ADDRESS, "pump_2_run_status","Pump_2_Run_Status","BOOL", 1, 3600, plc_type="Micro800", map_={0: "Off", 1: "On"}),
PLCChannel(PLC_IP_ADDRESS, "pump_2_run_status","Pump_2_Run_Status","BOOL", 1, 3600, plc_type="Micro800", map_={0: "Off", 1: "On", None: "N/A"}),
PLCChannel(PLC_IP_ADDRESS, "pump_2_flowrate","Pump_2_SCL_Flow_Meter","REAL", 1000, 3600, plc_type="Micro800"),
PLCChannel(PLC_IP_ADDRESS, "pump_2_yesterdays_total","Pump_2_Yesterdays_Total","REAL", 1000, 3600, plc_type="Micro800"),
PLCChannel(PLC_IP_ADDRESS, "pump_2_prevmonth_total","Pump_2_PrevMonth_Total","REAL", 1000, 3600, plc_type="Micro800"),
@@ -21,5 +21,5 @@ tags = [
PLCChannel(PLC_IP_ADDRESS, "pump_charge_psi_tp1", "Charge_PSI_TP1_Scaled", "REAL", 10, 3600, plc_type="Micro800"),
PLCChannel(PLC_IP_ADDRESS, "pond_1_height", "Pond_level_tp1_scaled", "REAL", 2, 3600, plc_type="Micro800"),
PLCChannel(PLC_IP_ADDRESS, "pond_1_volume", "pond1volume", "REAL", 100000, 3600, plc_type="Micro800"),
PLCChannel(PLC_IP_ADDRESS, "charge_pump_run_status","CHARGE_PUMP_Run_Status","BOOL", 1, 3600, plc_type="Micro800", map_={0: "Off", 1: "On"})
PLCChannel(PLC_IP_ADDRESS, "charge_pump_run_status","CHARGE_PUMP_Run_Status","BOOL", 1, 3600, plc_type="Micro800", map_={0: "Off", 1: "On", None: "N/A"})
]

2
dual_flowmeter/config.txt
View File

@@ -8,7 +8,7 @@
"file4": "Tags.py"
},
"deviceName": "dual_flowmeter",
"releaseVersion": "8",
"releaseVersion": "9",
"driverFileName": "dual_flowmeter.py",
"driverId": "0100"
}

18
dual_flowmeter/dual_flowmeter.py
View File

@@ -10,7 +10,19 @@ from Channel import PLCChannel, ModbusChannel,read_tag, write_tag, TAG_DATAERROR
import persistence
from utilities import get_public_ip_address
from file_logger import filelogger as log
PLC_IP_ADDRESS = "192.168.1.12"
# PERSISTENCE FILE
PERSIST = persistence.load('persist.json')
if not PERSIST:
PERSIST = { "plc_ip" : "192.168.1.12" }
persistence.store(PERSIST, 'persist.json')
try:
PLC_IP_ADDRESS = PERSIST["plc_ip"]
except Exception as e:
PERSIST["plc_ip"] = "192.168.1.12"
PLC_IP_ADDRESS = PERSIST["plc_ip"]
persistence.store(PERSIST,"persist.json")
from Tags import tags
_ = None
@@ -26,8 +38,6 @@ WATCHDOG_SEND_PERIOD = 3600 # Seconds, the longest amount of time before sendin
CHANNELS = tags
# PERSISTENCE FILE
PERSIST = persistence.load()
class start(threading.Thread, deviceBase):
@@ -42,7 +52,7 @@ class start(threading.Thread, deviceBase):
mqtt=mqtt, Nodes=Nodes)
self.daemon = True
self.version = "8"
self.version = "9"
self.finished = threading.Event()
self.force_send = False
self.public_ip_address = ""