Merge branch 'dev'

# Conflicts:
#	bin/chamberconnectlibrary-test.py
#	chamberconnectlibrary/espec.py
#	chamberconnectlibrary/watlowf4t.py
#	setup.py

Author: MylesMetzler

.vscode/settings.json

@@ -1,4 +1,9 @@
 // Place your settings in this file to overwrite default and user settings.
 {
-    "python.pythonPath": "C:/Python27/python.exe"
+    "python.pythonPath": "C:/Python27/python.exe",
+    "python.autoComplete.extraPaths": [
+        "${env.SPARK_HOME}\\python",
+        "${env.SPARK_HOME}\\python\\pyspark"
+    ],
+    "python.linting.pylintPath": "c:/Python27/Scripts/pylint.exe"
 }

README.md

@@ -1,12 +1,18 @@
 # ChamberConnectLibrary
-Python library for interfacing with Espec North America chambers with P300, SCP-220 & Watlow F4T controllers.
+Python library for interfacing with Espec North America chambers with P300, SCP-220, Watlow F4T & Watlow F4S/D controllers.
 
 ## Requirements
 python 2.7.x
 
 ## Installation
 ```pip install chamberconnectlibrary```
 
+## Updating
+Do to some renaming to make the library pep8 compliant some files have been renamed from version 1.x to 2.0.0.
+To ensure that the current version is used uninstall and then reinstall the library:
+```pip uninstall chamberconnectlibrary```
+```pip install chamberconnectlibrary```
+
 ## Testing
 
 To test run chamberconnectlibrary-test.py(on windows using COM port #3, test script is located in Python2.7\Scripts directory)
@@ -17,6 +23,7 @@ SCP-220: ```chamberconnectlibrary-test.py EspecSCP220 Serial \\.\COM3 9600```
 
 Watlow F4T: ```chamberconnectlibrary-test.py WatlowF4T RTU \\.\COM3 38400```
 
+Watlow F4: ```chamberconnectlibrary-test.py WatlowF4 RTU \\.\COM3 19200```
+
 ## Documentation
-Documentation to be added to github wiki as time permits.
-For now see [controllerinterface.py](https://github.com/EspecNorthAmerica/ChamberConnectLibrary/blob/master/ChamberConnectLibrary/controllerinterface.py)
+See [controllerinterface.md](controllerinterface.md)

bin/chamberconnectlibrary-test.py

@@ -11,6 +11,7 @@
 import traceback
 from chamberconnectlibrary.espec import Espec
 from chamberconnectlibrary.watlowf4t import WatlowF4T
+from chamberconnectlibrary.watlowf4 import WatlowF4
 
 def main(**kwargs):
     '''Try each command given a set of parameters'''
@@ -19,6 +20,8 @@ def main(**kwargs):
         ctlr = Espec(**kwargs)
     elif ctlr_type == 'EspecSCP220':
         ctlr = Espec(ctlr_type='SCP220', **kwargs)
+    elif ctlr_type == 'WatlowF4':
+        ctlr = WatlowF4(**kwargs)
     else:
         ctlr = WatlowF4T(**kwargs)
     ctlr.process_controller()
@@ -38,7 +41,7 @@ def main(**kwargs):
 
         print '\nThe test could not be run try:'
         print '\nchamberconnectlibrary_test controller interface ipORserialport [baudrate]'
-        print '\tcontroller: "Espec"/"EspecP300" or "EspecSCP220" or "WatlowF4T"'
+        print '\tcontroller: "Espec"/"EspecP300", "EspecSCP220", "WatlowF4", or "WatlowF4T"(default)'
         print '\tinterface: "Serial": Serial connection when "controller" is "Espec".'
         print '\t           "RTU":Serial connection when "controller" is "WatlowF4T"'
         print '\t           "TCP":TCP connection'

bin/example.py

@@ -0,0 +1,37 @@
+'''
+examples of using the chamberconnectlibrary
+'''
+from chamberconnectlibrary.watlowf4 import WatlowF4
+
+LOOP_NAMES = ['Temperature', 'Humidity']
+
+CONTROLLER = WatlowF4(
+    interface='RTU',
+    serialport='//./COM7',
+    baudrate=19200,
+    loop_names=LOOP_NAMES
+)
+print CONTROLLER.process_controller()
+
+print '\ncascade loops:'
+for i in range(CONTROLLER.cascades):
+    print CONTROLLER.get_loop(i+1, 'cascade', ['processvalue', 'setpoint'])
+
+print '\nloops:'
+for i in range(CONTROLLER.loops):
+    print CONTROLLER.get_loop(i+1, 'loop', 'processvalue', 'setpoint')
+
+print '\nnamed loops:'
+for name in LOOP_NAMES:
+    print CONTROLLER.get_loop(name, ['processvalue', 'setpoint'])
+
+for name in LOOP_NAMES:
+    print CONTROLLER.set_loop(name, setpoint=60.0)
+
+print '\noperations:'
+print CONTROLLER.get_operation()
+CONTROLLER.set_operation('standby')
+
+print '\nEvents:'
+for i in range(8):
+    print CONTROLLER.get_event(i+1)