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

Commit Graph

  • 1ed4b717d8 Fixed Totalizer master Joshua Fine 2018-09-27 11:11:12 -05:00
  • 18bc87c49b Adds setup file Patrick McDonagh 2018-08-16 15:47:24 -05:00
  • 722413799e Fix for "Module Not Configured" Error Patrick McDonagh 2018-08-10 13:19:28 -05:00
  • 915451d945 Fixes PWM Frequency default value Patrick McDonagh 2018-06-27 11:28:51 -05:00
  • 35a9dd0648 Adds POCloud support for HART totalizer data Patrick McDonagh 2018-06-22 14:34:44 -05:00
  • 0ebd786962 Turns off Simulation Mode for default Patrick McDonagh 2018-06-22 13:01:30 -05:00
  • 41badb4348 Adds HART + failover for pressure transmitter Patrick McDonagh 2018-06-22 12:07:03 -05:00
  • 1fec3011ab Switches Analog IO to HART-enabled Patrick McDonagh 2018-06-21 12:57:20 -05:00
  • 6aeb27a4fc Merge branch 'master' of https://github.com/Henry-Pump/Max-Water-System Patrick McDonagh 2018-06-14 11:56:21 -05:00
  • b9d581b2a1 Fix for PLC-VFD connection after rockwell fucked it up Patrick McDonagh 2018-06-14 11:53:37 -05:00
  • 498f87d4ee Move files and folders around for uniform convention Patrick McDonagh 2018-05-22 11:58:57 -05:00
  • 9165f6f222 Starts breaking out VFD Function into new UDT and generic routine vfd-wrapper Patrick McDonagh 2018-04-10 18:13:55 -05:00
  • 2a732036b2 Completes #3. Patrick McDonagh 2018-03-22 15:01:49 -05:00
  • 2c2cc8bb8d Completes #2 and #1 Patrick McDonagh 2018-03-21 15:25:11 -05:00
  • 4f04584265 Adds initial Installation document Patrick McDonagh 2018-03-20 11:20:39 -05:00
  • 6dac788e93 File Cleanup Patrick McDonagh 2018-03-15 14:37:49 -05:00
  • 32923324f0 Adds default value to min speed seconds for fault Patrick McDonagh 2018-02-20 14:54:01 -06:00
  • 9010cda9a4 Successfully completes MAXH2O-88 Patrick McDonagh 2018-01-22 10:48:30 -06:00
  • 4a2ba7ff9d Completes MAXH2O-87 and MAXH2O-88. Increments driver version Patrick McDonagh 2018-01-16 16:53:50 -06:00
  • 4f076cae2f Merge branch 'master' of https://github.com/Henry-Pump/Max-Water-System Patrick McDonagh 2017-12-21 16:50:46 -06:00
  • 053ebcd7d4 Patch for more accurate PID level control {MAXH2O-92} Patrick McDonagh 2017-12-21 16:50:43 -06:00
  • bcc56fc342 Corrects NTP Code Patrick McDonagh 2017-12-13 13:27:12 -06:00
  • 2974f4491d Fix and patch for MAXH2O-84 v2.0.2 Patrick McDonagh 2017-12-01 15:49:46 -06:00
  • 1feb871156 Completes MAXH2O-66. Adds deadband to allow Auto Mode Takeover v2.0.1 Patrick McDonagh 2017-12-01 10:04:40 -06:00
  • 5903ba356b MAXH2O-45. Adds monthly totals to PLC Program Patrick McDonagh 2017-11-02 09:52:44 -05:00
  • 021e5b6159 MAXH2O-46 Complete. Adds NTP Server Code Patrick McDonagh 2017-11-01 14:50:45 -05:00
  • 23813a0eb9 Adds period (hourly) send of watchdog value Patrick McDonagh 2017-10-16 11:40:17 -05:00
  • efbfbbf86f Fixes watchdog driver code, completes MAXH2O-26 by setting default PID params Patrick McDonagh 2017-10-10 09:41:47 -05:00
  • e279247ecf completes MAXH2O-2. adds PLC Watchdog Patrick McDonagh 2017-09-25 13:09:06 -05:00
  • f09fafcdc7 Adds source key protection MAXH2O-13 Patrick McDonagh 2017-09-22 14:10:32 -05:00
  • 46ed6c9e7a Adds fix for min speed fault not working correctly Patrick McDonagh 2017-09-15 10:09:44 -05:00
  • 2132be9176 Adds pump depth to Meshify Patrick McDonagh 2017-09-15 10:09:14 -05:00
  • c3e2a40ecd Adds fix for not resetting Min Speed Alarm Patrick McDonagh 2017-09-12 12:05:12 -05:00
  • 9e39b56c76 Adds watchdog logic Patrick McDonagh 2017-09-07 16:32:40 -05:00
  • 35e7265358 Increments version after uploading new modbus map to S3 Patrick McDonagh 2017-09-06 14:57:11 -05:00
  • 204069cdaa Updates L24 program with default values Patrick McDonagh 2017-09-06 11:49:30 -05:00
  • 8d8dd64523 Splits out mapping and security Patrick McDonagh 2017-08-29 18:51:38 -05:00
  • 3d21e63d71 More formatting Patrick McDonagh 2017-08-29 14:13:47 -05:00
  • 7dec5d75f5 Table formatting Patrick McDonagh 2017-08-29 14:11:25 -05:00
  • c58889bf64 Index formattings Patrick McDonagh 2017-08-29 14:10:04 -05:00
  • d5bdb7ddfb Merge branch 'master' of https://github.com/Henry-Pump/Max-Water-System Patrick McDonagh 2017-08-29 14:07:12 -05:00
  • 9517a13e71 Rename README to index for Github Pages Patrick McDonagh 2017-08-29 14:07:08 -05:00
  • a8e4894b9c Set theme jekyll-theme-slate Patrick McDonagh 2017-08-29 14:01:27 -05:00
  • 370f95cabf Move readme to docs folder Patrick McDonagh 2017-08-29 14:00:12 -05:00
  • 31e0b272c5 Fix for stalled PID loop at startup Patrick McDonagh 2017-08-29 13:52:22 -05:00
  • d559d68db3 Adds changes after starting up Darlington WW-14 Patrick McDonagh 2017-08-18 10:18:18 -05:00
  • cfc437059b Merge branch 'feature-scheduler' of https://github.com/Henry-Pump/Advanced-VFD-IPP into feature-scheduler Patrick McDonagh 2017-08-17 17:44:04 -05:00
  • 0f87669fac Adds new channels for VFD Status Patrick McDonagh 2017-08-17 17:43:55 -05:00
  • 2414e95e8d Updates for clearing alarm Patrick McDonagh 2017-08-16 09:55:59 -05:00
  • 3f116b8dfc Fix for Net IO Timeout Fault on VFD Patrick McDonagh 2017-08-15 09:31:37 -05:00
  • b7a8c2d836 Fix for PF755 Data Structure MisMatch Patrick McDonagh 2017-08-11 11:15:17 -05:00
  • 23de1bcc64 Adds Current Limit VFD parameter Patrick McDonagh 2017-08-10 10:59:27 -05:00
  • 1610e7f063 Adds VFD Config for PF753 Patrick McDonagh 2017-08-10 09:48:30 -05:00
  • cc7861fa18 Removes negative flow conditions Patrick McDonagh 2017-08-02 11:31:18 -05:00
  • 452c661716 Allows flow rates from -5 to 400 to allow slightly negative flowrates Patrick McDonagh 2017-08-02 11:26:20 -05:00
  • 2c3c588300 Added MaxWaterSystem.ACD for new program Patrick McDonagh 2017-07-27 19:14:20 -05:00
  • 9c167aa43b Updated to make changes for clearing faults and detecting PLC faults Patrick McDonagh 2017-07-25 16:42:33 -05:00
  • d166c53692 Adds logic to attempt to keep PLC from faulting. Flag faults to HMI Patrick McDonagh 2017-07-06 15:42:28 -05:00
  • 647c462426 Fixes maps and adds schedule page Patrick McDonagh 2017-06-09 09:46:01 -05:00
  • 8d2351bddb Fix for buttons with icons not sending values Patrick McDonagh 2017-05-30 08:00:25 -05:00
  • f0686b235f Catch more errors, new configuration screen Patrick McDonagh 2017-05-25 14:59:58 -05:00
  • bee4fe3b06 More Meshify Scheduler fixes Patrick McDonagh 2017-05-24 19:01:37 -05:00
  • cf610811cf Upgrades to Meshify Driver Patrick McDonagh 2017-05-24 16:58:16 -05:00
  • fa7b2c942b Totalize in BBL42 instead of Gallons Patrick McDonagh 2017-05-23 17:23:34 -05:00
  • 22960c37f9 Adds missing PWM Frequency Tags Patrick McDonagh 2017-05-09 15:19:07 -05:00
  • 2f635e4fcf Updates for L24 program Patrick McDonagh 2017-05-01 11:38:06 -05:00
  • c07078cbb1 Fixes energy measurements going negative. Adds energy cost Patrick McDonagh 2017-04-27 17:17:59 -05:00
  • b6d400e286 Adds updated config file to change Wifi Network name Patrick McDonagh 2017-04-24 16:49:41 -05:00
  • 7888792ca2 Adds default configuration for M1s Patrick McDonagh 2017-04-13 11:00:42 -05:00
  • dd95f2c550 Adds Normal Duty Toggle and Carrier Frequency Patrick McDonagh 2017-04-10 16:39:02 -05:00
  • 6a71bb6b84 Adds toggle for Normal vs. Heavy Duty Patrick McDonagh 2017-04-10 09:51:24 -05:00
  • 712d8ca28d Updates PLC programs to avoid one-shot issues Patrick McDonagh 2017-04-07 11:14:44 -05:00
  • 4fd923b7eb Updates Modbus Configs Patrick McDonagh 2017-03-14 11:35:44 -05:00
  • 8f877dfa46 Adds a version of the PLC program for L19 PLC Patrick McDonagh 2017-03-10 16:10:55 -06:00
  • f3f36919af Adds tag and driver code for writing notes from POCloud to the PLC for display on the HMI Patrick McDonagh 2016-12-12 07:49:53 -06:00
  • 2116052278 Expands limits on ModbusMap values to fix IPP-178 Patrick McDonagh 2016-11-28 16:19:16 -06:00
  • f12bea3423 Fixes configuration page to use generic jQuery to update value and tag Patrick McDonagh 2016-11-10 22:13:38 -06:00
  • 85f0afe35f Increments driver version to 2, adds configuration and display for Downhole parameters. IPP-141 Patrick McDonagh 2016-11-07 20:59:15 -06:00
  • a179bf9819 Added Alarm Log Patrick McDonagh 2016-11-04 17:32:08 -05:00
  • e78029c6aa Update Overview screen to add and show notes Patrick McDonagh 2016-11-02 20:41:19 -05:00
  • 9eadd5ac3d Merge branch 'master' of bitbucket.org:henrypump/advanced-vfd-ipp Patrick McDonagh 2016-11-02 16:53:33 -05:00
  • 8a45a670b0 Fixes data download on Overview Page. Starts adding notes Patrick McDonagh 2016-11-02 16:53:15 -05:00
  • acee0b25d8 Adds default parameter values for PID gains. P= 0.4, I= 1.5,, D= 0.0 Patrick McDonagh 2016-10-24 17:41:17 -05:00
  • cb3e2b365f Merge branch 'master' of bitbucket.org:henrypump/advanced-vfd-ipp Patrick McDonagh 2016-10-20 20:18:35 -05:00
  • 89f2b468b5 More work for IPP-141. Allows automatic download of modbusMap.p to configure channels Patrick McDonagh 2016-10-20 20:15:58 -05:00
  • 84eafaf8ea Cleans up files Patrick McDonagh 2016-10-20 20:14:39 -05:00
  • 956effd9b0 Adds Modbus Map for POCloud Patrick McDonagh 2016-10-20 10:56:18 -05:00
  • 3400079089 SD Card Configuration Patrick McDonagh 2016-10-20 10:35:48 -05:00
  • 6211ed11b2 Correct drive parameters Patrick McDonagh 2016-10-20 10:24:30 -05:00
  • 69b8126e88 After installs Patrick McDonagh 2016-10-13 11:21:12 -05:00
  • cedcec20ac Merge branch 'master' of bitbucket.org:henrypump/advanced-vfd-ipp Patrick McDonagh 2016-10-06 11:19:44 -05:00
  • d910644fd6 Adds updated config for Modbus Card Patrick McDonagh 2016-10-06 11:19:12 -05:00
  • 51fc682bef Merge branch 'master' of bitbucket.org:henrypump/advanced-vfd-ipp Patrick McDonagh 2016-10-03 18:46:55 -05:00
  • 46783af1a0 Completes IPP-166. Also converts overview screen to gauge-style Patrick McDonagh 2016-10-03 18:46:40 -05:00
  • c6189c88e4 Completes IPP-65 and adds default PID tuning parameters Patrick McDonagh 2016-10-03 17:10:55 -05:00
  • b05a0ba6f3 Merge branch 'master' of bitbucket.org:henrypump/advanced-vfd-ipp Patrick McDonagh 2016-09-30 12:05:25 -05:00
  • 2a34d7cf06 Updates files after startup of first well Patrick McDonagh 2016-09-30 11:58:59 -05:00
  • 5d63e5076c Fix for VFD fault not clearing and holding up restart Patrick McDonagh 2016-09-26 16:08:57 -05:00
  • c5e001d819 Work on IPP-153, changed control parameter from intake pressure to fluid level Patrick McDonagh 2016-09-21 16:16:28 -05:00
  • 0f8f872b67 Completes IPP-153 by adding AIN for Fluid Level #time 2h #resolve Patrick McDonagh 2016-09-21 13:42:55 -05:00