优化双通道高压源

This commit is contained in:
leon
2026-09-05 08:39:18 +08:00
parent f3526e46f1
commit 17233eb947
5 changed files with 147 additions and 28 deletions
+44 -24
View File
@@ -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]
}
}
# 发布数据