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

Commit Graph

  • 41b9dd4736 Fixed High Pressure Switch Alarm Latch master Joshua Fine 2018-09-18 16:29:09 -05:00
  • 1bb1355c21 Unknown Trev1919 2018-09-04 09:59:05 -05:00
  • 3ee9930fd5 Fix for E300 not resetting in combined PLC program Patrick McDonagh 2018-06-12 15:01:43 -05:00
  • 3623c22a6e Fixes missing IO in PLC Program Patrick McDonagh 2018-06-11 13:41:33 -05:00
  • 60b8fec16c Organizes files Patrick McDonagh 2018-05-22 12:00:33 -05:00
  • 603f73f234 Merge branch 'master' of https://github.com/Henry-Pump/MaxWaterSystem-PWM Patrick McDonagh 2018-05-01 13:18:45 -05:00
  • ef2a9c0766 Fix High Pressure Alarm Latch Patrick McDonagh 2018-05-01 13:18:40 -05:00
  • df9399b982 Merge branch 'master' of https://github.com/Henry-Pump/Pioneer-IPP Patrick McDonagh 2018-04-24 17:01:24 -05:00
  • 8c9db06624 More fixes for broken buttons Patrick McDonagh 2018-04-24 17:01:18 -05:00
  • 3b7418fb13 Merge branch 'master' of https://github.com/Henry-Pump/MaxWaterSystem-PWM Patrick McDonagh 2018-04-24 16:59:33 -05:00
  • 8869c9a054 Adds backup file for radio, fixes for first WW install Patrick McDonagh 2018-04-24 16:59:24 -05:00
  • 1beb395dd7 Fix broken buttons Patrick McDonagh 2018-04-24 15:27:51 -05:00
  • 67afba71da Updates NAT file Patrick McDonagh 2018-04-23 15:20:07 -05:00
  • 88c5d423c8 A few changes after testing. Patrick McDonagh 2018-03-23 16:33:06 -05:00
  • 8df6c024d5 Set theme jekyll-theme-slate Patrick McDonagh 2018-03-21 11:59:57 -05:00
  • 7695b80f42 Add docs folder for github pages Patrick McDonagh 2018-03-21 11:56:26 -05:00
  • f7018d40c5 Completes MAXH2O-33, MAXH2O-40, MAXH2O-43, and MAXH2O-50. Patrick McDonagh 2017-11-14 08:58:33 -06:00
  • 6a108b5a64 MAXH2O-30, MAXH2O-31, MAXH2O-34, MAXH2O-35, MAXH2O-36, MAXH2O-39, MAXH2O-43 complete. Work on MAXH2O-33, MAXH2O-42, MAXH2O-40. Patrick McDonagh 2017-11-07 18:33:54 -06:00
  • 0108c1a459 adds ability to enable analog dh sensor Patrick McDonagh 2017-10-03 16:09:21 -05:00
  • a736ba6c52 Fixes a few errors in scaling Patrick McDonagh 2017-10-03 15:52:38 -05:00
  • 2cc56b4b02 Removes empty rung Patrick McDonagh 2017-06-27 16:34:35 -05:00
  • a3ae505db7 Add temporary registers to make troubleshooting and swapping easy Patrick McDonagh 2017-06-27 16:07:59 -05:00
  • 82bedc2cfc Adds initial file for testing Baker Hughes DH Probe Patrick McDonagh 2017-06-27 16:00:05 -05:00
  • 4ae3ab9253 Adds new All Analog program for testing Patrick McDonagh 2017-05-31 14:43:43 -05:00
  • fbd2b41b52 Moves cfg_Flowmeter type to Controller Scope Patrick McDonagh 2017-04-03 16:02:58 -05:00
  • d1e3e56393 Updated file to fix security issue Patrick McDonagh 2017-03-29 17:49:47 -05:00
  • 2c84acae4a Merge remote-tracking branch 'origin/master' Patrick McDonagh 2017-03-29 12:47:58 -05:00
  • a358501870 Updated to add modbus flowmeter logic Patrick McDonagh 2017-03-29 12:46:23 -05:00
  • 5aa8089ceb Changes Downhole Sensor Node ID to 234 Patrick McDonagh 2017-03-10 13:37:05 -06:00
  • bc60b1ce48 Fixes a few graphics issues Patrick McDonagh 2016-10-17 17:19:25 -05:00
  • e36171770a Corrects analog calculation for Tubing Pressure Patrick McDonagh 2016-10-13 11:18:28 -05:00
  • 093112e716 Removes old NAT config file Patrick McDonagh 2016-10-06 16:42:50 -05:00
  • 18896abfc6 Creates new Freshwater Well program Patrick McDonagh 2016-09-27 10:23:31 -05:00
  • 926b2dcaf6 Fix for IPP-163, adds 30 second delay to lightning arrestor trip Patrick McDonagh 2016-09-26 16:47:49 -05:00
  • 3f159ceb9a Fixes IPP-160 and IPP-161 Tubing pressure failure was using wrong channel, alarms were looking at wrong tubing pressure value Patrick McDonagh 2016-09-22 14:40:58 -05:00
  • e1f538d108 Adds default NAT config with firewall disabled Patrick McDonagh 2016-09-20 10:30:31 -05:00
  • 79a6ad4ec5 Updated files and added files for automatic configuration of PLC and HMI Patrick McDonagh 2016-09-15 16:54:43 -05:00
  • d43d4ebc30 Fixes Tubing Pressure Start Permissive text overflow and missing animation Patrick McDonagh 2016-09-13 13:12:03 -05:00
  • 1b917792b2 Completes IPP-145. Device will show indication of Tubing Pressure holding out start when pressure switch is tripped Patrick McDonagh 2016-09-09 14:49:26 -05:00
  • 38f834c0f4 Completes IPP-142, smart calculation of Tubing Pressure Patrick McDonagh 2016-09-08 18:06:04 -05:00
  • bd0b90a867 Merge branch 'master' of http://bitbucket.poconsole.net/scm/ipp/pioneer-ipp Patrick McDonagh 2016-08-31 12:55:32 -05:00
  • 1499823707 Updated NAT rules Set default NAT address to 192.168.1.39, change DL Port mapping to 8022 from 22 Patrick McDonagh 2016-08-31 11:19:31 -05:00
  • 2423970939 Revert "Updates NAT config file" Patrick McDonagh 2016-08-30 09:42:55 -05:00
  • a43f80cd2e Updates NAT config file Patrick McDonagh 2016-08-26 15:11:08 -05:00
  • 226fa60bd3 adds Minutes and Seconds until startup Patrick McDonagh 2016-08-19 17:10:04 -05:00
  • cabd5046c8 Fixes DH Status always reading 0 Patrick McDonagh 2016-08-18 16:18:15 -05:00
  • a038f783df Completes IPP-129 Patrick McDonagh 2016-08-18 14:16:52 -05:00
  • 94204c1958 Fixes Pioneer IPP-125, IPP-126, IPP-127, IPP-128 Patrick McDonagh 2016-08-17 17:03:43 -05:00
  • e3198efa7e Adds Overall_Trip_Status_Timestamp per IPP-124 Patrick McDonagh 2016-08-15 18:27:05 -05:00
  • 373a8bdfda Sets the starting flow totalizing values to 0 Patrick McDonagh 2016-08-15 16:36:21 -05:00
  • 5573de4a88 Adds default configuration file for NAT Patrick McDonagh 2016-08-11 14:51:49 -05:00
  • 6e03647d38 Completes IPP-110, IPP-111, IPP-112. Display for %FLA, Fix for not reading Frequency or Phase Rotation Patrick McDonagh 2016-08-10 19:22:30 -05:00
  • ed19a7d91e Tag Cleanup Patrick McDonagh 2016-08-10 15:13:31 -05:00
  • 40d02118a5 Updates IP Address in PLC program for behind NAT Patrick McDonagh 2016-08-10 14:14:38 -05:00
  • ae150eb329 Updates IP Address in HMI program for behind NAT Patrick McDonagh 2016-08-10 14:03:19 -05:00
  • df6a720806 Merge branch 'master' of http://bitbucket.poconsole.net/scm/ipp/pioneer-ipp Patrick McDonagh 2016-08-10 12:00:22 -05:00
  • 6eb942c83c Completes IPP-108, adding 30 second delay timer for High Pressure Switch Patrick McDonagh 2016-08-10 11:59:08 -05:00
  • fea4d0ae27 Updates Ignore File 1.1 Patrick McDonagh 2016-08-09 18:27:41 -05:00
  • 994105555a Don't allow a restart if there is an Overload Trip Patrick McDonagh 2016-08-09 18:17:53 -05:00
  • 8a8d5b2263 Merge branch 'master' of http://bitbucket.poconsole.net/scm/ipp/pioneer-ipp Patrick McDonagh 2016-08-09 15:05:12 -05:00
  • f340a0d4db Adds HMI Alarms for Surface Pressure and Flow, Adds Overall Trip Status to main screen Patrick McDonagh 2016-08-09 08:24:15 -05:00
  • fef4d613d0 A few logic changes after IPP-105 Patrick McDonagh 2016-08-08 22:30:23 -05:00
  • 58f38aae0f Configured Alarm Setpoints before installing first panel Patrick McDonagh 2016-08-08 09:57:36 -05:00
  • a4acae3b80 Completes IPP-103. Adds Flowmeter_HART_Failure. also adds default E300 config spreadsheet Patrick McDonagh 2016-08-03 17:38:13 -05:00
  • e0f65927db Adds UPS and HOA Status to README.md Patrick McDonagh 2016-08-03 14:40:14 -05:00
  • eea0b46c4e Completes IPP-101 Patrick McDonagh 2016-08-02 14:04:59 -05:00
  • b4b4c3ca9c A few changes during meeting with Pioneer Patrick McDonagh 2016-08-02 10:23:06 -05:00
  • 65899e97ef Adds Data Table for Ignition Patrick McDonagh 2016-08-01 15:01:04 -05:00
  • b4324d5f8b Completes IPP-98 by adding HOA_Status Integer Patrick McDonagh 2016-08-01 14:36:46 -05:00
  • 45601dd17c Merged branch master into master Patrick McDonagh 2016-07-29 14:25:26 -05:00
  • 18487a3eb3 Adds all tags available to SCADA to README.md and excel document Patrick McDonagh 2016-07-29 14:25:17 -05:00
  • 4b9ccd6b76 Completes IPP-55. Adds ability to reset E300 to defaults Patrick McDonagh 2016-07-26 17:10:06 -05:00
  • 67af129c36 Completes IPP-96, adds Phase Rotation Trip logic Patrick McDonagh 2016-07-26 15:50:18 -05:00
  • 78413bb0f3 Completes IPP-82, Adds integer and string tags for Overall Trip and Warning Status. See README.md for mapping. Patrick McDonagh 2016-07-26 11:52:40 -05:00
  • 49ae52726c Adds README.md Patrick McDonagh 2016-07-26 10:41:52 -05:00
  • edab6e07f9 Completes IPP-76, Lightning arrestor to be wired to digital input 7, assumed to be N.C. Patrick McDonagh 2016-07-25 18:36:16 -05:00
  • 23de1fac3f Fixes IPP-73 and completes IPP-74.Daily and Monthly Totals with reset on powerup if day, month, or year has changed Patrick McDonagh 2016-07-25 17:46:29 -05:00
  • decab95222 Completes IPP-75, sets time from SCADA. Write to Input_DateTime.Year, .Month, etc. write to Set_PLC_Time to apply it. Patrick McDonagh 2016-07-25 17:04:28 -05:00
  • f1ccc3fca1 Fixes IPP-72, Adds watchdog timeout for datalogger. uses tag Datalogger_Watchdog_Timeout Patrick McDonagh 2016-07-25 16:36:24 -05:00
  • 8640c52565 Completes IPP-71, Alarms on UPS errors. UPS Ready = Digital In 4, UPS Buffering = Digital In 5, UPS Replace Battery = Digital In 6 Patrick McDonagh 2016-07-25 15:03:28 -05:00
  • 79fe78e67c Completes IPP-83, configuration and calculation for fluid level Patrick McDonagh 2016-07-25 14:32:58 -05:00
  • 42f62a334e PLC and HMI Programming for IPP-70, adding Tubing Pressure Switch (and disable button) wired into digital input 3 Patrick McDonagh 2016-07-25 14:24:15 -05:00
  • c2efa012fa Completes IPP-78, adding Off Status Patrick McDonagh 2016-07-25 13:45:54 -05:00
  • 8e95544712 Completes IPP-84, Control routine converted to Ladder for easier troubleshooting Patrick McDonagh 2016-07-25 13:41:51 -05:00
  • 2789416859 Resolve IPP-81, Returns 0.0 for Intake Temp and Pressure if DH Status is bad Patrick McDonagh 2016-07-25 09:35:45 -05:00
  • 00b65c9c89 Resolves IPP-77. Sets default Tubing Pressure alarms to Hi: 25, Lo: 125 Patrick McDonagh 2016-07-25 09:27:05 -05:00
  • 2aeecd06da removed unnecessary files Patrick McDonagh 2016-07-15 08:47:11 -05:00
  • d8e22a283b Added FreshWater panel program (1 IO module instead of 2) Patrick McDonagh 2016-07-15 08:46:19 -05:00
  • feac0be9a6 File Cleanup Patrick McDonagh 2016-07-13 08:03:25 -05:00
  • eac3378fec Fixes IPP-60. Fixes Low Tubing Pressure SP Patrick McDonagh 2016-07-11 21:20:14 -05:00
  • 8d55710b7e Unsets Ignition commands once the intended operation has completed Patrick McDonagh 2016-07-11 18:03:40 -05:00
  • 87eace08dd Adds IPP-58, ability to configure flow and pressure alarms on HMI Patrick McDonagh 2016-07-11 17:49:36 -05:00
  • d494ee0ac3 Fixes IPP-57. Since we'll always have tubing pressure, removed the tag completely Patrick McDonagh 2016-07-11 15:52:45 -05:00
  • 9d4cf67a7f Fixes IPP-56. Removed WarningEnable tag for Phase Loss Patrick McDonagh 2016-07-11 15:33:03 -05:00
  • 0b1f96e458 Completes IPP-51. Adds Flow to Downhole screen of the HMI Patrick McDonagh 2016-06-17 10:43:52 -05:00
  • bd54bce14c Revamped Logic per IPP-48. Combining Pioneer and Henry Pump logic Patrick McDonagh 2016-06-16 18:51:42 -05:00
  • d915e96e18 Fixes IPP-30. When parameters are written to the E300, it gets inhibited and then uninhibited Patrick McDonagh 2016-05-12 23:49:31 -05:00
  • 59dd4960c7 Committing old file since security was corrupted Patrick McDonagh 2016-05-11 18:16:58 -05:00
  • 3d31144766 removed that pesky .ccwsuo file from tracking Patrick McDonagh 2016-04-15 14:28:47 -05:00
  • 7ec73fa27e 55d9676 Added missing E300 parameters that aren't included in Add-On Profile Patrick McDonagh 2016-04-15 09:59:45 -05:00