nmelone/MaxWaterSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: nmelone:v2.0.1
Branches Tags
nmelone:master nmelone:vfd-wrapper
nmelone:v2.0.2 nmelone:v2.0.1
...
compare: nmelone:master
Branches Tags
nmelone:master nmelone:vfd-wrapper
nmelone:v2.0.2 nmelone:v2.0.1

22 Commits
v2.0.1 ... master

Author SHA1 Message Date
Joshua Fine
1ed4b717d8 Fixed Totalizer 
Found Rung 3 had a OTL in the shift totals instead of an OTE.  Changed to OTE.  Totalizer working correctly now.
 2018-09-27 11:11:12 -05:00
Patrick McDonagh
18bc87c49b Adds setup file 2018-08-16 15:47:24 -05:00
Patrick McDonagh
722413799e Fix for "Module Not Configured" Error 
Rockwell bullshit
 2018-08-10 13:19:28 -05:00
Patrick McDonagh
915451d945 Fixes PWM Frequency default value 2018-06-27 11:28:51 -05:00
Patrick McDonagh
35a9dd0648 Adds POCloud support for HART totalizer data 2018-06-22 14:35:10 -05:00
Patrick McDonagh
0ebd786962 Turns off Simulation Mode for default 2018-06-22 13:01:30 -05:00
Patrick McDonagh
41badb4348 Adds HART + failover for pressure transmitter 2018-06-22 12:07:03 -05:00
Patrick McDonagh
1fec3011ab Switches Analog IO to HART-enabled 2018-06-21 13:08:56 -05:00
Patrick McDonagh
6aeb27a4fc Merge branch 'master' of https://github.com/Henry-Pump/Max-Water-System 2018-06-14 11:56:21 -05:00
Patrick McDonagh
b9d581b2a1 Fix for PLC-VFD connection after rockwell fucked it up 
- getting "16#0010 Connection Request Error Module Not Configured" error even though module was configured.
- error occurs when Studio5000 upgraded from V30 to V31
 2018-06-14 11:53:37 -05:00
Patrick McDonagh
498f87d4ee Move files and folders around for uniform convention 2018-05-22 11:58:57 -05:00
Patrick McDonagh
2a732036b2 Completes #3. 
Lambda functions move alarms to alarmlog channel
 2018-03-22 15:01:49 -05:00
Patrick McDonagh
2c2cc8bb8d Completes #2 and #1 
Adds lifetime and montly totalizer
 2018-03-21 15:25:11 -05:00
Patrick McDonagh
4f04584265 Adds initial Installation document 2018-03-20 11:20:39 -05:00
Patrick McDonagh
6dac788e93 File Cleanup 2018-03-15 14:37:49 -05:00
Patrick McDonagh
32923324f0 Adds default value to min speed seconds for fault 2018-02-20 14:54:01 -06:00
Patrick McDonagh
9010cda9a4 Successfully completes MAXH2O-88 2018-01-22 10:48:30 -06:00
Patrick McDonagh
4a2ba7ff9d Completes MAXH2O-87 and MAXH2O-88. Increments driver version 2018-01-16 16:53:50 -06:00
Patrick McDonagh
4f076cae2f Merge branch 'master' of https://github.com/Henry-Pump/Max-Water-System 2017-12-21 16:50:46 -06:00
Patrick McDonagh
053ebcd7d4 Patch for more accurate PID level control {MAXH2O-92} 2017-12-21 16:50:43 -06:00
Patrick McDonagh
bcc56fc342 Corrects NTP Code 
Datetime UDT conflict was causing errors.
 2017-12-13 13:27:12 -06:00
Patrick McDonagh
2974f4491d Fix and patch for MAXH2O-84 2017-12-01 15:49:46 -06:00
165 changed files with 47394 additions and 70516 deletions
Expand all files Collapse all files

BIN
AdvancedVFDIPP.mer
View File

Binary file not shown.

9584
Advanced_VFD_IPP.ACD
View File

File diff suppressed because one or more lines are too long

10065
Advanced_VFD_IPP_L19.ACD
View File

File diff suppressed because one or more lines are too long

10933
Advanced_VFD_IPP_L19_PF753.ACD
View File

File diff suppressed because one or more lines are too long

18256
MaxWaterSystem.ACD
View File

File diff suppressed because one or more lines are too long

17822
MaxWaterSystem_L24.ACD
View File

File diff suppressed because one or more lines are too long

17730
MaxWaterSystem_SetUp.ACD Normal file
View File

File diff suppressed because one or more lines are too long

16520
PLC/MaxWaterSystem.ACD Normal file
View File

File diff suppressed because one or more lines are too long

0
HP_DOWNHOLE_SENSOR_PERF/APPLICOM.INI → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/APPLICOM.INI
View File

0
HP_DOWNHOLE_SENSOR_PERF/Adminmsg.041 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.041
View File

0
HP_DOWNHOLE_SENSOR_PERF/Adminmsg.042 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.042
View File

0
HP_DOWNHOLE_SENSOR_PERF/Adminmsg.043 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.043
View File

0
HP_DOWNHOLE_SENSOR_PERF/Adminmsg.044 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.044
View File

0
HP_DOWNHOLE_SENSOR_PERF/Adminmsg.045 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.045
View File

0
HP_DOWNHOLE_SENSOR_PERF/Adminmsg.046 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.046
View File

0
HP_DOWNHOLE_SENSOR_PERF/Adminmsg.047 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.047
View File

0
HP_DOWNHOLE_SENSOR_PERF/Adminmsg.048 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Adminmsg.048
View File

0
HP_DOWNHOLE_SENSOR_PERF/BACKPLANE.PLY → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/BACKPLANE.PLY
View File

0
HP_DOWNHOLE_SENSOR_PERF/C1C1.xml → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/C1C1.xml
View File

0
HP_DOWNHOLE_SENSOR_PERF/C1C2.xml → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/C1C2.xml
View File

0
HP_DOWNHOLE_SENSOR_PERF/CNFMAST.001 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFMAST.001
View File

0
HP_DOWNHOLE_SENSOR_PERF/CNFMAST.011 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFMAST.011
View File

0
HP_DOWNHOLE_SENSOR_PERF/CNFMAST.021 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFMAST.021
View File

0
HP_DOWNHOLE_SENSOR_PERF/CNFSCH01.111 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFSCH01.111
View File

0
HP_DOWNHOLE_SENSOR_PERF/CNFSCH01.121 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFSCH01.121
View File

0
HP_DOWNHOLE_SENSOR_PERF/CNFSERV.101 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFSERV.101
View File

0
HP_DOWNHOLE_SENSOR_PERF/CNFSERV.111 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFSERV.111
View File

0
HP_DOWNHOLE_SENSOR_PERF/CNFSERV.121 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/CNFSERV.121
View File

0
HP_DOWNHOLE_SENSOR_PERF/Config.xml → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Config.xml
View File

0
HP_DOWNHOLE_SENSOR_PERF/ConfigName.txt → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/ConfigName.txt
View File

0
HP_DOWNHOLE_SENSOR_PERF/DescCnf.ini → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/DescCnf.ini
View File

0
HP_DOWNHOLE_SENSOR_PERF/ExtConf.10 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/ExtConf.10
View File

0
HP_DOWNHOLE_SENSOR_PERF/ExtConf.11 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/ExtConf.11
View File

0
HP_DOWNHOLE_SENSOR_PERF/ExtConf.12 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/ExtConf.12
View File

0
HP_DOWNHOLE_SENSOR_PERF/FCTMAPP.TXT → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/FCTMAPP.TXT
View File

0
HP_DOWNHOLE_SENSOR_PERF/Filters.ini → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Filters.ini
View File

0
HP_DOWNHOLE_SENSOR_PERF/GlobalData.cnf → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/GlobalData.cnf
View File

0
HP_DOWNHOLE_SENSOR_PERF/Log.txt → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Log.txt
View File

0
HP_DOWNHOLE_SENSOR_PERF/PrivDesc.xml → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/PrivDesc.xml
View File

0
HP_DOWNHOLE_SENSOR_PERF/REPORTDIAG1.LST → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/REPORTDIAG1.LST
View File

0
HP_DOWNHOLE_SENSOR_PERF/Topics.xml → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/Topics.xml
View File

0
HP_DOWNHOLE_SENSOR_PERF/UTILS.INI → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/UTILS.INI
View File

0
HP_DOWNHOLE_SENSOR_PERF/appcnfg.ini → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/appcnfg.ini
View File

0
HP_DOWNHOLE_SENSOR_PERF/appusr.ini → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/appusr.ini
View File

0
HP_DOWNHOLE_SENSOR_PERF/confapli.ap1 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap1
View File

0
HP_DOWNHOLE_SENSOR_PERF/confapli.ap2 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap2
View File

0
HP_DOWNHOLE_SENSOR_PERF/confapli.ap3 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap3
View File

0
HP_DOWNHOLE_SENSOR_PERF/confapli.ap4 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap4
View File

0
HP_DOWNHOLE_SENSOR_PERF/confapli.ap5 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap5
View File

0
HP_DOWNHOLE_SENSOR_PERF/confapli.ap6 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap6
View File

0
HP_DOWNHOLE_SENSOR_PERF/confapli.ap7 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap7
View File

0
HP_DOWNHOLE_SENSOR_PERF/confapli.ap8 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.ap8
View File

0
HP_DOWNHOLE_SENSOR_PERF/confapli.sy1 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confapli.sy1
View File

0
HP_DOWNHOLE_SENSOR_PERF/confcyc.ap1 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap1
View File

0
HP_DOWNHOLE_SENSOR_PERF/confcyc.ap2 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap2
View File

0
HP_DOWNHOLE_SENSOR_PERF/confcyc.ap3 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap3
View File

0
HP_DOWNHOLE_SENSOR_PERF/confcyc.ap4 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap4
View File

0
HP_DOWNHOLE_SENSOR_PERF/confcyc.ap5 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap5
View File

0
HP_DOWNHOLE_SENSOR_PERF/confcyc.ap6 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap6
View File

0
HP_DOWNHOLE_SENSOR_PERF/confcyc.ap7 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap7
View File

0
HP_DOWNHOLE_SENSOR_PERF/confcyc.ap8 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/confcyc.ap8
View File

0
HP_DOWNHOLE_SENSOR_PERF/config10.lst → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/config10.lst
View File

0
HP_DOWNHOLE_SENSOR_PERF/config11.lst → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/config11.lst
View File

0
HP_DOWNHOLE_SENSOR_PERF/config12.lst → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/config12.lst
View File

0
HP_DOWNHOLE_SENSOR_PERF/cyclic10.lst → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/cyclic10.lst
View File

0
HP_DOWNHOLE_SENSOR_PERF/cyclic11.lst → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/cyclic11.lst
View File

0
HP_DOWNHOLE_SENSOR_PERF/cyclic12.lst → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/cyclic12.lst
View File

0
HP_DOWNHOLE_SENSOR_PERF/database.ini → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/database.ini
View File

0
HP_DOWNHOLE_SENSOR_PERF/genconf.lst → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/genconf.lst
View File

0
HP_DOWNHOLE_SENSOR_PERF/motor.ini → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/motor.ini
View File

0
HP_DOWNHOLE_SENSOR_PERF/msg.041 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_PERF/msg.041
View File

0
HP_DOWNHOLE_SENSOR_STD/APPLICOM.INI → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/APPLICOM.INI
View File

0
HP_DOWNHOLE_SENSOR_STD/Adminmsg.041 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.041
View File

0
HP_DOWNHOLE_SENSOR_STD/Adminmsg.042 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.042
View File

0
HP_DOWNHOLE_SENSOR_STD/Adminmsg.043 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.043
View File

0
HP_DOWNHOLE_SENSOR_STD/Adminmsg.044 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.044
View File

0
HP_DOWNHOLE_SENSOR_STD/Adminmsg.045 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.045
View File

0
HP_DOWNHOLE_SENSOR_STD/Adminmsg.046 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.046
View File

0
HP_DOWNHOLE_SENSOR_STD/Adminmsg.047 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.047
View File

0
HP_DOWNHOLE_SENSOR_STD/Adminmsg.048 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Adminmsg.048
View File

0
HP_DOWNHOLE_SENSOR_STD/BACKPLANE.PLY → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/BACKPLANE.PLY
View File

0
HP_DOWNHOLE_SENSOR_STD/C1C1.xml → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/C1C1.xml
View File

0
HP_DOWNHOLE_SENSOR_STD/C1C2.xml → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/C1C2.xml
View File

0
HP_DOWNHOLE_SENSOR_STD/CNFMAST.001 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFMAST.001
View File

0
HP_DOWNHOLE_SENSOR_STD/CNFMAST.011 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFMAST.011
View File

0
HP_DOWNHOLE_SENSOR_STD/CNFMAST.021 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFMAST.021
View File

0
HP_DOWNHOLE_SENSOR_STD/CNFSCH01.111 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFSCH01.111
View File

0
HP_DOWNHOLE_SENSOR_STD/CNFSCH01.121 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFSCH01.121
View File

0
HP_DOWNHOLE_SENSOR_STD/CNFSERV.101 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFSERV.101
View File

0
HP_DOWNHOLE_SENSOR_STD/CNFSERV.111 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFSERV.111
View File

0
HP_DOWNHOLE_SENSOR_STD/CNFSERV.121 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/CNFSERV.121
View File

0
HP_DOWNHOLE_SENSOR_STD/Config.xml → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Config.xml
View File

0
HP_DOWNHOLE_SENSOR_STD/ConfigName.txt → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/ConfigName.txt
View File

0
HP_DOWNHOLE_SENSOR_STD/DescCnf.ini → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/DescCnf.ini
View File

0
HP_DOWNHOLE_SENSOR_STD/ExtConf.10 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/ExtConf.10
View File

0
HP_DOWNHOLE_SENSOR_STD/ExtConf.11 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/ExtConf.11
View File

0
HP_DOWNHOLE_SENSOR_STD/ExtConf.12 → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/ExtConf.12
View File

0
HP_DOWNHOLE_SENSOR_STD/FCTMAPP.TXT → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/FCTMAPP.TXT
View File

0
HP_DOWNHOLE_SENSOR_STD/Filters.ini → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/Filters.ini
View File

0
HP_DOWNHOLE_SENSOR_STD/GlobalData.cnf → PLC/ModbusCardConfig/HP_DOWNHOLE_SENSOR_STD/GlobalData.cnf
View File

Some files were not shown because too many files have changed in this diff Show More