Merge branch 'release/v1.6.7'

VentionCo · Jul 16, 2019 · 94cc93a · 94cc93a
2 parents 79a6ab7 + c2f1990
commit 94cc93a
Show file tree

Hide file tree

Showing 29 changed files with 852 additions and 66 deletions.
diff --git a/README.md b/README.md
@@ -71,6 +71,10 @@ To set up the MachineMotion Python library:
   pip install -U pathlib
   ```
 
+  ```console
+  pip install -U paho-mqtt
+  ```
+
 - The MachineMotion Python library is now ready to use. Programs can be created and ran from the workspace folder.
 
 ## Connectivity Setup

diff --git a/_MachineMotion.py b/_MachineMotion.py
@@ -397,23 +397,23 @@ def __isPortValid(self, portName):
         if portName in self.validPorts:
             return True
 
-        print "ERROR: Port name " + portName + " is invalid. Try 'SENSOR4', 'SENSOR5' or 'SENSOR6'."
+        print ( "ERROR: Port name " + portName + " is invalid. Try 'SENSOR4', 'SENSOR5' or 'SENSOR6'." )
 
         sys.exit()
 
     def __isDeviceValid(self, deviceName):
         if deviceName in self.validDevices:
             return True
 
-        print "ERROR: Device name " + deviceName + " is invalid. Try 'ENCODER' or 'IO_EXPANDER_GENERIC'."
+        print ( "ERROR: Device name " + deviceName + " is invalid. Try 'ENCODER' or 'IO_EXPANDER_GENERIC'." )
 
         sys.exit()
 
     def __isSignalValid(self, signalName):
         if signalName in self.validSignals:
             return True
 
-        print "ERROR: Signal name " + signalName + " is invalid. Try 'SIGNAL0', 'SIGNAL1', 'SIGNAL2', 'SIGNAL3', 'SIGNAL4', 'SIGNAL5' or 'SIGNAL6'."
+        print ( "ERROR: Signal name " + signalName + " is invalid. Try 'SIGNAL0', 'SIGNAL1', 'SIGNAL2', 'SIGNAL3', 'SIGNAL4', 'SIGNAL5' or 'SIGNAL6'." )
 
         sys.exit()
 
@@ -709,7 +709,7 @@ def __onMessage(self, client, userData, msg):
             self.portInputs[self.validPorts[device]] = values
 
     def __onDisconnect(self, client, userData, rc):
-       print("Disconnected with rtn code [%d]"% (rc) )
+       print( "Disconnected with rtn code [%d]"% (rc) )
 
     def __establishConnection(self, isReconnection):
         global gCodeCallbackRef