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 |
|
Patrick McDonagh
|
c6e625b4a1
|
Added DHCP Server files
|
2016-01-15 09:50:49 -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 |
|