|
@@ -422,7 +422,7 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
|
|
|
if self.send_data_queue:
|
|
if self.send_data_queue:
|
|
|
# self.sendSocketMessage(msg="正在发送命令", device_status=1)
|
|
# self.sendSocketMessage(msg="正在发送命令", device_status=1)
|
|
|
data = self.send_data_queue.pop(0)
|
|
data = self.send_data_queue.pop(0)
|
|
|
- print("\033[1;32;40m 正在发送命令 \033[0m",data)
|
|
|
|
|
|
|
+ # print("\033[1;32;40m 正在发送命令 \033[0m",data)
|
|
|
self.serial_ins.write_cmd(data)
|
|
self.serial_ins.write_cmd(data)
|
|
|
# self.sendSocketMessage(msg="命令发送完成", device_status=2)
|
|
# self.sendSocketMessage(msg="命令发送完成", device_status=2)
|
|
|
else:
|
|
else:
|
|
@@ -456,9 +456,11 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
|
|
|
data = receive_data[1:].decode()
|
|
data = receive_data[1:].decode()
|
|
|
if "设备初始化完成" in data:
|
|
if "设备初始化完成" in data:
|
|
|
self.init_state = True
|
|
self.init_state = True
|
|
|
|
|
+ logger.info("设备初始化完成:%s", data)
|
|
|
self.sendSocketMessage(msg=data, device_status=2)
|
|
self.sendSocketMessage(msg=data, device_status=2)
|
|
|
- print("115 print_mcu_error_data:", data)
|
|
|
|
|
- logger.info("115 print_mcu_error_data:%s", data)
|
|
|
|
|
|
|
+ else:
|
|
|
|
|
+ print("设备异常数据打印:", data)
|
|
|
|
|
+ logger.info("115 设备异常数据打印:%s", data)
|
|
|
except BaseException as e:
|
|
except BaseException as e:
|
|
|
print("117 error {}".format(e))
|
|
print("117 error {}".format(e))
|
|
|
logger.info("117 error %s", e)
|
|
logger.info("117 error %s", e)
|
|
@@ -599,6 +601,7 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
|
|
|
if not receive_data:
|
|
if not receive_data:
|
|
|
return False
|
|
return False
|
|
|
command = receive_data[0]
|
|
command = receive_data[0]
|
|
|
|
|
+ print("get_basic_info_mcu",command)
|
|
|
if command in self.deal_code_func_dict:
|
|
if command in self.deal_code_func_dict:
|
|
|
self.deal_code_func_dict[command](receive_data)
|
|
self.deal_code_func_dict[command](receive_data)
|
|
|
|
|
|
|
@@ -898,7 +901,9 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
|
|
|
"state_overturn_steering": self.state_overturn_steering,
|
|
"state_overturn_steering": self.state_overturn_steering,
|
|
|
},
|
|
},
|
|
|
}
|
|
}
|
|
|
|
|
+ self.msg_type = "get_mcu_info"
|
|
|
self.sendSocketMessage(msg="获取mcu设备运行状态信息", data=message)
|
|
self.sendSocketMessage(msg="获取mcu设备运行状态信息", data=message)
|
|
|
|
|
+ self.msg_type = "mcu"
|
|
|
# print("转盘:{},时间:{}".format(self.state_turntable_steering, time.time()))
|
|
# print("转盘:{},时间:{}".format(self.state_turntable_steering, time.time()))
|
|
|
|
|
|
|
|
if len(receive_data) == 8:
|
|
if len(receive_data) == 8:
|
|
@@ -942,7 +947,9 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
|
|
|
):
|
|
):
|
|
|
self.init_state = True
|
|
self.init_state = True
|
|
|
self.sendSocketMessage(msg="设备初始化完成", device_status=2)
|
|
self.sendSocketMessage(msg="设备初始化完成", device_status=2)
|
|
|
|
|
+ self.msg_type = "get_mcu_info"
|
|
|
self.sendSocketMessage(msg="获取mcu设备运行状态信息", data=message)
|
|
self.sendSocketMessage(msg="获取mcu设备运行状态信息", data=message)
|
|
|
|
|
+ self.msg_type = "mcu"
|
|
|
# 检查是否成功初始化
|
|
# 检查是否成功初始化
|
|
|
if self.is_just_init_time is False:
|
|
if self.is_just_init_time is False:
|
|
|
if self.mcu_move_state == 2:
|
|
if self.mcu_move_state == 2:
|