diff --git a/hvs_service2/config.py b/hvs_service2/config.py index 7635e7b..f4a703c 100644 --- a/hvs_service2/config.py +++ b/hvs_service2/config.py @@ -13,7 +13,7 @@ PARITY = 'N' STOPBITS = 1 # 读取间隔(秒) -READ_INTERVAL = 1 +READ_INTERVAL = 0.5 # MQTT主题 DEVICE_STATUS_TOPIC = "device/status" @@ -25,12 +25,12 @@ SERVICE_STATUS_TOPIC = "service/status" # 寄存器配置 - 根据实际设备修改 INPUT_REGISTERS = { "start_address": 0, - "count": 5 + "count": 2 } COIL_REGISTERS = { "start_address": 0, - "count": 10 + "count": 4 } CONFIG_FILE = "/home/admin/.config/cpy/hvs.json" diff --git a/hvs_service2/hvs.py b/hvs_service2/hvs.py index e48dd5f..cc75f8d 100644 --- a/hvs_service2/hvs.py +++ b/hvs_service2/hvs.py @@ -35,6 +35,7 @@ class HvService: # 上次发布服务状态的时间 self.last_service_status_time = 0 + self.filament_info = [None, None] self.xray_on = [False, False] self.last_hvs_update_time = 0 @@ -73,7 +74,7 @@ class HvService: command = payload.get("command") value = payload.get("value") device_code = payload.get("device_code") - slave_id = payload.get("device_id") + slave_id = 1 # payload.get("device_id") if not device_code: logger.error("控制消息缺少device_code") return @@ -82,8 +83,10 @@ class HvService: if command == "hv_switch": if value == 1: self.modbus_client.write_coil(slave_id, 0x00, True) + self.modbus_client.write_coil(slave_id, 0x01, True) + self.modbus_client.write_holding_register(slave_id, 0x00, 1000) else: - self.modbus_client.write_coil(slave_id, 0x00, False) + self.modbus_client.write_coil(slave_id, 0x01, False) except Exception as e: logger.error(f"处理控制消息失败: {e}") @@ -129,8 +132,18 @@ class HvService: def handle_udp_message(self, data, addr): """处理UDP消息(留空,由外部实现)""" try: - data = json.loads(data.decode()) - logger.info(f"收到UDP消息: {data}") + info = json.loads(data.decode()) + logger.info(f"收到UDP消息: {info}") + if 'id' in info: + id = int(info['id'][0]) + self.filament_info[id - 1] = info + if 'work_state' in info: + self.xray_on[id - 1] = info['work_state'] == 2 + self.last_hvs_update_time = time.time() + if "osu" in info: + osu = info['osu'] + self.publish_osu_info(f"{id}#OSU", osu['temp'], osu['level']) + except json.JSONDecodeError: logger.error("UDP消息不是JSON格式") @@ -185,6 +198,20 @@ class HvService: self.modbus_client.disconnect() logger.info("程序已退出") + def publish_osu_info(self, dev_code, temp, level): + """发布OSU信息""" + data = { + "device_id": None, + "device_code": dev_code, + "timestamp": datetime.now().isoformat(), + "status": { + "online": True, + "oil_temp": temp / 10.0, + "oil_level": level, + } + } + self.mqtt_client.publish(DEVICE_STATUS_TOPIC, data) + def _publish_service_status(self, current_time): """发布服务状态""" # 计算运行时间 @@ -198,7 +225,7 @@ class HvService: "running_time": running_time } } - + # 发布消息 self.mqtt_client.publish(SERVICE_STATUS_TOPIC, service_message) logger.debug(f"成功发布服务状态到 {SERVICE_STATUS_TOPIC}: {service_message}") @@ -219,10 +246,11 @@ class HvService: # 读取输入寄存器 input_regs = self.modbus_client.read_input_registers( - slave_id=slave_id, + slave_id=1, address=INPUT_REGISTERS["start_address"], count=INPUT_REGISTERS["count"] ) + print("------------------input_regs:", input_regs) if input_regs is None: hvs_device["error_count"] = hvs_device.get("error_count", 10) + 1 else: @@ -232,24 +260,16 @@ class HvService: time.sleep(0.1) # 读取线圈 - coils = self.modbus_client.read_coils( - slave_id=slave_id, + discrete = self.modbus_client.read_discrete( + slave_id=1, address=COIL_REGISTERS["start_address"], count=COIL_REGISTERS["count"] ) - if coils is None: + print("discrete:", discrete) + if discrete is None: hvs_device["error_count"] = hvs_device.get("error_count", 10) + 1 else: hvs_device["error_count"] = 0 - - if coils is not None: - # print("coils:", coils) - if coils[2]: - self.xray_on[slave_id - 1] = True - else: - self.xray_on[slave_id - 1] = False - # print(f"slave_id: {slave_id}, xray_on: {self.xray_on[slave_id - 1]}") - self.last_hvs_update_time = time.time() # 设备间添加延迟,避免总线冲突 time.sleep(0.1) @@ -263,12 +283,12 @@ class HvService: "status": { "online": hvs_device.get("error_count", 10) < 5, "voltage": input_regs[0] / 100.0 if input_regs and len(input_regs) > 0 else None, - "current": input_regs[1] / 1000.0 if input_regs and len(input_regs) > 1 else None, - "current_filament": input_regs[2] / 1000.0 if input_regs and len(input_regs) > 2 else None, - "internal_temperature": input_regs[3] / 100.0 if input_regs and len(input_regs) > 3 else None, - "fault_status": input_regs[4] if input_regs and len(input_regs) > 4 else None, - "switch_status": coils[0] if coils and len(coils) > 0 else None, - "xray_status": coils[2] if coils and len(coils) > 2 else None + "current": self.filament_info[slave_id-1]['xray_current'] / 1000.0 if self.filament_info[slave_id-1] is not None else None, + "current_filament": self.filament_info[slave_id-1]['filament_current'] / 1000.0 if self.filament_info[slave_id-1] is not None else None, + "internal_temperature": self.filament_info[slave_id-1]['temp'] / 10.0 if self.filament_info[slave_id-1] is not None else None, + "fault_status": discrete[3] if discrete and len(discrete) > 3 else None, + "switch_status": discrete[1] if discrete and len(discrete) > 3 else None, + "xray_status": self.xray_on[slave_id-1] } } # 发布数据 diff --git a/hvs_service2/modbus_client.py b/hvs_service2/modbus_client.py index 1b19960..847d76a 100644 --- a/hvs_service2/modbus_client.py +++ b/hvs_service2/modbus_client.py @@ -155,6 +155,40 @@ class ModbusClient: logger.error(f"读取线圈异常: {str(e)} (从站{slave_id}, 地址{address}, 尝试{attempt+1}/{RETRIES})") return None + + def read_discrete(self, slave_id, address, count): + """读取离散输入状态,包含重试机制和线程锁保护""" + # 先确保连接正常,减少锁内操作 + if self.client is None or not self.client.is_socket_open(): + logger.error(f"无法确保Modbus连接,无法读取离散输入 (从站{slave_id}, 地址{address})") + return None + + try: + # 只在实际读写操作时使用锁,减少锁持有时间 + self.acquire_lock() + try: + response = self.client.read_discrete_inputs( + address=address, + count=count, + device_id=slave_id + ) + finally: + self.release_lock() + + # 检查响应 + if response.isError(): + logger.error(f"读取离散输入错误: 从站{slave_id}, 地址{address}, 尝试{attempt+1}/{RETRIES}, 错误: {response}") + + logger.debug(f"成功读取离散输入: 从站{slave_id}, 地址{address}, 值: {response.bits[:count]}") + return response.bits[:count] + except ModbusException as e: + logger.error(f"Modbus协议错误: {str(e)} (从站{slave_id}, 地址{address}, 尝试{attempt+1}/{RETRIES})") + + except Exception as e: + logger.error(f"读取离散输入异常: {str(e)} (从站{slave_id}, 地址{address}, 尝试{attempt+1}/{RETRIES})") + + return None + def _ensure_connection(self) -> bool: """确保Modbus连接正常 @@ -229,3 +263,64 @@ class ModbusClient: logger.error(f"所有{RETRIES}次写入线圈尝试均失败: 从站{slave_id}, 地址{address}") return False + + def write_holding_register(self, slave_id: int, address: int, value: int) -> bool: + """写入保持寄存器,带重试机制和线程锁保护 + + Args: + slave_id: 从站地址 + address: �保持寄存器地址 + value: 保持寄存器值 + + Returns: + bool: 写入是否成功 + """ + # 先确保连接正常,减少锁内操作 + if not self._ensure_connection(): + logger.error(f"无法确保Modbus连接,无法写入保持寄存器 (从站{slave_id}, 地址{address})") + return False + + for attempt in range(RETRIES): + try: + # 只在实际写操作时使用锁,减少锁持有时间 + self.acquire_lock() + response = None + try: + logger.debug(f"发送写入保持寄存器请求: 从站{slave_id}, 地址{address}, 值{value}") + response = self.client.write_register(address, value, device_id=slave_id) + finally: + self.release_lock() + + if response: + # 检查响应 + if response.isError(): + logger.error(f"写入保持寄存器错误响应: 从站{slave_id}, 地址{address} (尝试{attempt+1}/{RETRIES})") + # 非致命错误不立即重连,仅在最后一次尝试失败后重连 + if attempt < RETRIES - 1: + time.sleep(0.05) # 使用更短的延迟 + continue + else: + logger.debug(f"接收到写入保持寄存器响应: 长度{len(response.encode())}字节, 内容{response.encode().hex()}") + + # 快速释放锁,减少其他操作等待时间 + + logger.info(f"成功写入保持寄存器 {address}: {value} (尝试{attempt+1}/{RETRIES})") + return True + except ConnectionException as e: + logger.error(f"连接中断错误: {str(e)} (从站{slave_id}, 地址{address}, 尝试{attempt+1}/{RETRIES})") + self.connected = False # 修正变量名 + if attempt < RETRIES - 1: + time.sleep(0.05) + except ModbusException as e: + logger.error(f"Modbus协议错误: {str(e)} (从站{slave_id}, 地址{address}, 尝试{attempt+1}/{RETRIES})") + + if attempt < RETRIES - 1: + time.sleep(0.05) + except Exception as e: + logger.error(f"写入保持寄存器未知错误: {str(e)} (从站{slave_id}, 地址{address}, 尝试{attempt+1}/{RETRIES})") + + if attempt < RETRIES - 1: + time.sleep(0.05) + + logger.error(f"所有{RETRIES}次写入保持寄存器尝试均失败: 从站{slave_id}, 地址{address}") + return False diff --git a/powerbus_service/sensor.py b/powerbus_service/sensor.py index ae6ad96..1b80edb 100644 --- a/powerbus_service/sensor.py +++ b/powerbus_service/sensor.py @@ -245,6 +245,9 @@ class SensorService: for device in self.devices: try: + enabled = device.get("enabled", False) + if not enabled: + continue slave_id = int(device.get('address')) logger.info(f"开始读取设备 {device.get('code')} (从站ID: {slave_id}) 数据") diff --git a/scanner_service/Manager/mwmotor_manager.py b/scanner_service/Manager/mwmotor_manager.py index b468676..9528140 100644 --- a/scanner_service/Manager/mwmotor_manager.py +++ b/scanner_service/Manager/mwmotor_manager.py @@ -214,7 +214,8 @@ class MotorManager(QObject): if 'filament_info' in data: filament_info = deepcopy(data['filament_info']) filament_info['id'] = data['id'] - self.udp_socket.writeDatagram(json.dumps(filament_info).encode() , "127.0.0.1", 62000) + self.udp_socket.writeDatagram(QByteArray(json.dumps(filament_info).encode()) , + QHostAddress("127.0.0.1"), 62000) if 'motor_power' in data: self.scanner(index).motor_power = data['motor_power']