Skip to content

Commit 94cc93a

Browse files
committed
Merge branch 'release/v1.6.7'
2 parents 79a6ab7 + c2f1990 commit 94cc93a

29 files changed

+852
-66
lines changed

README.md

+4
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ To set up the MachineMotion Python library:
7171
pip install -U pathlib
7272
```
7373

74+
```console
75+
pip install -U paho-mqtt
76+
```
77+
7478
- The MachineMotion Python library is now ready to use. Programs can be created and ran from the workspace folder.
7579

7680
## Connectivity Setup

_MachineMotion.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -397,23 +397,23 @@ def __isPortValid(self, portName):
397397
if portName in self.validPorts:
398398
return True
399399

400-
print "ERROR: Port name " + portName + " is invalid. Try 'SENSOR4', 'SENSOR5' or 'SENSOR6'."
400+
print ( "ERROR: Port name " + portName + " is invalid. Try 'SENSOR4', 'SENSOR5' or 'SENSOR6'." )
401401

402402
sys.exit()
403403

404404
def __isDeviceValid(self, deviceName):
405405
if deviceName in self.validDevices:
406406
return True
407407

408-
print "ERROR: Device name " + deviceName + " is invalid. Try 'ENCODER' or 'IO_EXPANDER_GENERIC'."
408+
print ( "ERROR: Device name " + deviceName + " is invalid. Try 'ENCODER' or 'IO_EXPANDER_GENERIC'." )
409409

410410
sys.exit()
411411

412412
def __isSignalValid(self, signalName):
413413
if signalName in self.validSignals:
414414
return True
415415

416-
print "ERROR: Signal name " + signalName + " is invalid. Try 'SIGNAL0', 'SIGNAL1', 'SIGNAL2', 'SIGNAL3', 'SIGNAL4', 'SIGNAL5' or 'SIGNAL6'."
416+
print ( "ERROR: Signal name " + signalName + " is invalid. Try 'SIGNAL0', 'SIGNAL1', 'SIGNAL2', 'SIGNAL3', 'SIGNAL4', 'SIGNAL5' or 'SIGNAL6'." )
417417

418418
sys.exit()
419419

@@ -709,7 +709,7 @@ def __onMessage(self, client, userData, msg):
709709
self.portInputs[self.validPorts[device]] = values
710710

711711
def __onDisconnect(self, client, userData, rc):
712-
print("Disconnected with rtn code [%d]"% (rc) )
712+
print( "Disconnected with rtn code [%d]"% (rc) )
713713

714714
def __establishConnection(self, isReconnection):
715715
global gCodeCallbackRef

0 commit comments

Comments
 (0)