|
|
@@ -964,14 +964,11 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
|
|
|
print("self.port_name", self.port_name)
|
|
|
logger.info("self.port_name %s", self.port_name)
|
|
|
if self.port_name == port_name:
|
|
|
- return True
|
|
|
- # 对没有连接的设备进行尝试连接
|
|
|
- # 如果存在串口被占用则进行断开
|
|
|
- if self.is_serial_available(port_name):
|
|
|
- return True
|
|
|
- else:
|
|
|
+ self.port_name = ""
|
|
|
+ # 对没有连接的设备进行尝试连接
|
|
|
+ # 如果存在串口被占用则进行断开
|
|
|
+ self.is_serial_available(port_name)
|
|
|
return False
|
|
|
-
|
|
|
message_data = {
|
|
|
"_type": "show_info",
|
|
|
"plugins_mode": "auto_select_com",
|
|
|
@@ -1088,34 +1085,6 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
|
|
|
if not state:
|
|
|
return False
|
|
|
return True
|
|
|
- # message_data = {
|
|
|
- # "_type": "show_info",
|
|
|
- # "plugins_mode": "auto_select_com",
|
|
|
- # "data": {"text": "有线控制器开始连接"},
|
|
|
- # }
|
|
|
- # self.sendSocketMessage(
|
|
|
- # msg="有线控制器开始连接", data=message_data, device_status=1
|
|
|
- # )
|
|
|
- # self.connected_ports_dict[port_name] = "MCU"
|
|
|
- # message_data = {
|
|
|
- # "_type": "select_port_name",
|
|
|
- # "plugins_mode": "auto_select_com",
|
|
|
- # "data": {
|
|
|
- # "device_name": "mcu" if device_id == 1 else "remote_control",
|
|
|
- # "port_name": port_name,
|
|
|
- # },
|
|
|
- # }
|
|
|
- # self.sendSocketMessage(
|
|
|
- # msg="有线控制器开始连接", data=message_data, device_status=2
|
|
|
- # )
|
|
|
- # await asyncio.sleep(2)
|
|
|
- # await self.initControlLine(serial_handle)
|
|
|
- # async def getBaseInfo():
|
|
|
- # while True:
|
|
|
- # await asyncio.sleep(1)
|
|
|
- # # 异步循环获取设备信息
|
|
|
- # self.to_get_mcu_base_info()
|
|
|
- # asyncio.gather(getBaseInfo())
|
|
|
|
|
|
else:
|
|
|
print("串口无法识别")
|
rambo