nmelone/MaxWaterSystem-PWM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119 Commits 1 Branch 1 Tag
3ee9930fd51a28eba2831f1b78bffe8ebac55977
Commit Graph

119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick McDonagh
3ee9930fd5 Fix for E300 not resetting in combined PLC program 2018-06-12 15:01:43 -05:00
Patrick McDonagh
3623c22a6e Fixes missing IO in PLC Program 2018-06-11 13:41:33 -05:00
Patrick McDonagh
60b8fec16c Organizes files 2018-05-22 12:00:33 -05:00
Patrick McDonagh
603f73f234 Merge branch 'master' of https://github.com/Henry-Pump/MaxWaterSystem-PWM 2018-05-01 13:18:45 -05:00
Patrick McDonagh
ef2a9c0766 Fix High Pressure Alarm Latch 
was using OTL instead of OTE
 2018-05-01 13:18:40 -05:00
Patrick McDonagh
df9399b982 Merge branch 'master' of https://github.com/Henry-Pump/Pioneer-IPP 2018-04-24 17:01:24 -05:00
Patrick McDonagh
8c9db06624 More fixes for broken buttons 2018-04-24 17:01:18 -05:00
Patrick McDonagh
3b7418fb13 Merge branch 'master' of https://github.com/Henry-Pump/MaxWaterSystem-PWM 2018-04-24 16:59:33 -05:00
Patrick McDonagh
8869c9a054 Adds backup file for radio, fixes for first WW install 2018-04-24 16:59:24 -05:00
Patrick McDonagh
1beb395dd7 Fix broken buttons 2018-04-24 15:27:51 -05:00
Patrick McDonagh
67afba71da Updates NAT file 2018-04-23 15:20:07 -05:00
Patrick McDonagh
88c5d423c8 A few changes after testing. 
- disables HMI stuff for DH sensor if DH sensor disabled
 2018-03-23 16:33:06 -05:00
Patrick McDonagh
8df6c024d5 Set theme jekyll-theme-slate 2018-03-21 11:59:57 -05:00
Patrick McDonagh
7695b80f42 Add docs folder for github pages 2018-03-21 11:56:26 -05:00
Patrick McDonagh
f7018d40c5 Completes MAXH2O-33, MAXH2O-40, MAXH2O-43, and MAXH2O-50. 2017-11-14 08:58:33 -06:00
Patrick McDonagh
6a108b5a64 MAXH2O-30, MAXH2O-31, MAXH2O-34, MAXH2O-35, MAXH2O-36, MAXH2O-39, MAXH2O-43 complete. Work on MAXH2O-33, MAXH2O-42, MAXH2O-40. 2017-11-07 18:33:54 -06:00
Patrick McDonagh
0108c1a459 adds ability to enable analog dh sensor 2017-10-03 16:09:21 -05:00
Patrick McDonagh
a736ba6c52 Fixes a few errors in scaling 2017-10-03 15:52:38 -05:00
Patrick McDonagh
2cc56b4b02 Removes empty rung 2017-06-27 16:34:35 -05:00
Patrick McDonagh
a3ae505db7 Add temporary registers to make troubleshooting and swapping easy 2017-06-27 16:07:59 -05:00
Patrick McDonagh
82bedc2cfc Adds initial file for testing Baker Hughes DH Probe 2017-06-27 16:00:05 -05:00
Patrick McDonagh
4ae3ab9253 Adds new All Analog program for testing 2017-05-31 14:43:53 -05:00
Patrick McDonagh
fbd2b41b52 Moves cfg_Flowmeter type to Controller Scope 2017-04-03 16:02:58 -05:00
Patrick McDonagh
d1e3e56393 Updated file to fix security issue 2017-03-29 17:49:47 -05:00
Patrick McDonagh
2c84acae4a Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	PWM_Water_Meter_Skid_Rev_HP.ACD
 2017-03-29 12:47:58 -05:00
Patrick McDonagh
a358501870 Updated to add modbus flowmeter logic 2017-03-29 12:46:23 -05:00
Patrick McDonagh
5aa8089ceb Changes Downhole Sensor Node ID to 234 
For default out-of-box configuration
 2017-03-10 13:37:05 -06:00
Patrick McDonagh
bc60b1ce48 Fixes a few graphics issues 2016-10-17 17:19:25 -05:00
Patrick McDonagh
e36171770a Corrects analog calculation for Tubing Pressure 2016-10-13 11:18:28 -05:00
Patrick McDonagh
093112e716 Removes old NAT config file 2016-10-06 16:42:50 -05:00
Patrick McDonagh
18896abfc6 Creates new Freshwater Well program 2016-09-27 10:23:31 -05:00
Patrick McDonagh
926b2dcaf6 Fix for IPP-163, adds 30 second delay to lightning arrestor trip 2016-09-26 16:47:49 -05:00
Patrick McDonagh
3f159ceb9a Fixes IPP-160 and IPP-161 
Tubing pressure failure was using wrong channel, alarms were looking at wrong tubing pressure value
 2016-09-22 14:40:58 -05:00
Patrick McDonagh
e1f538d108 Adds default NAT config with firewall disabled 2016-09-20 10:30:31 -05:00
Patrick McDonagh
79a6ad4ec5 Updated files and added files for automatic configuration of PLC and HMI 2016-09-15 16:54:43 -05:00
Patrick McDonagh
d43d4ebc30 Fixes Tubing Pressure Start Permissive text overflow and missing animation 2016-09-13 13:12:03 -05:00
Patrick McDonagh
1b917792b2 Completes IPP-145. Device will show indication of Tubing Pressure holding out start when pressure switch is tripped 2016-09-09 14:49:26 -05:00
Patrick McDonagh
38f834c0f4 Completes IPP-142, smart calculation of Tubing Pressure 2016-09-08 18:06:04 -05:00
Patrick McDonagh
bd0b90a867 Merge branch 'master' of http://bitbucket.poconsole.net/scm/ipp/pioneer-ipp 2016-08-31 12:55:32 -05:00
Patrick McDonagh
1499823707 Updated NAT rules 
Set default NAT address to 192.168.1.39, change DL Port mapping to 8022 from 22
 2016-08-31 11:19:31 -05:00
Patrick McDonagh
2423970939 Revert "Updates NAT config file" 
This reverts commit a43f80cd2e.
 2016-08-30 09:42:55 -05:00
Patrick McDonagh
a43f80cd2e Updates NAT config file 2016-08-26 15:11:08 -05:00
Patrick McDonagh
226fa60bd3 adds Minutes and Seconds until startup 2016-08-19 17:10:04 -05:00
Patrick McDonagh
cabd5046c8 Fixes DH Status always reading 0 2016-08-18 16:18:15 -05:00
Patrick McDonagh
a038f783df Completes IPP-129 2016-08-18 14:16:52 -05:00
Patrick McDonagh
94204c1958 Fixes Pioneer IPP-125, IPP-126, IPP-127, IPP-128 2016-08-17 17:03:43 -05:00
Patrick McDonagh
e3198efa7e Adds Overall_Trip_Status_Timestamp per IPP-124 2016-08-15 18:27:05 -05:00
Patrick McDonagh
373a8bdfda Sets the starting flow totalizing values to 0 2016-08-15 16:36:21 -05:00
Patrick McDonagh
5573de4a88 Adds default configuration file for NAT 2016-08-11 14:51:49 -05:00
Patrick McDonagh
6e03647d38 Completes IPP-110, IPP-111, IPP-112. Display for %FLA, Fix for not reading Frequency or Phase Rotation 2016-08-10 19:22:30 -05:00