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

101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick McDonagh
507b7c4e43 Removes CCWSUO file from tracking 2016-11-27 19:54:44 -06:00
Patrick McDonagh
0440f89433 Merged in IPP-164-e300-alarm-fix (pull request #1) 
Completes IPP-164 by requiring contactor status to be on to set e300 trip alarm
 2016-09-27 13:20:21 -05:00
Patrick McDonagh
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
 2016-09-27 13:18:01 -05:00
Patrick McDonagh
856b553f59 Merge branch 'master' of bitbucket.org:henrypump/e300-ipp 2016-09-23 13:18:35 -05:00
Patrick McDonagh
01967b1727 Auto-Setup Files 
Changed project name to IPP, added files to automatically configure PLC
 2016-09-23 13:18:06 -05:00
Patrick McDonagh
39405aa069 Merge branch 'master' of bitbucket.org:henrypump/e300-ipp 2016-09-23 13:17:37 -05:00
Patrick McDonagh
808acdca73 Auto-Setup Files 
Changed project name to IPP, added files to automatically configure PLC
 2016-09-23 13:17:03 -05:00
Patrick McDonagh
66477a580c Merge branch 'master' of bitbucket.org:henrypump/e300-ipp 2016-09-23 13:16:35 -05:00
Patrick McDonagh
0b8025c25e Auto-Setup Files 
Changed project name to IPP, added files to automatically configure PLC
 2016-09-23 13:16:18 -05:00
Patrick McDonagh
34326f8774 Merge branch 'master' of bitbucket.org:henrypump/e300-ipp 2016-09-23 13:12:36 -05:00
Patrick McDonagh
9a8729a70a Adds python script to calculate fluid level or pump intake pressure 2016-09-21 16:25:02 -05:00
Patrick McDonagh
613ff29fd2 Completes IPP-157 and adds custom PLC IP Address entry from POCloud, increments version number to 7 DriverV7 2016-09-20 17:07:59 -05:00
Patrick McDonagh
1993c53d21 Adds alarm status for notification, increments driver version DriverV6 2016-09-20 11:15:38 -05:00
Patrick McDonagh
19321d4a3b Fixes sending strings by changing sendtodbJSON to sendtodb, increments version number because this shit is important DriverV5 2016-09-20 10:40:12 -05:00
Patrick McDonagh
2e232ca8c2 Auto-Setup Files 
Changed project name to IPP, added files to automatically configure PLC
 2016-09-15 12:23:01 -05:00
Patrick McDonagh
93da65f4cf Updates version number to 4 after error trapping DriverV4 2016-09-09 16:45:27 -05:00
Patrick McDonagh
d9460554ff Merge branch 'master' of ssh://bitbucket.poconsole.net:7999/ipp/e300-ipp 2016-09-07 23:25:33 -05:00
Patrick McDonagh
d993e0efe0 Completes IPP-144. Adds 5 second unstick timer to start command, maintains stop command until contactor_Status is false 2016-09-07 23:25:11 -05:00
Patrick McDonagh
1a6dbde50b converted spaces to Tabs 2016-09-07 23:03:26 -05:00
Patrick McDonagh
ab5e940bf1 Adds global version and switches start/stop to buttons 2016-09-07 16:43:00 -05:00
Patrick McDonagh
ad9d1cacde Fixes having a bunch of digits behind the decimal point on nodelist 2016-08-23 17:32:17 -05:00
Patrick McDonagh
73d3e0cb33 Completes IPP-67. Adds Device_Status_INT to PLC, should be mapped to IPP Driver 2016-08-23 13:12:52 -05:00
Patrick McDonagh
407982e7be Don't need to send "None" for E300 trip history 2016-08-23 10:14:59 -05:00
Patrick McDonagh
a8199543b4 Fixes IPP-130. min_seconds was missing from Epoch Time calculation 2016-08-19 13:02:05 -05:00
Patrick McDonagh
0c2defa280 Configured files for Driver V3 and uploaded to S3 DriverV3 2016-08-12 10:26:57 -05:00
Patrick McDonagh
75040109c5 Completes IPP-68 by mapping E300 status to a string 2016-08-08 12:17:45 -05:00
Patrick McDonagh
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 2016-08-04 16:38:13 -05:00
Patrick McDonagh
4d8e3c1791 Merge pull request #3 in IPP/e300-ipp from feature/IPP-97-Flow-and-Totalization to master 
* commit '1e6c5f3bec5eb7f719d8c40444b88336d3d1ab0b':
  Added HMI Screens and Flow Totalizer Logic. Resolution is 10 seconds.
  Added scaled flow to Analog Input 1
 2016-08-01 20:00:06 +00:00
Patrick McDonagh
1e6c5f3bec Added HMI Screens and Flow Totalizer Logic. Resolution is 10 seconds. 2016-07-31 18:59:38 -05:00
Patrick McDonagh
cd26d7af5e Added scaled flow to Analog Input 1 2016-07-31 18:04:31 -05:00
Patrick McDonagh
38869bc514 Resolves IPP- 59. Enables writing to E300 after the tag value is set. Needs testing 2016-07-18 16:13:56 -05:00
Patrick McDonagh
523e6c435e Adds a sample modbus map for M1 configuration 2016-07-15 17:01:18 -05:00
Patrick McDonagh
c876eb53c9 No longer need pycomm_micro since my changes are now in pycomm 2016-07-15 17:00:52 -05:00
Patrick McDonagh
0f0bbdd061 Fixes ipp reading from Micro800 using class instances 2016-07-15 17:00:22 -05:00
Patrick McDonagh
d1440a9a36 Merge branch 'master' of http://bitbucket.poconsole.net/scm/ipp/e300-ipp 2016-07-15 09:01:45 -05:00
Patrick McDonagh
ae209c7b39 Adds error tracking to micro800 write tag 2016-07-14 18:55:12 -05:00
Patrick McDonagh
8bec0aafd4 Updated ipp.py to use new pycomm functions and Channel class instances 2016-07-14 18:32:04 -05:00
Patrick McDonagh
5b2b8571a7 Added pickle_to_class.py for converting pickled tags to class instances 2016-07-14 17:45:11 -05:00
Patrick McDonagh
6ee3662342 Changes time to Epoch time (See HPU-60), adds alarm channels to driver, trip limit reached tags 2016-07-13 16:12:19 -05:00
Patrick McDonagh
37605fe41d Writes 1 to cmd_Write after setting an E300 parameter 2016-07-13 08:04:43 -05:00
Patrick McDonagh
3602d40d9b Removes warning enables for E300 configuration parameters that do not have warnings 2016-07-13 08:04:09 -05:00
Patrick McDonagh
38bfdb5312 Fix for IPP-49. Timer was being told to run, but timer cycle was never started when powering up 2016-06-17 10:01:33 -05:00
Patrick McDonagh
1240e53f15 Fixes IPP-47. Timer no longer acts like a fault being cleared 2016-06-15 14:36:36 -05:00
Patrick McDonagh
875a9ad405 Merged branch master into master 2016-06-14 19:02:31 -05:00
Patrick McDonagh
9d97df075b Closes IPP-42. Trip and Warning History 2016-06-14 19:02:11 -05:00
Patrick McDonagh
82177cafed Fixes Wrong IO mapping after accidentally saving the Demo Unit program 2016-06-08 09:41:49 -05:00
Patrick McDonagh
c641ae64c7 Fixes IPP-46. DH Intake pressure is now automatically offset by -14PSI to show true pressure 2016-06-06 12:11:31 -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