|
@@ -29,150 +29,6 @@ class SerialConfig:
|
|
|
dsrdtr: bool = False
|
|
dsrdtr: bool = False
|
|
|
|
|
|
|
|
|
|
|
|
|
-class Rs485Direction:
|
|
|
|
|
- """RS485 收发方向 GPIO 控制(可选)。
|
|
|
|
|
-
|
|
|
|
|
- 仅当配置了 SERIAL_RS485_DIR_GPIO(如 "gpiochip0:25")时启用。
|
|
|
|
|
- 典型用途:板载 TTL 转 RS485 模块为"自动方向"且切换太慢时,会把从机
|
|
|
|
|
- 立刻返回的应答压掉(表现为:发送正常、rx 计数完全不动)。把模块的
|
|
|
|
|
- DE/RE 引到空闲 GPIO 上,由本类在发送前拉高、发送完成后拉低即可解决。
|
|
|
|
|
-
|
|
|
|
|
- 任何异常都会让本类自动降级为"不控制方向",绝不影响串口主流程。
|
|
|
|
|
- """
|
|
|
|
|
-
|
|
|
|
|
- def __init__(self, spec: str, pre_delay: float = 0.001, post_delay: float = 0.001):
|
|
|
|
|
- self.spec = (spec or '').strip()
|
|
|
|
|
- self.pre_delay = max(0.0, float(pre_delay or 0))
|
|
|
|
|
- self.post_delay = max(0.0, float(post_delay or 0))
|
|
|
|
|
- self.chip_name = ''
|
|
|
|
|
- self.line_offset = -1
|
|
|
|
|
- self.active_low = False # True 表示低电平为"发送态"
|
|
|
|
|
- self.ready = False
|
|
|
|
|
- self._line = None
|
|
|
|
|
- self._chip = None
|
|
|
|
|
-
|
|
|
|
|
- def _parse(self) -> bool:
|
|
|
|
|
- parts = [p.strip() for p in self.spec.split(':') if p.strip()]
|
|
|
|
|
- if len(parts) < 2:
|
|
|
|
|
- logger.warning(f"RS485 方向 GPIO 配置无效(应为 gpiochip0:25[:low]): {self.spec!r}")
|
|
|
|
|
- return False
|
|
|
|
|
- self.chip_name = parts[0]
|
|
|
|
|
- try:
|
|
|
|
|
- self.line_offset = int(parts[1], 0)
|
|
|
|
|
- except ValueError:
|
|
|
|
|
- logger.warning(f"RS485 方向 GPIO line 号无效: {parts[1]!r}")
|
|
|
|
|
- return False
|
|
|
|
|
- self.active_low = len(parts) >= 3 and parts[2].lower() in ('low', 'active_low', '0')
|
|
|
|
|
- return True
|
|
|
|
|
-
|
|
|
|
|
- def open(self) -> bool:
|
|
|
|
|
- """打开并申请 GPIO 输出线,成功后 ready=True"""
|
|
|
|
|
- if not self.spec:
|
|
|
|
|
- return False
|
|
|
|
|
- if not self._parse():
|
|
|
|
|
- return False
|
|
|
|
|
- try:
|
|
|
|
|
- import gpiod # 延迟导入:没装 gpiod 的机器不受影响
|
|
|
|
|
- except Exception as e:
|
|
|
|
|
- logger.warning(f"RS485 方向 GPIO 不可用(gpiod 未安装): {e}")
|
|
|
|
|
- return False
|
|
|
|
|
-
|
|
|
|
|
- try:
|
|
|
|
|
- chip_cls = getattr(gpiod, 'Chip', None) or getattr(gpiod, 'chip', None)
|
|
|
|
|
- if chip_cls is None:
|
|
|
|
|
- logger.warning("RS485 方向 GPIO 不可用:当前 gpiod 版本不支持 Chip/chip API")
|
|
|
|
|
- return False
|
|
|
|
|
- self._chip = chip_cls(self.chip_name)
|
|
|
|
|
- self._line = self._chip.get_line(self.line_offset)
|
|
|
|
|
- if not self._request_output(gpiod):
|
|
|
|
|
- return False
|
|
|
|
|
- # 上电默认处于接收态
|
|
|
|
|
- self._set(False)
|
|
|
|
|
- self.ready = True
|
|
|
|
|
- logger.info(
|
|
|
|
|
- f"RS485 方向控制已启用: {self.spec}({'低' if self.active_low else '高'}电平为发送态,"
|
|
|
|
|
- f"前置 {self.pre_delay*1000:.1f}ms / 后置 {self.post_delay*1000:.1f}ms)"
|
|
|
|
|
- )
|
|
|
|
|
- return True
|
|
|
|
|
- except Exception as e:
|
|
|
|
|
- logger.warning(f"RS485 方向 GPIO 打开失败,将不控制方向: {e}")
|
|
|
|
|
- self._line = None
|
|
|
|
|
- self._chip = None
|
|
|
|
|
- self.ready = False
|
|
|
|
|
- return False
|
|
|
|
|
-
|
|
|
|
|
- def _request_output(self, gpiod) -> bool:
|
|
|
|
|
- """兼容 gpiod 1.4/1.5/2.x 的申请输出写法"""
|
|
|
|
|
- attempts = []
|
|
|
|
|
- # 1.5.x:line_request 对象
|
|
|
|
|
- if hasattr(gpiod, 'line_request'):
|
|
|
|
|
- try:
|
|
|
|
|
- req = gpiod.line_request()
|
|
|
|
|
- req.consumer = 'dzxj_dtu_rs485_dir'
|
|
|
|
|
- req.request_type = getattr(gpiod.line_request, 'DIRECTION_OUTPUT',
|
|
|
|
|
- getattr(gpiod, 'LINE_REQ_DIR_OUT', 2))
|
|
|
|
|
- attempts.append(lambda: self._line.request(req))
|
|
|
|
|
- except Exception:
|
|
|
|
|
- pass
|
|
|
|
|
- # 1.4.x:名称参数
|
|
|
|
|
- attempts.append(lambda: self._line.request(
|
|
|
|
|
- consumer='dzxj_dtu_rs485_dir',
|
|
|
|
|
- type=getattr(gpiod, 'LINE_REQ_DIR_OUT', 2)))
|
|
|
|
|
- # 2.x:位置参数
|
|
|
|
|
- attempts.append(lambda: self._line.request('dzxj_dtu_rs485_dir', 2, 0))
|
|
|
|
|
-
|
|
|
|
|
- last_err = None
|
|
|
|
|
- for fn in attempts:
|
|
|
|
|
- try:
|
|
|
|
|
- fn()
|
|
|
|
|
- return True
|
|
|
|
|
- except Exception as e:
|
|
|
|
|
- last_err = e
|
|
|
|
|
- logger.warning(f"RS485 方向 GPIO 申请失败: {last_err}")
|
|
|
|
|
- return False
|
|
|
|
|
-
|
|
|
|
|
- def _set(self, is_tx: bool):
|
|
|
|
|
- if self._line is None:
|
|
|
|
|
- return
|
|
|
|
|
- value = (0 if is_tx else 1) if self.active_low else (1 if is_tx else 0)
|
|
|
|
|
- try:
|
|
|
|
|
- self._line.set_value(value)
|
|
|
|
|
- except Exception as e:
|
|
|
|
|
- logger.warning(f"RS485 方向 GPIO 置位失败,停止方向控制: {e}")
|
|
|
|
|
- self.ready = False
|
|
|
|
|
-
|
|
|
|
|
- def to_tx(self):
|
|
|
|
|
- """切换到发送态"""
|
|
|
|
|
- if not self.ready:
|
|
|
|
|
- return
|
|
|
|
|
- self._set(True)
|
|
|
|
|
- if self.pre_delay:
|
|
|
|
|
- time.sleep(self.pre_delay)
|
|
|
|
|
-
|
|
|
|
|
- def to_rx(self):
|
|
|
|
|
- """切回接收态(必须在最后一位真正发完之后调用)"""
|
|
|
|
|
- if not self.ready:
|
|
|
|
|
- return
|
|
|
|
|
- if self.post_delay:
|
|
|
|
|
- time.sleep(self.post_delay)
|
|
|
|
|
- self._set(False)
|
|
|
|
|
-
|
|
|
|
|
- def close(self):
|
|
|
|
|
- self.ready = False
|
|
|
|
|
- try:
|
|
|
|
|
- if self._line is not None:
|
|
|
|
|
- self._line.release()
|
|
|
|
|
- except Exception:
|
|
|
|
|
- pass
|
|
|
|
|
- try:
|
|
|
|
|
- if self._chip is not None and hasattr(self._chip, 'close'):
|
|
|
|
|
- self._chip.close()
|
|
|
|
|
- except Exception:
|
|
|
|
|
- pass
|
|
|
|
|
- self._line = None
|
|
|
|
|
- self._chip = None
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
class SerialPort:
|
|
class SerialPort:
|
|
|
"""串口通信类,提供串口连接、读写和状态管理功能"""
|
|
"""串口通信类,提供串口连接、读写和状态管理功能"""
|
|
|
|
|
|
|
@@ -187,7 +43,6 @@ class SerialPort:
|
|
|
self.status_callback = None
|
|
self.status_callback = None
|
|
|
self.error_callback = None
|
|
self.error_callback = None
|
|
|
self.current_config = None
|
|
self.current_config = None
|
|
|
- self._rs485_dir = None # RS485 方向控制(可选)
|
|
|
|
|
self.reconnect_attempts = 0
|
|
self.reconnect_attempts = 0
|
|
|
self.max_reconnect_attempts = 3
|
|
self.max_reconnect_attempts = 3
|
|
|
self.raw_response_buffer = []
|
|
self.raw_response_buffer = []
|
|
@@ -260,47 +115,8 @@ class SerialPort:
|
|
|
|
|
|
|
|
logger.info("串口发送队列工作线程结束")
|
|
logger.info("串口发送队列工作线程结束")
|
|
|
|
|
|
|
|
- def _init_rs485_dir(self):
|
|
|
|
|
- """按配置初始化 RS485 方向控制 GPIO(未配置则不启用)"""
|
|
|
|
|
- self._close_rs485_dir()
|
|
|
|
|
- try:
|
|
|
|
|
- import config as app_config
|
|
|
|
|
- spec = getattr(app_config, 'SERIAL_RS485_DIR_GPIO', '') or ''
|
|
|
|
|
- pre = getattr(app_config, 'SERIAL_RS485_DIR_PRE_DELAY', 0.001)
|
|
|
|
|
- post = getattr(app_config, 'SERIAL_RS485_DIR_POST_DELAY', 0.001)
|
|
|
|
|
- except Exception:
|
|
|
|
|
- return
|
|
|
|
|
- if not spec:
|
|
|
|
|
- return
|
|
|
|
|
- direction = Rs485Direction(spec, pre_delay=pre, post_delay=post)
|
|
|
|
|
- if direction.open():
|
|
|
|
|
- self._rs485_dir = direction
|
|
|
|
|
- else:
|
|
|
|
|
- self._rs485_dir = None
|
|
|
|
|
-
|
|
|
|
|
- def _close_rs485_dir(self):
|
|
|
|
|
- if self._rs485_dir is not None:
|
|
|
|
|
- try:
|
|
|
|
|
- self._rs485_dir.close()
|
|
|
|
|
- except Exception:
|
|
|
|
|
- pass
|
|
|
|
|
- self._rs485_dir = None
|
|
|
|
|
-
|
|
|
|
|
- def _rs485_write(self, data: bytes) -> int:
|
|
|
|
|
- """写串口并 flush(tcdrain)。
|
|
|
|
|
-
|
|
|
|
|
- 配置了方向 GPIO 时:发送前切到发送态,最后一位发完后立刻切回接收态,
|
|
|
|
|
- 避免板载 485 模块方向切换滞后把从机应答压掉。
|
|
|
|
|
- """
|
|
|
|
|
- direction = self._rs485_dir
|
|
|
|
|
- if direction is not None and direction.ready:
|
|
|
|
|
- direction.to_tx()
|
|
|
|
|
- try:
|
|
|
|
|
- sent = self.ser.write(data)
|
|
|
|
|
- self.ser.flush()
|
|
|
|
|
- finally:
|
|
|
|
|
- direction.to_rx()
|
|
|
|
|
- return sent
|
|
|
|
|
|
|
+ def _write_and_flush(self, data: bytes) -> int:
|
|
|
|
|
+ """写串口并 flush(tcdrain),确保最后一位真正发完"""
|
|
|
sent = self.ser.write(data)
|
|
sent = self.ser.write(data)
|
|
|
self.ser.flush()
|
|
self.ser.flush()
|
|
|
return sent
|
|
return sent
|
|
@@ -311,7 +127,7 @@ class SerialPort:
|
|
|
with self.lock:
|
|
with self.lock:
|
|
|
if not self.is_connected or not self.ser or not self.ser.is_open:
|
|
if not self.is_connected or not self.ser or not self.ser.is_open:
|
|
|
return False, "serial port not connected"
|
|
return False, "serial port not connected"
|
|
|
- bytes_sent = self._rs485_write(data)
|
|
|
|
|
|
|
+ bytes_sent = self._write_and_flush(data)
|
|
|
if self.send_callback and data:
|
|
if self.send_callback and data:
|
|
|
self.send_callback(data.hex())
|
|
self.send_callback(data.hex())
|
|
|
return True, "send ok"
|
|
return True, "send ok"
|
|
@@ -342,7 +158,7 @@ class SerialPort:
|
|
|
else:
|
|
else:
|
|
|
raise TypeError("数据必须是字符串或字节类型")
|
|
raise TypeError("数据必须是字符串或字节类型")
|
|
|
|
|
|
|
|
- bytes_sent = self._rs485_write(bytes_data)
|
|
|
|
|
|
|
+ bytes_sent = self._write_and_flush(bytes_data)
|
|
|
|
|
|
|
|
logger.debug(f"发送数据到串口: {bytes_data.hex()[:50]}... (共{bytes_sent}字节)")
|
|
logger.debug(f"发送数据到串口: {bytes_data.hex()[:50]}... (共{bytes_sent}字节)")
|
|
|
return True, "发送成功"
|
|
return True, "发送成功"
|
|
@@ -379,7 +195,7 @@ class SerialPort:
|
|
|
return b''
|
|
return b''
|
|
|
self.raw_response_buffer.clear()
|
|
self.raw_response_buffer.clear()
|
|
|
self.ser.reset_input_buffer()
|
|
self.ser.reset_input_buffer()
|
|
|
- self._rs485_write(data)
|
|
|
|
|
|
|
+ self._write_and_flush(data)
|
|
|
# 485 半双工:等最后字节发完并给收发器一点切换方向的时间
|
|
# 485 半双工:等最后字节发完并给收发器一点切换方向的时间
|
|
|
time.sleep(0.03)
|
|
time.sleep(0.03)
|
|
|
|
|
|
|
@@ -579,9 +395,6 @@ class SerialPort:
|
|
|
self.current_config = config
|
|
self.current_config = config
|
|
|
self.reconnect_attempts = 0
|
|
self.reconnect_attempts = 0
|
|
|
|
|
|
|
|
- # RS485 方向控制 GPIO(可选,未配置则跳过)
|
|
|
|
|
- self._init_rs485_dir()
|
|
|
|
|
-
|
|
|
|
|
# 启动读取线程
|
|
# 启动读取线程
|
|
|
self.read_thread = threading.Thread(target=self._read_loop, daemon=True)
|
|
self.read_thread = threading.Thread(target=self._read_loop, daemon=True)
|
|
|
self.read_thread.start()
|
|
self.read_thread.start()
|
|
@@ -606,9 +419,6 @@ class SerialPort:
|
|
|
try:
|
|
try:
|
|
|
logger.info("断开串口连接")
|
|
logger.info("断开串口连接")
|
|
|
|
|
|
|
|
- # 释放 RS485 方向控制 GPIO
|
|
|
|
|
- self._close_rs485_dir()
|
|
|
|
|
-
|
|
|
|
|
# 阶段 0:清空发送队列中待执行的指令,避免断开后再发数据
|
|
# 阶段 0:清空发送队列中待执行的指令,避免断开后再发数据
|
|
|
try:
|
|
try:
|
|
|
while not self._cmd_queue.empty():
|
|
while not self._cmd_queue.empty():
|
|
@@ -696,7 +506,6 @@ class SerialPort:
|
|
|
|
|
|
|
|
def _close_on_error(self):
|
|
def _close_on_error(self):
|
|
|
"""读取异常时关闭串口并触发状态回调,但不直接重连"""
|
|
"""读取异常时关闭串口并触发状态回调,但不直接重连"""
|
|
|
- self._close_rs485_dir()
|
|
|
|
|
with self.lock:
|
|
with self.lock:
|
|
|
if self.ser and self.ser.is_open:
|
|
if self.ser and self.ser.is_open:
|
|
|
try:
|
|
try:
|