Commit Graph

16 Commits

Author SHA1 Message Date
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
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
Patrick McDonagh
162f6b8a34 Fixed errors on HMI, added individual status for start permissive and run permissive parameters 2016-01-11 16:59:13 -06:00
Patrick McDonagh
a8da2fb297 Converted to firmware v9, fixed analog input 2016-01-11 13:10:35 -06:00
Patrick McDonagh
eaa1a5d2d0 Removed old dropbox conflicted files 2016-01-11 12:18:16 -06:00
Patrick McDonagh
be51ea46dc Initial Commit after removing confliced copy files 2016-01-11 12:15:51 -06:00