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

96 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Patrick McDonagh
ed19a7d91e Tag Cleanup 2016-08-10 15:13:31 -05:00
Patrick McDonagh
40d02118a5 Updates IP Address in PLC program for behind NAT 2016-08-10 14:14:38 -05:00
Patrick McDonagh
ae150eb329 Updates IP Address in HMI program for behind NAT 2016-08-10 14:03:19 -05:00
Patrick McDonagh
df6a720806 Merge branch 'master' of http://bitbucket.poconsole.net/scm/ipp/pioneer-ipp 
# Conflicts:
#	PWM_Water_Meter_Skid_Rev_HP.ACD
 2016-08-10 12:00:22 -05:00
Patrick McDonagh
6eb942c83c Completes IPP-108, adding 30 second delay timer for High Pressure Switch 2016-08-10 11:59:08 -05:00
Patrick McDonagh
fea4d0ae27 Updates Ignore File 1.1 2016-08-09 18:27:41 -05:00
Patrick McDonagh
994105555a Don't allow a restart if there is an Overload Trip 2016-08-09 18:17:53 -05:00
Patrick McDonagh
8a8d5b2263 Merge branch 'master' of http://bitbucket.poconsole.net/scm/ipp/pioneer-ipp 2016-08-09 15:05:12 -05:00
Patrick McDonagh
f340a0d4db Adds HMI Alarms for Surface Pressure and Flow, Adds Overall Trip Status to main screen 2016-08-09 08:24:15 -05:00
Patrick McDonagh
fef4d613d0 A few logic changes after IPP-105 2016-08-08 22:30:23 -05:00
Patrick McDonagh
58f38aae0f Configured Alarm Setpoints before installing first panel 2016-08-08 09:57:36 -05:00
Patrick McDonagh
a4acae3b80 Completes IPP-103. Adds Flowmeter_HART_Failure. also adds default E300 config spreadsheet 2016-08-03 17:38:13 -05:00
Patrick McDonagh
e0f65927db Adds UPS and HOA Status to README.md 2016-08-03 14:40:14 -05:00
Patrick McDonagh
eea0b46c4e Completes IPP-101 2016-08-02 14:04:59 -05:00
Patrick McDonagh
b4b4c3ca9c A few changes during meeting with Pioneer 2016-08-02 10:23:06 -05:00
Patrick McDonagh
65899e97ef Adds Data Table for Ignition 2016-08-01 15:01:04 -05:00
Patrick McDonagh
b4324d5f8b Completes IPP-98 by adding HOA_Status Integer 2016-08-01 14:36:46 -05:00
Patrick McDonagh
45601dd17c Merged branch master into master 2016-07-29 14:25:26 -05:00
Patrick McDonagh
18487a3eb3 Adds all tags available to SCADA to README.md and excel document 2016-07-29 14:25:17 -05:00
Patrick McDonagh
4b9ccd6b76 Completes IPP-55. Adds ability to reset E300 to defaults 2016-07-26 17:10:06 -05:00
Patrick McDonagh
67af129c36 Completes IPP-96, adds Phase Rotation Trip logic 2016-07-26 15:50:18 -05:00
Patrick McDonagh
78413bb0f3 Completes IPP-82, Adds integer and string tags for Overall Trip and Warning Status. See README.md for mapping. 2016-07-26 11:52:40 -05:00
Patrick McDonagh
49ae52726c Adds README.md 2016-07-26 10:41:52 -05:00