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

Commit Graph

  • 705ae919f0 Fix for #1, as long PLC time is correct. master v1.0.9 Patrick McDonagh 2018-03-02 13:58:55 -06:00
  • 134ce5f01f Updates to use common channel objects, adds flow totals today and yesterday, public IP Patrick McDonagh 2018-03-01 14:51:13 -06:00
  • 8d3ecb3d7c Adds upgraded system Patrick McDonagh 2018-02-01 11:48:45 -06:00
  • d2ba4eeb11 Merge branch 'master' of bitbucket.org:henrypump/e300-ipp Patrick McDonagh 2016-11-27 19:55:14 -06:00
  • 507b7c4e43 Removes CCWSUO file from tracking Patrick McDonagh 2016-11-27 19:54:44 -06:00
  • 919f45ac20 Completes IPP-151. Adds configuration for sensor height and Specific Gravity. Increments driver version to 8 Patrick McDonagh 2016-11-08 15:15:22 -06:00
  • 0440f89433 Merged in IPP-164-e300-alarm-fix (pull request #1) Patrick McDonagh 2016-09-27 13:20:21 -05:00
  • b3070f0025 Completes IPP-164 by requiring contactor status to be on to set e300 trip alarm Alarm clears once TripStatus is OK for 5 seconds Patrick McDonagh 2016-09-27 13:18:01 -05:00
  • 856b553f59 Merge branch 'master' of bitbucket.org:henrypump/e300-ipp IPP-140-trip-values Patrick McDonagh 2016-09-23 13:18:35 -05:00
  • 01967b1727 Auto-Setup Files Patrick McDonagh 2016-09-15 12:23:01 -05:00
  • 39405aa069 Merge branch 'master' of bitbucket.org:henrypump/e300-ipp Patrick McDonagh 2016-09-23 13:17:37 -05:00
  • 808acdca73 Auto-Setup Files Patrick McDonagh 2016-09-15 12:23:01 -05:00
  • 66477a580c Merge branch 'master' of bitbucket.org:henrypump/e300-ipp Patrick McDonagh 2016-09-23 13:16:35 -05:00
  • 0b8025c25e Auto-Setup Files Patrick McDonagh 2016-09-15 12:23:01 -05:00
  • 34326f8774 Merge branch 'master' of bitbucket.org:henrypump/e300-ipp Patrick McDonagh 2016-09-23 13:12:36 -05:00
  • 9a8729a70a Adds python script to calculate fluid level or pump intake pressure Patrick McDonagh 2016-09-21 16:25:02 -05:00
  • 613ff29fd2 Completes IPP-157 and adds custom PLC IP Address entry from POCloud, increments version number to 7 DriverV7 Patrick McDonagh 2016-09-20 17:07:59 -05:00
  • 1993c53d21 Adds alarm status for notification, increments driver version DriverV6 Patrick McDonagh 2016-09-20 11:15:38 -05:00
  • 19321d4a3b Fixes sending strings by changing sendtodbJSON to sendtodb, increments version number because this shit is important DriverV5 Patrick McDonagh 2016-09-20 10:40:12 -05:00
  • 2e232ca8c2 Auto-Setup Files Patrick McDonagh 2016-09-15 12:23:01 -05:00
  • 93da65f4cf Updates version number to 4 after error trapping DriverV4 Patrick McDonagh 2016-09-09 16:45:27 -05:00
  • d9460554ff Merge branch 'master' of ssh://bitbucket.poconsole.net:7999/ipp/e300-ipp Patrick McDonagh 2016-09-07 23:25:33 -05:00
  • d993e0efe0 Completes IPP-144. Adds 5 second unstick timer to start command, maintains stop command until contactor_Status is false Patrick McDonagh 2016-09-07 23:25:11 -05:00
  • 1a6dbde50b converted spaces to Tabs Patrick McDonagh 2016-09-07 23:03:26 -05:00
  • ab5e940bf1 Adds global version and switches start/stop to buttons Patrick McDonagh 2016-09-07 16:43:00 -05:00
  • ad9d1cacde Fixes having a bunch of digits behind the decimal point on nodelist Patrick McDonagh 2016-08-23 17:32:17 -05:00
  • 73d3e0cb33 Completes IPP-67. Adds Device_Status_INT to PLC, should be mapped to IPP Driver Patrick McDonagh 2016-08-23 13:12:52 -05:00
  • 407982e7be Don't need to send "None" for E300 trip history Patrick McDonagh 2016-08-23 10:14:59 -05:00
  • a8199543b4 Fixes IPP-130. min_seconds was missing from Epoch Time calculation Patrick McDonagh 2016-08-19 13:02:05 -05:00
  • 0c2defa280 Configured files for Driver V3 and uploaded to S3 DriverV3 Patrick McDonagh 2016-08-12 10:26:57 -05:00
  • 75040109c5 Completes IPP-68 by mapping E300 status to a string Patrick McDonagh 2016-08-08 12:17:45 -05:00
  • 4e75523e2c Completes IPP-104, Flow now added to driver. Starts working on mapping E300 faults to strings, and then to one final string. IPP-68 Patrick McDonagh 2016-08-04 16:38:13 -05:00
  • 464b8f488f Changes to driver feature/IPP-64-Alerts Patrick McDonagh 2016-08-04 12:59:15 -05:00
  • 4d8e3c1791 Merge pull request #3 in IPP/e300-ipp from feature/IPP-97-Flow-and-Totalization to master Patrick McDonagh 2016-08-01 20:00:06 +00:00
  • 1e6c5f3bec Added HMI Screens and Flow Totalizer Logic. Resolution is 10 seconds. Patrick McDonagh 2016-07-31 18:59:38 -05:00
  • cd26d7af5e Added scaled flow to Analog Input 1 Patrick McDonagh 2016-07-31 18:04:31 -05:00
  • 38869bc514 Resolves IPP- 59. Enables writing to E300 after the tag value is set. Needs testing Patrick McDonagh 2016-07-18 16:13:56 -05:00
  • 523e6c435e Adds a sample modbus map for M1 configuration Patrick McDonagh 2016-07-15 17:01:18 -05:00
  • c876eb53c9 No longer need pycomm_micro since my changes are now in pycomm Patrick McDonagh 2016-07-15 17:00:52 -05:00
  • 0f0bbdd061 Fixes ipp reading from Micro800 using class instances Patrick McDonagh 2016-07-15 17:00:22 -05:00
  • d1440a9a36 Merge branch 'master' of http://bitbucket.poconsole.net/scm/ipp/e300-ipp Patrick McDonagh 2016-07-15 09:01:45 -05:00
  • ae209c7b39 Adds error tracking to micro800 write tag Patrick McDonagh 2016-07-14 18:55:12 -05:00
  • 8bec0aafd4 Updated ipp.py to use new pycomm functions and Channel class instances Patrick McDonagh 2016-07-14 18:32:04 -05:00
  • 5b2b8571a7 Added pickle_to_class.py for converting pickled tags to class instances Patrick McDonagh 2016-07-14 17:45:11 -05:00
  • 6ee3662342 Changes time to Epoch time (See HPU-60), adds alarm channels to driver, trip limit reached tags Patrick McDonagh 2016-07-13 16:12:19 -05:00
  • 37605fe41d Writes 1 to cmd_Write after setting an E300 parameter Patrick McDonagh 2016-07-13 08:04:43 -05:00
  • 3602d40d9b Removes warning enables for E300 configuration parameters that do not have warnings Patrick McDonagh 2016-07-13 08:04:09 -05:00
  • 38bfdb5312 Fix for IPP-49. Timer was being told to run, but timer cycle was never started when powering up Patrick McDonagh 2016-06-17 10:01:33 -05:00
  • 1240e53f15 Fixes IPP-47. Timer no longer acts like a fault being cleared Patrick McDonagh 2016-06-15 14:36:36 -05:00
  • 875a9ad405 Merged branch master into master Patrick McDonagh 2016-06-14 19:02:31 -05:00
  • 9d97df075b Closes IPP-42. Trip and Warning History Patrick McDonagh 2016-06-14 19:02:11 -05:00
  • 82177cafed Fixes Wrong IO mapping after accidentally saving the Demo Unit program Patrick McDonagh 2016-06-08 09:41:49 -05:00
  • c641ae64c7 Fixes IPP-46. DH Intake pressure is now automatically offset by -14PSI to show true pressure Patrick McDonagh 2016-06-06 12:11:31 -05:00
  • 1b9b5e1623 Merged branch master into master DriverV2 Patrick McDonagh 2016-06-06 10:12:06 -05:00
  • 7baff1f2f7 Updated driver to v2 Patrick McDonagh 2016-06-06 10:11:53 -05:00
  • f6f04586a0 Fixes IPP-38. Also converts time until startup from seconds to HH:SS Patrick McDonagh 2016-06-03 11:17:45 -05:00
  • 07ca941d70 Fixes HTML templates per IPP-40, IPP-44, and IPP-45 Patrick McDonagh 2016-06-02 16:17:04 -05:00
  • 4940c83bb4 Adds HOA status Patrick McDonagh 2016-05-27 17:32:27 -05:00
  • e7bce66d83 Begins adding E300 parameters to Config Page Patrick McDonagh 2016-05-26 12:09:27 -05:00
  • bcf19f26fb fixes functions for writing to PLC Patrick McDonagh 2016-05-26 10:17:19 -05:00
  • c393d346c9 Added alarms and popups Patrick McDonagh 2016-05-24 21:12:15 -05:00
  • 1e3fc4830b Merge remote-tracking branch 'origin/feature/IPP-22-pocloud-driver' Patrick McDonagh 2016-05-24 20:55:02 -05:00
  • c73a8d1a17 Merge branch 'feature/IPP-22-pocloud-driver' Patrick McDonagh 2016-05-23 17:49:13 -05:00
  • 577660b78a File Cleanup feature/IPP-22-pocloud-driver Patrick McDonagh 2016-05-23 11:24:15 -05:00
  • d46e4e0179 First version of POCloud HTML templates Patrick McDonagh 2016-05-16 07:35:08 -05:00
  • cca0d15791 Added channel notes & comments, fixed PLC IP Address Patrick McDonagh 2016-05-14 14:41:42 -05:00
  • 6d6f498148 Cleans up files Patrick McDonagh 2016-05-12 23:55:38 -05:00
  • fca600c2aa Fixed IPP-32, IPP-33, IPP-34, IPP-35, IPP-36, IPP-37 Patrick McDonagh 2016-05-12 17:15:05 -05:00
  • e1cf7ba053 Fixes issue where pump is running, but status shows "Not Ready to Start" Patrick McDonagh 2016-05-11 13:39:54 -05:00
  • 57ebc3c6ab Fixes IPP-29. Attempts to clear E300 trips every 10 seconds when tripped Patrick McDonagh 2016-05-10 14:24:12 -05:00
  • d7a70f5d20 IPP-28 and IPP-26 fixes. No longer restarts at weird times Patrick McDonagh 2016-05-10 10:44:02 -05:00
  • 247313ba42 Don't allow restarts if the unit switched to "Off" Patrick McDonagh 2016-05-09 22:44:56 -05:00
  • 3a0e47a96b Added password and changed config screen access rights to CONFIGSCREENS Patrick McDonagh 2016-05-05 16:44:16 -05:00
  • 790611ac94 Copied files from vfd-ipp, updated to generate channels and functions Patrick McDonagh 2016-04-27 14:55:24 -05:00
  • 381ed59f8d Fixed HMI Screen for setting Timer parameters Patrick McDonagh 2016-04-27 11:40:24 -05:00
  • c25b5f0e2b Merge pull request #2 in IPP/e300-ipp from feature/IPP-21-restart-limits to master Patrick McDonagh 2016-04-26 21:12:54 +00:00
  • 5c59dfbbb4 Test reset count limits. Set timer mode to always start on run Patrick McDonagh 2016-04-26 16:09:53 -05:00
  • 4a44665d8a Add ability to clear being locked out after faults, stop command or turning HOA to off Patrick McDonagh 2016-04-26 14:58:39 -05:00
  • f3255ec81a Add logic and HMI config for setting a specific number of restarts allowed Patrick McDonagh 2016-04-26 14:54:34 -05:00
  • 0f78fb81ca Merge pull request #1 in IPP/e300-ipp from feature/IPP-20-timer-mode to master Patrick McDonagh 2016-04-25 23:53:46 +00:00
  • 0253b2476c Timer mode was looking like fault to controller Patrick McDonagh 2016-04-25 18:51:55 -05:00
  • ae4095a78c Fixed timer mode Patrick McDonagh 2016-04-25 17:52:28 -05:00
  • ae5a413193 Changed timers to seconds, added timer mode Patrick McDonagh 2016-04-25 14:51:49 -05:00
  • a129ce06f3 fixed entry of Ground Fault Current from 0.001 A to 5 A Patrick McDonagh 2016-04-07 14:37:34 -05:00
  • a03bbec4d9 Merge pull request #2 in IPP/ipp_panel from bugfix/IPP-14-add-specific-gravity-to-height-calculations to master Patrick McDonagh 2016-03-15 22:37:17 +00:00
  • 518105a61e Added correct specific gravity calculation Patrick McDonagh 2016-03-15 17:35:05 -05:00
  • f529da4539 Merge pull request #1 in IPP/ipp_panel from feature/IPP-8-add-ability-to-change-specific-gravity to master Patrick McDonagh 2016-03-12 00:49:31 +00:00
  • 4ea896262b Added ability to configure specific gravity Patrick McDonagh 2016-03-11 18:48:37 -06:00
  • 0a67b2a582 Merge branch 'master' of http://gateway.poconsole.io:7990/scm/ipp/ipp_panel Patrick McDonagh 2016-02-25 14:19:19 -06:00
  • 30079b32cb Changes to make Permissives more transparent Patrick McDonagh 2016-02-22 11:07:31 -06:00
  • c9c92ff3ae Merge remote-tracking branch 'origin/master' Patrick McDonagh 2016-02-22 08:55:32 -06:00
  • d1df2086c2 Fixes Patrick McDonagh 2016-02-22 08:50:27 -06:00
  • c3ed5886b4 Updated DHCP Config Patrick McDonagh 2016-02-18 22:22:57 -06:00
  • f02369d465 Merge branch 'master' of https://bitbucket.org/patrickjmcd/waterwellpanel Patrick McDonagh 2016-02-18 21:10:23 -06:00
  • 27e2d4865f Simplified Permissives Patrick McDonagh 2016-02-18 21:08:43 -06:00
  • 6b9bcbbf03 Fixed type causing build errors Patrick McDonagh 2016-02-10 14:17:43 -06:00
  • 68e0219595 Control Trip processing fixed and Temp Run Permissive typo fixed Patrick McDonagh 2016-02-09 16:26:38 -06:00
  • 42d5bb65d7 Output message toggles when error occurs Patrick McDonagh 2016-01-29 12:40:11 -06:00
  • a87948d79e Fixed HMI shortcut Patrick McDonagh 2016-01-29 09:05:39 -06:00
  • 4a5a4c2db9 Fixed contactor dropout bug Patrick McDonagh 2016-01-29 08:33:16 -06:00