Merge remote-tracking branch 'origin/mergemaster'

Author: beniroquai

uc2rest/UC2Client.py

@@ -160,6 +160,7 @@ def post_json(self, path, payload, getReturn=True, nResponses=1, timeout=1):
             # FIXME: this is not working
             url = f"http://{self.host}:{self.port}{path}"
             try:
+                if timeout==0: timeout=.2
                 r = requests.post(url, json=payload, headers=self.headers,  timeout=timeout)
                 returnMessage = r.json()
                 returnMessage["success"] = r.status_code==200

uc2rest/motor.py

@@ -53,7 +53,8 @@ def __init__(self, parent=None):
         self.motorAxisOrder = [0,1,2,3] # motor axis is 1,2,3,0 => X,Y,Z,T # FIXME: Hardcoded
 
         # register a callback function for the motor status on the serial loop
-        self._parent.serial.register_callback(self._callback_motor_status, pattern="steppers")
+        if hasattr(self._parent, "serial"):
+            self._parent.serial.register_callback(self._callback_motor_status, pattern="steppers")
 
         # move motor to wake them up #FIXME: Should not be necessary!
         #self.move_stepper(steps=(1,1,1,1), speed=(1000,1000,1000,1000), is_absolute=(False,False,False,False))