修复bug

ble.py

@@ -297,6 +297,8 @@ def notification_handler(characteristic: BleakGATTCharacteristic, data: bytearra
 async def ble_send(client, data):
     global recv_start_time
     global g_ble_mtu
+
+    logger.info('发送:{}'.format(bytes(data).hex()))     
     frame_len = g_ble_mtu   #244 #20 #244
     if g_config["def_cfg"]["ble_mtu"] > 0:
         frame_len = g_config["def_cfg"]["ble_mtu"]
@@ -377,7 +379,6 @@ async def send_form_data_list(client, i, data=None):
     byte_array = bytearray(byte_sequence)
     byte_array = ev_packing(byte_array)
     send_data = bytes(byte_array)
-    logger.info('发送{}:{}'.format(json_data[2], send_data.hex())) 
     await ble_send(client, send_data)
 
 async def task():
@@ -516,9 +517,9 @@ async def main():
 
                 try:
                     # 开始根据设备即功能处理消息
-                    ws_data = mq.get(device)
+                    ws_data = mq.get("ws_recv")
                     if ws_data:
-                        ble_send(client, ws_data)        
+                        await ble_send(client, ws_data)        
                 except Exception as err:
                     pass
 

config.json

@@ -1,6 +1,7 @@
 {
 "def_cfg":{
-	"ble_mac": "7C:B9:4C:DA:61:7C",
+	"ble_mac": "7c:b9:4c:da:af:5c",
+	"ble_mac7": "7C:B9:4C:DA:61:7C",
 	"ble_mac2": "E9:8B:FC:41:3F:CF",
 	"ble_mac3": "DB:57:46:A6:14:22",
 	"heart_beat_sel": 1,

websocket_server.py

@@ -21,13 +21,15 @@ class WebServer:
             try:
                 recv_text = await websocket.recv()
                 if recv_text:
-                    print("收到", recv_text)
-                    self.message_base.add("ws_recv", recv_text)
+                    byte_array = bytes(recv_text.encode())
+                    print("ws收到", byte_array.hex())
+                    self.message_base.add("ws_recv", byte_array)
 
                 send_text = self.message_base.get("ws_send")
                 if send_text:
-                    print("发送", send_text)
-                    await websocket.send(send_text)
+                    byte_array = bytes(send_text)
+                    print("ws发送", byte_array.hex())
+                    await websocket.send(byte_array)
                 # data = json.loads(recv_text)
                 # device = data.get("device")
                 # if device: