diff --git a/IPOS.py b/IPOS.py index 24014c6bf687d216a77968f00106aa0d836d0346..33c9d45b3f9c03fbd5816498a39d8b708d32ff94 100644 --- a/IPOS.py +++ b/IPOS.py @@ -21,10 +21,10 @@ MQTT_PATH = "usertopic/SensorEventWrapper" ser = serial.Serial('/dev/ttyUSB0', 115200, timeout=1) # open serial port print(ser.name) # check which port was really used +def extractNumbersFromLine(line): + return re.findall(r'-?\d+\.?\d*',line) - -def get_distance(line): - number_found = re.findall(r'-?\d+\.?\d*',line) +def get_distance(number_found): return number_found[1], number_found[3] def average(lst): @@ -38,10 +38,10 @@ def read_serial(number): with serial.Serial('/dev/ttyUSB0', 115200, timeout=1) as ser: for x in range(number): line = ser.readline() # read a '\n' terminated line + number_found = extractNumbersFromLine(line.decode("utf-8")); print(line) - line_decoded = line.decode("utf-8"); - if(len(line_decoded)>=4): - tag, distance = get_distance(line_decoded); + if(len(number_found)>=4): + tag, distance = get_distance(number_found); print(tag, distance) if (tag == "3383"): d1.append(float(distance))