fix airsensor read fail issue, add vibration sensor

Author: andy

devices/__pycache__/air_sensor2.cpython-37.pyc

@@ -2,8 +2,8 @@
 
 
 class AirSensor2:
-    def __init__(self):
-        self.server = Server()
+    def __init__(self, port):
+        self.server = Server(port)
 
     def connect(self):
         """
@@ -15,6 +15,7 @@ def get_air_params(self):
         """
         send get value
         """
+        data = None
         try:
             data = self.server.send_and_receive("GetMValue", 2)
             data_list = data.split('\r\n')
@@ -32,13 +33,21 @@ def get_air_params(self):
                 }
             }
         except Exception as e:
+            print('Getting data error:\n')
+            print(data)
             print(e)
             return {"success": False}
 
 
 if __name__ == '__main__':
-    sensor = AirSensor2()
-    sensor.connect()
+    sensor1 = AirSensor2(49846)
+    sensor2 = AirSensor2(49847)
+    sensor1.connect()
+    sensor2.connect()
     while True:
-        ret = sensor.get_air_params()
-        print(ret)
+        ret1 = sensor1.get_air_params()
+        ret2 = sensor2.get_air_params()
+        print("RET - 1: ")
+        print(ret1)
+        print("RET - 2: ")
+        print(ret2)

devices/air_sensor2.py

@@ -0,0 +1,115 @@
+from drivers.serial_driver import SerialDriver
+import time
+import codecs
+from typing import Optional
+
+READ_LENGTH = 28
+START_WORD = 55
+FLAG_WORD = 61
+
+
+class WVTB01_BT50:
+    def __init__(self):
+        self.baud = 115200
+        self.serial: Optional[SerialDriver, None] = None
+
+    def build_device(self):
+        self.serial = SerialDriver()
+        self.serial.init(self.baud)
+
+    def read_data(self):
+        """
+        read buffer
+        """
+        for i in range(5):
+            data = self.serial.read_buffer2(READ_LENGTH, hex_flag=True)
+            if len(data) == READ_LENGTH * 2 and str(START_WORD) in data and str(FLAG_WORD) in data:
+                return data
+            else:
+                print(f"Try {i + 1}s Error")
+
+    def cal_get_value(self, value: str):
+        """
+        计算str类型值，转换为可用的测量值
+        """
+        value_i = int(value, 16)
+        value_h = value_i & 0xFF00
+        value_l = value_i & 0x00FF
+        value_h = value_h >> 8
+        value_l = value_l << 8
+        value_ret = value_h + value_l
+        return value_ret
+
+    def get_vibration_velocity(self, data) -> dict:
+        """
+        get x y z, 震动速度
+        """
+
+        _x = self.cal_get_value(data[4:8])
+        _y = self.cal_get_value(data[8:12])
+        _z = self.cal_get_value(data[12:16])
+        return {"x": _x, "y": _y, "z": _z}
+
+    def get_vibration_angular(self, data) -> dict:
+        """
+        get x y z, 震动角度
+        """
+        _x = self.cal_get_value(data[16:20])
+        _y = self.cal_get_value(data[20:24])
+        _z = self.cal_get_value(data[24:28])
+        return {"x": _x, "y": _y, "z": _z}
+
+    def get_temperature(self, data) -> float:
+        """
+        get temp
+        """
+        _temp = self.cal_get_value(data[28: 32])
+        return _temp / 100
+
+    def get_vibration_distance(self, data) -> dict:
+        """
+        get _x, _y, _z, 震动位移 (um)
+        """
+        _x = self.cal_get_value(data[32:36])
+        _y = self.cal_get_value(data[36:40])
+        _z = self.cal_get_value(data[40:44])
+        return {"x": _x, "y": _y, "z": _z}
+
+    def get_viration_hz(self, data) -> dict:
+        """
+        get 震动频率 （Hz）
+        """
+        _x = self.cal_get_value(data[44:48])
+        _y = self.cal_get_value(data[48:52])
+        _z = self.cal_get_value(data[52:56])
+        return {"x": _x, "y": _y, "z": _z}
+
+
+if __name__ == '__main__':
+    device = WVTB01_BT50()
+    device.build_device()
+    while True:
+        data = device.read_data()
+
+        result = device.get_vibration_velocity(data)
+        print("====震动速度====")
+        print(result)
+        print('\n')
+        result = device.get_vibration_angular(data)
+        print("====震动角度=====")
+        print(result)
+        print('\n')
+        result = device.get_temperature(data)
+        print("====温度====")
+        print(result)
+        print('\n')
+        result = device.get_vibration_distance(data)
+        print("====震动距离=====")
+        print(result)
+        print('\n')
+        result = device.get_viration_hz(data)
+        print("====震动频率=====")
+        print(result)
+        print('\n')
+
+        time.sleep(1)

devices/wtvb01_bt50.py

@@ -18,6 +18,7 @@ def get_com_list(cls):
     def __init__(self):
         self.device = None
         self.com = None
+        self.receive_buffer = None
 
     def get_device(self, select_default=False):
         """
@@ -110,17 +111,29 @@ def read_buffer(self):
             pass
         time.sleep(3)
         # length = self.com.inWaiting()
-        length = ReceiveBuffer
+        length = ReceiveBuffer if self.receive_buffer is None else self.receive_buffer
         data = self.com.read(length)
         self.com.flushInput()
         self.com.flushOutput()
         return data.decode('utf-8')
 
+    def read_buffer2(self, read_length, hex_flag=None):
+        """
+        get specify length of buffer
+        """
+        self.com.flushInput()  # 清除接收缓存数据
+        for _i in range(5):
+            time.sleep(0.1)
+            length = self.com.in_waiting
+            if length < read_length:
+                continue
+            else:
+                return self.com.read(read_length) if hex_flag is None else self.com.read(read_length).hex()
+
 
 if __name__ == '__main__':
     s = SerialDriver()
-    s.init(9600)
+    s.init(115200)
     for i in range(100):
-        ret = s.read_buffer()
-        print(ret)
-        time.sleep(1)
+        data = s.read_buffer2(28, hex_flag=True)
+        print(data)

drivers/serial_driver.py

@@ -3,14 +3,15 @@
 
 
 class Server:
-    def __init__(self):
-        self.port = 49846
+    def __init__(self, port):
+        self.port = port
         self.server_socket = None
 
     def initial_server(self):
         try:
             # 创建socket对象
             self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            self.server_socket.settimeout(6)
             # 获取本地机器的IP地址
             localhost = socket.gethostbyname(socket.gethostname())
             # 绑定socket到地址
@@ -38,7 +39,7 @@ def send_and_receive(self, cmd: str, delay_s: float, buffer=1024):
 
 
 if __name__ == '__main__':
-    server = Server()
+    server = Server(49846)
     server.initial_server()
     for i in range(100):
         data = server.send_and_receive("GetMValue", 2)

drivers/socket_interface.py

@@ -5,28 +5,47 @@
 from utils import Utils
 
 
-def init_connection():
-    sensor1 = AirSensor()
-    sensor2 = AirSensor2()
+def init_connection(sensor1=None):
+    if sensor1 is None:
+        sensor1 = None
+    else:
+        sensor1 = AirSensor()
+    sensor2 = AirSensor2(49846)
+    sensor3 = AirSensor2(49847)
     sensor2.connect()
-    return sensor1, sensor2
+    sensor3.connect()
+    return sensor1, sensor2, sensor3
 
 
-def read_air_params(sensor1, sensor2):
+def read_air_params(sensor1, sensor2, sensor3):
     """
     read tem/humidity/pressure
     """
-    sensor1_tem, sensor1_hum = sensor1.get_read()
-    air_params = sensor2.get_air_params()
+    if sensor1 is not None:
+        sensor1_tem, sensor1_hum = sensor1.get_read()
+    else:
+        sensor1_tem = ""
+        sensor1_hum = ""
+
     for i in range(30):
-        if air_params["success"] is True:
-            sensor2_tem = air_params["data"]["temperature"]
-            sensor2_hum = air_params["data"]["humidity"]
-            sensor2_pressure = air_params["data"]["pressure"]
-            return (sensor1_tem, sensor1_hum), (sensor2_tem, sensor2_hum, sensor2_pressure)
+        air_params_2 = sensor2.get_air_params()
+        air_params_3 = sensor3.get_air_params()
+        if air_params_2["success"] is True and air_params_3["success"] is True:
+            sensor2_tem = air_params_2["data"]["temperature"]
+            sensor2_hum = air_params_2["data"]["humidity"]
+            sensor2_pressure = air_params_2["data"]["pressure"]
+            sensor2_pressure_diff = air_params_2["data"]["p_difference"]
+
+            sensor3_tem = air_params_3["data"]["temperature"]
+            sensor3_hum = air_params_3["data"]["humidity"]
+            sensor3_pressure = air_params_3["data"]["pressure"]
+            sensor3_pressure_diff = air_params_3["data"]["p_difference"]
+
+            return (sensor1_tem, sensor1_hum), (sensor2_tem, sensor2_hum, sensor2_pressure, sensor2_pressure_diff), \
+                (sensor3_tem, sensor3_hum, sensor3_pressure, sensor3_pressure_diff)
         else:
             if i < 9:
-                print(f"Reading Fail {i+1} times")
+                print(f"Reading Fail {i + 1} times")
                 time.sleep(1)
             else:
                 raise ValueError
@@ -35,19 +54,26 @@ def read_air_params(sensor1, sensor2):
 def reading_and_write_csv(file_name):
     # write title
     Utils.write_to_csv(file_name, ["Time", "Sensor1-Temperature", "Sensor1-Humidity", "Sensor2-Temperature",
-                                   "Sensor2-Humidity", "Sensor2-Pressure"])
-    sensor1, sensor2 = init_connection()
+                                   "Sensor2-Humidity", "Sensor2-Pressure", "Sensor2-Pressure-Diff",
+                                   "Sensor3-Temperature",
+                                   "Sensor3-Humidity", "Sensor3-Pressure", "Sensor3-Pressure-Diff"])
+    sensor1, sensor2, sensor3 = init_connection()
 
     while True:
-        air_params = read_air_params(sensor1, sensor2)
+        air_params = read_air_params(None, sensor2, sensor3)
         current_time = Utils.get_time_string()
         print("========Sensor1========")
         print(f"Temperature: {air_params[0][0]}, Humidity: {air_params[0][1]} \n")
         print("========Sensor2========")
-        print(f"Temperature: {air_params[1][0]}, Humidity: {air_params[1][1]}, Pressure: {air_params[1][2]}\n")
+        print(
+            f"Temperature: {air_params[1][0]}, Humidity: {air_params[1][1]}, Pressure: {air_params[1][2]}, Diff: {air_params[1][3]}\n")
+        print("========Sensor3========")
+        print(
+            f"Temperature: {air_params[2][0]}, Humidity: {air_params[2][1]}, Pressure: {air_params[2][2]}, Diff: {air_params[2][3]}\n")
 
         this_line = [current_time, air_params[0][0], air_params[0][1], air_params[1][0], air_params[1][1],
-                     air_params[1][2]]
+                     air_params[1][2], air_params[1][3], air_params[2][0], air_params[2][1],
+                     air_params[2][2], air_params[2][3]]
         Utils.write_to_csv(file_name, this_line)