nmelone/E300-IPP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55 Commits 4 Branches 7 Tags
9d97df075bf059f813de518592b06faaf01e2b1d
Commit Graph

55 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick McDonagh
9d97df075b Closes IPP-42. Trip and Warning History 2016-06-14 19:02:11 -05:00
Patrick McDonagh
1b9b5e1623 Merged branch master into master DriverV2 2016-06-06 10:12:06 -05:00
Patrick McDonagh
7baff1f2f7 Updated driver to v2 2016-06-06 10:11:53 -05:00
Patrick McDonagh
f6f04586a0 Fixes IPP-38. Also converts time until startup from seconds to HH:SS 2016-06-03 11:17:45 -05:00
Patrick McDonagh
07ca941d70 Fixes HTML templates per IPP-40, IPP-44, and IPP-45 2016-06-02 16:17:04 -05:00
Patrick McDonagh
4940c83bb4 Adds HOA status 2016-05-27 17:32:27 -05:00
Patrick McDonagh
e7bce66d83 Begins adding E300 parameters to Config Page 2016-05-26 12:09:27 -05:00
Patrick McDonagh
bcf19f26fb fixes functions for writing to PLC 2016-05-26 10:17:19 -05:00
Patrick McDonagh
c393d346c9 Added alarms and popups 2016-05-24 21:12:15 -05:00
Patrick McDonagh
1e3fc4830b Merge remote-tracking branch 'origin/feature/IPP-22-pocloud-driver' 2016-05-24 20:55:02 -05:00
Patrick McDonagh
c73a8d1a17 Merge branch 'feature/IPP-22-pocloud-driver' 2016-05-23 17:49:13 -05:00
Patrick McDonagh
577660b78a File Cleanup 2016-05-23 11:24:15 -05:00
Patrick McDonagh
d46e4e0179 First version of POCloud HTML templates 2016-05-16 07:35:08 -05:00
Patrick McDonagh
cca0d15791 Added channel notes & comments, fixed PLC IP Address 2016-05-14 14:41:42 -05:00
Patrick McDonagh
6d6f498148 Cleans up files 2016-05-12 23:55:38 -05:00
Patrick McDonagh
fca600c2aa Fixed IPP-32, IPP-33, IPP-34, IPP-35, IPP-36, IPP-37 2016-05-12 17:15:05 -05:00
Patrick McDonagh
e1cf7ba053 Fixes issue where pump is running, but status shows "Not Ready to Start" 2016-05-11 13:39:54 -05:00
Patrick McDonagh
57ebc3c6ab Fixes IPP-29. Attempts to clear E300 trips every 10 seconds when tripped 2016-05-10 14:24:12 -05:00
Patrick McDonagh
d7a70f5d20 IPP-28 and IPP-26 fixes. No longer restarts at weird times 2016-05-10 10:44:02 -05:00
Patrick McDonagh
247313ba42 Don't allow restarts if the unit switched to "Off" 2016-05-09 22:44:56 -05:00
Patrick McDonagh
3a0e47a96b Added password and changed config screen access rights to CONFIGSCREENS 2016-05-05 16:44:16 -05:00
Patrick McDonagh
790611ac94 Copied files from vfd-ipp, updated to generate channels and functions 2016-04-27 14:55:24 -05:00
Patrick McDonagh
381ed59f8d Fixed HMI Screen for setting Timer parameters 2016-04-27 11:40:24 -05:00
Patrick McDonagh
c25b5f0e2b Merge pull request #2 in IPP/e300-ipp from feature/IPP-21-restart-limits to master 
* commit '5c59dfbbb42ef6474269ec899991f481fd5ca32e':
  Test reset count limits. Set timer mode to always start on run
  Add ability to clear being locked out after faults, stop command or turning HOA to off
  Add logic and HMI config for setting a specific number of restarts allowed
 2016-04-26 21:12:54 +00:00
Patrick McDonagh
5c59dfbbb4 Test reset count limits. Set timer mode to always start on run 2016-04-26 16:09:53 -05:00
Patrick McDonagh
4a44665d8a Add ability to clear being locked out after faults, stop command or turning HOA to off 2016-04-26 14:58:39 -05:00
Patrick McDonagh
f3255ec81a Add logic and HMI config for setting a specific number of restarts allowed 2016-04-26 14:54:34 -05:00
Patrick McDonagh
0f78fb81ca Merge pull request #1 in IPP/e300-ipp from feature/IPP-20-timer-mode to master 
* commit '0253b2476c166b389050b2717947a7adceadae46':
  Timer mode was looking like fault to controller
  Fixed timer mode
  Changed timers to seconds, added timer mode
 2016-04-25 23:53:46 +00:00
Patrick McDonagh
0253b2476c Timer mode was looking like fault to controller 2016-04-25 18:51:55 -05:00
Patrick McDonagh
ae4095a78c Fixed timer mode 2016-04-25 17:52:28 -05:00
Patrick McDonagh
ae5a413193 Changed timers to seconds, added timer mode 2016-04-25 14:51:49 -05:00
Patrick McDonagh
a129ce06f3 fixed entry of Ground Fault Current from 0.001 A to 5 A 2016-04-07 14:37:34 -05:00
Patrick McDonagh
a03bbec4d9 Merge pull request #2 in IPP/ipp_panel from bugfix/IPP-14-add-specific-gravity-to-height-calculations to master 
* commit '518105a61e74a3bb2fb281581e334f35e89e584b':
  Added correct specific gravity calculation
 2016-03-15 22:37:17 +00:00
Patrick McDonagh
518105a61e Added correct specific gravity calculation 2016-03-15 17:36:17 -05:00
Patrick McDonagh
f529da4539 Merge pull request #1 in IPP/ipp_panel from feature/IPP-8-add-ability-to-change-specific-gravity to master 
* commit '4ea896262b450b76c3e807ded0f80d221542ba5d':
  Added ability to configure specific gravity
 2016-03-12 00:49:31 +00:00
Patrick McDonagh
4ea896262b Added ability to configure specific gravity 2016-03-11 18:48:37 -06:00
Patrick McDonagh
0a67b2a582 Merge branch 'master' of http://gateway.poconsole.io:7990/scm/ipp/ipp_panel 2016-02-25 14:19:19 -06:00
Patrick McDonagh
30079b32cb Changes to make Permissives more transparent 2016-02-22 11:07:31 -06:00
Patrick McDonagh
c9c92ff3ae Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	WaterWellPanel.v12.ccwsuo
 2016-02-22 08:55:32 -06:00
Patrick McDonagh
d1df2086c2 Fixes 2016-02-22 08:50:27 -06:00
Patrick McDonagh
c3ed5886b4 Updated DHCP Config 2016-02-18 22:22:57 -06:00
Patrick McDonagh
f02369d465 Merge branch 'master' of https://bitbucket.org/patrickjmcd/waterwellpanel 
Conflicts:
	WaterWellPanel.v12.ccwsuo
 2016-02-18 21:10:23 -06:00
Patrick McDonagh
27e2d4865f Simplified Permissives 2016-02-18 21:08:43 -06:00
Patrick McDonagh
6b9bcbbf03 Fixed type causing build errors 2016-02-10 14:17:43 -06:00
Patrick McDonagh
68e0219595 Control Trip processing fixed and Temp Run Permissive typo fixed 2016-02-09 16:26:38 -06:00
Patrick McDonagh
42d5bb65d7 Output message toggles when error occurs 2016-01-29 12:40:11 -06:00
Patrick McDonagh
a87948d79e Fixed HMI shortcut 2016-01-29 09:05:39 -06:00
Patrick McDonagh
4a5a4c2db9 Fixed contactor dropout bug 2016-01-29 08:33:16 -06:00
Patrick McDonagh
dbec88ad73 Fixing Alarms 2016-01-20 11:04:33 -06:00
Patrick McDonagh
0083cc96a1 Updating with password 2016-01-19 13:10:21 -06:00