86 Commits

Author SHA1 Message Date
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
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