Merge branch 'master' of https://github.com/Henry-Pump/Max-Water-System

2018-06-14 11:56:21 -05:00
parent b9d581b2a1 498f87d4ee
commit 6aeb27a4fc
140 changed files with 0 additions and 4 deletions
--- a/Testing/test_pid.py
+++ b/Testing/test_pid.py
@@ -1,4 +0,0 @@
-"""Simulate a water well."""
-
-
-flowrate_in = 100  # GPM, typically unknown and changing
--- a/PLC/MaxWaterSystem.ACD
+++ b/PLC/MaxWaterSystem.ACD
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/APPLICOM.INI
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/APPLICOM.INI
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.041
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.041
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.042
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.042
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.043
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.043
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.044
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.044
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.045
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.045
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.046
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.046
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.047
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.047
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.048
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.048
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/BACKPLANE.PLY
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/BACKPLANE.PLY
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/C1C1.xml
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/C1C1.xml
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/C1C2.xml
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/C1C2.xml
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFMAST.001
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFMAST.001
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFMAST.011
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFMAST.011
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFMAST.021
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFMAST.021
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFSCH01.111
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFSCH01.111
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFSCH01.121
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFSCH01.121
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFSERV.101
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFSERV.101
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFSERV.111
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFSERV.111
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFSERV.121
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFSERV.121
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Config.xml
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Config.xml
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/ConfigName.txt
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/ConfigName.txt
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/DescCnf.ini
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/DescCnf.ini
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/ExtConf.10
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/ExtConf.10
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/ExtConf.11
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/ExtConf.11
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/ExtConf.12
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/ExtConf.12
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/FCTMAPP.TXT
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/FCTMAPP.TXT
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Filters.ini
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Filters.ini
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/GlobalData.cnf
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/GlobalData.cnf
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Log.txt
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Log.txt
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/PrivDesc.xml
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/PrivDesc.xml
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/REPORTDIAG1.LST
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/REPORTDIAG1.LST
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Topics.xml
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Topics.xml
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/UTILS.INI
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/UTILS.INI
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/appcnfg.ini
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/appcnfg.ini
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/appusr.ini
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/appusr.ini
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap1
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap1
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap2
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap2
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap3
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap3
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap4
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap4
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap5
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap5
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap6
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap6
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap7
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap7
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap8
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap8
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.sy1
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.sy1
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap1
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap1
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap2
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap2
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap3
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap3
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap4
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap4
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap5
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap5
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap6
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap6
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap7
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap7
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap8
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap8
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/config10.lst
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/config10.lst
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/config11.lst
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/config11.lst
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/config12.lst
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/config12.lst
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/cyclic10.lst
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/cyclic10.lst
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/cyclic11.lst
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/cyclic11.lst
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/cyclic12.lst
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/cyclic12.lst
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/database.ini
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/database.ini
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/genconf.lst
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/genconf.lst
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/motor.ini
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/motor.ini
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/msg.041
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/msg.041
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/APPLICOM.INI
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/APPLICOM.INI
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.041
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.041
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.042
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.042
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.043
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.043
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.044
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.044
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.045
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.045
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.046
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.046
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.047
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.047
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.048
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.048
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/BACKPLANE.PLY
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/BACKPLANE.PLY
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/C1C1.xml
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/C1C1.xml
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/C1C2.xml
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/C1C2.xml
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFMAST.001
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFMAST.001
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFMAST.011
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFMAST.011
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFMAST.021
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFMAST.021
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFSCH01.111
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFSCH01.111
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFSCH01.121
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFSCH01.121
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFSERV.101
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFSERV.101
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFSERV.111
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFSERV.111
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFSERV.121
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFSERV.121
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Config.xml
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Config.xml
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/ConfigName.txt
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/ConfigName.txt
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/DescCnf.ini
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/DescCnf.ini
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/ExtConf.10
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/ExtConf.10
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/ExtConf.11
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/ExtConf.11
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/ExtConf.12
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/ExtConf.12
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/FCTMAPP.TXT
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/FCTMAPP.TXT
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Filters.ini
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Filters.ini
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/GlobalData.cnf
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/GlobalData.cnf
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Log.txt
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Log.txt
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/PrivDesc.xml
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/PrivDesc.xml
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/REPORTDIAG1.LST
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/REPORTDIAG1.LST
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/SynCyc1.ini
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/SynCyc1.ini
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Topics.xml
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Topics.xml
--- a/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/UTILS.INI
+++ b/PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/UTILS.INI
--- a/Show More
+++ b/Show More