Merge pull request #82 from openUC2/mergemaster

reducing debug output

Author: beniroquai

uc2rest/TEST/TEST_ESP32_Serial.py

@@ -6,6 +6,7 @@
 port = "unknown"
 port = "/dev/cu.SLAB_USBtoUART"
 #port = "COM3"
+print("start")
 ESP32 = uc2rest.UC2Client(serialport=port, baudrate=115200, DEBUG=True)
 #ESP32.serial.sendMessage('{"task":"/home_act", "home": {"steppers": [{"stepperid":1, "timeout": 20000, "speed": 15000, "direction":1, "endposrelease":3000}]}}')
 
@@ -40,20 +41,6 @@
 mState = ESP32.state.get_state()
 
 
-''' ################
-MODULES
-################'''
-#load modules from pyhton
-mModules = ESP32.modules.get_default_modules()
-assert mModules["home"] == 0 or mModules["home"] == 1, "Failed loading the default modules"
-print(mModules) #{'led': True, 'motor': True, 'home': True, 'analogin': False, 'pid': False, 'laser': True, 'dac': False, 'analogout': False, 'digitalout': False, 'digitalin': True, 'scanner': False, 'joy': False}
-
-# load modules from device
-mModulesDevice = ESP32.modules.get_modules()
-#assert mModulesDevice["home"] == 0 or mModulesDevice["home"] == 1, "Failed loading the modules from the device"
-print(mModulesDevice) #{'led': True, 'motor': True, 'home': True, 'analogin': False, 'pid': False, 'laser': True, 'dac': False, 'analogout': False, 'digitalout': False, 'digitalin': True, 'scanner': False, 'joy': False}
-mModules['home']=1 # activate home module
-#%%
 
 
 ESP32.motor.move_x(steps=10000, speed=10000, is_blocking=True)
@@ -67,7 +54,7 @@
 # check if we are connected 
 # see if it's the right device
 mState = ESP32.state.get_state()
-assert mState["state"]["identifier_name"] == "UC2_Feather", "Wrong device connected"
+#assert mState["state"]["identifier_name"] == "UC2_Feather", "Wrong device connected"
 
 #%% 
 # test Motor

uc2rest/mserial.py

@@ -50,14 +50,15 @@ def __init__(self, port, baudrate=115200, timeout=5,
     def breakCurrentCommunication(self):
         self.resetLastCommand = True
 
-    def     _freeSerialBuffer(self, ser, timeout=5, timeMinimum=0):
+    def _freeSerialBuffer(self, ser, timeout=5, timeMinimum=0):
         t0 = time.time()
         # free up any old data
         while True:
             try:
                 readLineRaw = ser.readline()
                 readLine = readLineRaw.decode('utf-8').strip()
-                if self.DEBUG: self._logger.debug(readLine)
+                if self.DEBUG and readLine != "": 
+                    self._logger.debug(readLine)
                 if readLine == "" and time.time()-t0 > timeMinimum:
                     break
             except Exception as e:
@@ -168,7 +169,8 @@ def checkFirmware(self, ser):
         for i in range(500):
             # if we just want to send but not even wait for a response
             mReadline = ser.readline()
-            if self.DEBUG and mReadline != "": self._logger.debug("[checkFirmware]: "+str(mReadline))
+            if self.DEBUG and mReadline != "" and mReadline != "\n" and mReadline != b'' and mReadline != b'\n': 
+                self._logger.debug("[checkFirmware]: "+str(mReadline))
             if mReadline.decode('utf-8').strip() == "++":
                 self._freeSerialBuffer(ser)
                 return True