docs(manual): 说明书补充设备升级章节/FAQ/注意事项/封面版本, 文档版本V1.2

gateway_config.py

@@ -10,7 +10,6 @@ import time
 import struct
 import zlib
 import threading
-import socket
 
 from PyQt5.QtWidgets import (
     QApplication, QMainWindow, QWidget, QVBoxLayout, QHBoxLayout,
@@ -127,176 +126,6 @@ class SerialThread(QThread):
         self.wait()
 
 
-class TcpServerThread(QThread):
-    """TCP服务线程: 监听端口, 等待网关Cat1模组(AT+LIPOPEN)主动连入后透传升级帧。"""
-    client_connected = pyqtSignal(str)
-    client_disconnected = pyqtSignal(str, bool)   # (client_ip, was_upgrade_session)
-    session_resumed = pyqtSignal(str)   # (client_ip) upgrade session (re)locked
-    ip_list_changed = pyqtSignal(list)   # 当前所有已连接客户端IP
-    data_received_raw = pyqtSignal(bytes)
-    listen_error = pyqtSignal(str)
-
-    def __init__(self, port):
-        super().__init__()
-        self.port = port
-        self.running = True
-        self._hexbufs = {}   # per-conn hex tail buffer (device uplink is ASCII hex text)
-        self.sock = None          # listen socket
-        self.conn = None          # upgrade session client (first valid ACK), None = not locked
-        self.conn_lock = threading.Lock()
-        self._conns = {}          # {sock: ip} all connected clients
-        self.expect_mac = None   # target DevMac for ACK sniff (set by upgrade dialog); None = accept first valid ACK
-        self.target_ip = None   # 握手成功的目标IP(升级包只发它)
-        self._errsince = {}   # conn -> first OSError time (5s grace before declaring dead)
-
-    def run(self):
-        try:
-            self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-            self.sock.bind(('0.0.0.0', self.port))
-            self.sock.listen(5)
-            self.sock.settimeout(0.1)
-        except Exception as e:
-            self.listen_error.emit(str(e))
-            return
-        while self.running:
-            # 1) accept new clients (non-blocking poll)
-            try:
-                conn, addr = self.sock.accept()
-                conn.settimeout(0.05)
-                try:
-                    conn.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-                except Exception:
-                    pass
-                with self.conn_lock:
-                    self._conns[conn] = addr[0]
-                self.client_connected.emit(addr[0])
-                self._push_ip_list()
-            except socket.timeout:
-                pass
-            except OSError:
-                break
-            # 2) poll every client for data
-            with self.conn_lock:
-                items = list(self._conns.items())
-            dead = []
-            for conn, ip in items:
-                try:
-                    data = conn.recv(4096)
-                    self._errsince.pop(conn, None)
-                except socket.timeout:
-                    continue
-                except OSError:
-                    t0 = self._errsince.get(conn)
-                    if t0 is None:
-                        self._errsince[conn] = time.monotonic()
-                        continue
-                    if time.monotonic() - t0 < 5.0:
-                        continue
-                    dead.append((conn, self.target_ip == ip))
-                    continue
-                if not data:
-                    dead.append((conn, self.target_ip == ip))
-                    continue
-                if self.target_ip is not None and ip != self.target_ip:
-                    continue   # session locked: only locked client's data is processed
-                self._sniff_ack_lock(conn, ip, data)
-                self.data_received_raw.emit(self._decode_hex_conn(conn, data))
-            # 3) clean up disconnected clients
-            for conn, was_session in dead:
-                with self.conn_lock:
-                    ip = self._conns.pop(conn, None)
-                    if self.conn is conn:
-                        self.conn = None
-                self._hexbufs.pop(id(conn), None)
-                try:
-                    conn.close()
-                except Exception:
-                    pass
-                self.client_disconnected.emit(ip if ip else '', was_session)
-                if was_session:
-                    self.target_ip = None
-                self._push_ip_list()
-        try:
-            self.sock.close()
-        except Exception:
-            pass
-
-    def _sniff_ack_lock(self, conn, ip, data):
-        """握手阶段(目标未定): 嗅探首个合法 ACK(0x01,len3,总14) 或 REQ(0x02,len4,总15) 帧(0x7D+CRC),
-        且帧内MAC与目标设备MAC一致时, 选定该IP为升级目标。"""
-        if self.target_ip is not None:
-            return
-        for i in range(len(data) - 13):
-            if data[i] != 0x7D:
-                continue
-            cmd = data[i + 7]
-            plen = data[i + 8]
-            is_ack = (cmd == 0x01 and plen == 0x03)
-            is_req = (cmd == 0x02 and plen == 0x04)
-            if not (is_ack or is_req):
-                continue
-            flen = 14 if is_ack else 15
-            if i + flen > len(data):
-                break
-            frame = data[i:i + flen]
-            if crc16_modbus(frame[:-2]) != (frame[-2] | (frame[-1] << 8)):
-                continue
-            if self.expect_mac is not None and bytes(frame[1:7]) != bytes(self.expect_mac):
-                continue   # 非目标设备的握手应答(旧固件无MAC过滤): 不选定
-            with self.conn_lock:
-                if self.target_ip is None:
-                    self.target_ip = ip
-            self.session_resumed.emit(ip)
-            return
-
-    def _decode_hex_conn(self, conn, data):
-        """Device uplink is ASCII hex text: stream-decode to binary (keep odd tail), per connection."""
-        key = id(conn)
-        buf = self._hexbufs.get(key, b"") + data
-        n = len(buf) - (len(buf) % 2)
-        self._hexbufs[key] = buf[n:]
-        try:
-            return bytes.fromhex(buf[:n].decode('ascii'))
-        except ValueError:
-            self._hexbufs[key] = b""   # invalid chars: drop and resync
-            return b""
-
-    def send_data(self, data):
-        """握手阶段(目标未定)广播所有连接; 目标选定后只发目标IP的连接。"""
-        with self.conn_lock:
-            if self.target_ip is not None:
-                targets = [c for c, ip in self._conns.items() if ip == self.target_ip]
-            else:
-                targets = list(self._conns.keys())
-        ok = False
-        for conn in targets:
-            try:
-                conn.sendall(data)
-                ok = True
-            except Exception:
-                pass
-        return ok
-
-    def _push_ip_list(self):
-        with self.conn_lock:
-            ips = sorted(set(self._conns.values()))
-        self.ip_list_changed.emit(ips)
-
-    def release_session(self):
-        """升级结束(完成/取消/关闭): 清除目标IP, 恢复广播模式。"""
-        with self.conn_lock:
-            self.target_ip = None
-
-    def is_client_connected(self):
-        with self.conn_lock:
-            return len(self._conns) > 0
-
-    def stop(self):
-        self.running = False
-        self.wait(3000)
-
-
 class GatewayConfigTool(QMainWindow):
     def __init__(self):
         super().__init__()
@@ -315,7 +144,7 @@ class GatewayConfigTool(QMainWindow):
         self.refresh_ports()
 
     def init_ui(self):
-        self.setWindowTitle("网关配置工具(宽带版 V1.3.0)")
+        self.setWindowTitle("网关配置工具(窄带版 V1.2.2)")
         self.setWindowIcon(QIcon(resource_path("物联网网关.png")))
         self.setMinimumSize(940, 640)
         self.resize(1000, 700)
@@ -375,9 +204,8 @@ class GatewayConfigTool(QMainWindow):
         lora_layout.addWidget(QLabel("信道频率(fc):"))
         self.combo_lora_fc = QComboBox()
         self.combo_lora_fc.setFixedWidth(200)
-        # 宽带 Lora 信道：433.1MHz ~ 492.6MHz，步进0.5MHz，共120信道（信道0起始）
         lora_freqs = []
-        fc_hz = 433100000
+        fc_hz = 470100000
         ch_idx = 0
         while fc_hz <= 492600000:
             mhz = fc_hz / 1000000
@@ -782,7 +610,7 @@ class UpgradeDialog(QDialog):
     def __init__(self, main_window):
         super().__init__(main_window)
         self.main = main_window
-        self.setWindowTitle("设备升级 - 通用升级协议V1.1")
+        self.setWindowTitle("设备升级 - 通用串口升级协议V1.1")
         self.setModal(False)
         self.resize(720, 520)
 
@@ -793,12 +621,6 @@ class UpgradeDialog(QDialog):
         self._sent = set()
         self._buf = b""
         self._timer = QTimer()
-        self.channel = 'serial'       # 升级通道: serial / tcp
-        self.tcp_thread = None
-        self._window = 8              # TCP模式每批包数(窗口流控)
-        self._window_start = 0        # 当前批次首包序号(超时重发用)
-        self._retry_cnt = 0           # TCP模式超时重发计数
-        self._resume_base = 0         # 断点续传基数(设备已收包数)
         self._timer.setSingleShot(True)
         self._timer.timeout.connect(self._on_timeout)
 
@@ -816,7 +638,6 @@ class UpgradeDialog(QDialog):
         self.fw_edit.setPlaceholderText("选择固件文件...")
         cfg_layout.addWidget(self.fw_edit, 0, 1)
         btn_browse = QPushButton("浏览")
-        btn_browse.setFixedWidth(70)
         btn_browse.clicked.connect(self._choose_file)
         cfg_layout.addWidget(btn_browse, 0, 2)
 
@@ -829,63 +650,15 @@ class UpgradeDialog(QDialog):
         mac_hint.setStyleSheet("color:#909090;")
         cfg_layout.addWidget(mac_hint, 1, 2)
 
-        # 通道选择 + TCP监听
-        cfg_layout.addWidget(QLabel("通道:"), 2, 0)
-        self.combo_channel = QComboBox()
-        self.combo_channel.addItems(["串口", "TCP(Cat1)"])
-        self.combo_channel.currentIndexChanged.connect(self._on_channel_changed)
-        cfg_layout.addWidget(self.combo_channel, 2, 1)
-        tcp_row = QHBoxLayout()
-        self.tcp_lbl = QLabel("TCP端口:")
-        tcp_row.addWidget(self.tcp_lbl)
-        self.tcp_port_edit = QLineEdit("8080")
-        self.tcp_port_edit.setFixedWidth(80)
-        tcp_row.addWidget(self.tcp_port_edit)
-        self.btn_tcp_listen = QPushButton("开始监听")
-        self.btn_tcp_listen.setFixedWidth(90)
-        self.btn_tcp_listen.clicked.connect(self._toggle_tcp_listen)
-        tcp_row.addWidget(self.btn_tcp_listen)
-        self.ip_lbl = QLabel("客户端:")
-        tcp_row.addWidget(self.ip_lbl)
-        self.ip_cmb = QComboBox()
-        self.ip_cmb.setFixedWidth(140)
-        tcp_row.addWidget(self.ip_cmb)
-        tcp_row.addStretch()
-        self.tcp_row_w = QWidget()
-        self.tcp_row_w.setLayout(tcp_row)
-        cfg_layout.addWidget(self.tcp_row_w, 2, 2)
-
-        # 串口参数行(串口通道): 串口选择/波特率/打开
-        serial_row = QHBoxLayout()
-        self.serial_cmb = QComboBox()
-        self.serial_cmb.setFixedWidth(150)
-        serial_row.addWidget(self.serial_cmb)
-        self.baud_cmb = QComboBox()
-        self.baud_cmb.setEditable(True)
-        self.baud_cmb.addItems(["115200", "230400", "460800", "500000", "921600", "1000000"])
-        self.baud_cmb.setCurrentText("500000")
-        self.baud_cmb.setFixedWidth(90)
-        serial_row.addWidget(self.baud_cmb)
-        self.btn_serial_open = QPushButton("打开串口")
-        self.btn_serial_open.setFixedWidth(90)
-        self.btn_serial_open.clicked.connect(self._toggle_serial)
-        serial_row.addWidget(self.btn_serial_open)
-        self.serial_status_lbl = QLabel("未打开")
-        self.serial_status_lbl.setStyleSheet("color:#909090;")
-        serial_row.addWidget(self.serial_status_lbl)
-        serial_row.addStretch()
-        self.serial_row_w = QWidget()
-        self.serial_row_w.setLayout(serial_row)
-        cfg_layout.addWidget(self.serial_row_w, 2, 2)
-        self.tcp_row_w.setVisible(False)
-        self._refresh_serial_ports()
-
         btn_row = QHBoxLayout()
         self.start_btn = QPushButton("开始升级")
-        self.start_btn.clicked.connect(self._on_start_btn)
+        self.start_btn.clicked.connect(self._start)
         btn_row.addWidget(self.start_btn)
+        btn_close = QPushButton("关闭")
+        btn_close.clicked.connect(self.close)
+        btn_row.addWidget(btn_close)
         btn_row.addStretch()
-        cfg_layout.addLayout(btn_row, 3, 0, 1, 3)
+        cfg_layout.addLayout(btn_row, 2, 0, 1, 3)
 
         self.progress = QProgressBar()
         self.progress.setRange(0, 100)
@@ -902,9 +675,9 @@ class UpgradeDialog(QDialog):
                 background-color: #1976D2;
             }
         """)
-        cfg_layout.addWidget(self.progress, 4, 0, 1, 2)
+        cfg_layout.addWidget(self.progress, 3, 0, 1, 2)
         self.status_lbl = QLabel("就绪")
-        cfg_layout.addWidget(self.status_lbl, 4, 2)
+        cfg_layout.addWidget(self.status_lbl, 3, 2)
 
         root.addWidget(cfg)
 
@@ -926,20 +699,6 @@ class UpgradeDialog(QDialog):
     def isUpgrading(self):
         return self.running
 
-    def _release_session(self):
-        if self.tcp_thread:
-            self.tcp_thread.release_session()
-
-    def _cancel_upgrade(self):
-        """升级中取消: 停止收发并释放会话锁定。"""
-        self.running = False
-        self._timer.stop()
-        self._log("升级已取消", "err")
-        self.status_lbl.setText("已取消")
-        self._release_session()
-        self.start_btn.setText("开始升级")
-        self.start_btn.setEnabled(True)
-
     def _reset_ui(self):
         """重置弹窗 UI 到初始状态，避免关闭后重新打开时界面卡住。"""
         self.running = False
@@ -949,134 +708,10 @@ class UpgradeDialog(QDialog):
         self._fw_data = b""
         self._mac = None
         self._pkg_num = 0
-        self._window_start = 0
-        self._retry_cnt = 0
-        self._resume_base = 0
         self.start_btn.setEnabled(True)
-        self._release_session()
-        self.start_btn.setText("开始升级")
         self.progress.setValue(0)
         self.status_lbl.setText("就绪")
 
-    def _on_channel_changed(self, idx):
-        self.channel = 'serial' if idx == 0 else 'tcp'
-        tcp_on = (self.channel == 'tcp')
-        self.tcp_row_w.setVisible(tcp_on)
-        self.serial_row_w.setVisible(not tcp_on)
-
-    def _refresh_serial_ports(self):
-        try:
-            ports = [pt.device for pt in serial.tools.list_ports.comports()]
-        except Exception:
-            ports = []
-        self.serial_cmb.clear()
-        if ports:
-            self.serial_cmb.addItems(ports)
-        else:
-            self.serial_cmb.addItem("无可用串口")
-
-    def _toggle_serial(self):
-        try:
-            if self.ser and self.ser.is_open:
-                if self._serial_rx:
-                    self._serial_rx.stop()
-                    self._serial_rx = None
-                self.ser.close()
-                self.ser = None
-                self.btn_serial_open.setText("打开串口")
-                self.serial_status_lbl.setText("未打开")
-                self.serial_status_lbl.setStyleSheet("color:#909090;")
-                return
-            port = self.serial_cmb.currentText()
-            if not port or port == "无可用串口":
-                QMessageBox.warning(self, "提示", "未扫描到串口, 请重新打开升级页面")
-                return
-            self.ser = serial.Serial(port, int(self.baud_cmb.currentText()), timeout=0.02)
-            self._serial_rx = SerialThread(self.ser)
-            self._serial_rx.data_received_raw.connect(self.feed_data)
-            self._serial_rx.start()
-            self.btn_serial_open.setText("关闭串口")
-            self.serial_status_lbl.setText("已打开")
-            self.serial_status_lbl.setStyleSheet("color:#2E7D32;")
-        except Exception as e:
-            self._log(f"串口操作异常: {e}", "err")
-            QMessageBox.warning(self, "提示", f"串口操作异常: {e}")
-            try:
-                if self.ser and self.ser.is_open:
-                    self.ser.close()
-            except Exception:
-                pass
-            self.ser = None
-            self.btn_serial_open.setText("打开串口")
-            self.serial_status_lbl.setText("未打开")
-
-    def _toggle_tcp_listen(self):
-        if self.tcp_thread and self.tcp_thread.isRunning():
-            self.tcp_thread.stop()
-            self.tcp_thread = None
-            self.btn_tcp_listen.setText("开始监听")
-            return
-        try:
-            port = int(self.tcp_port_edit.text().strip())
-            assert 1 <= port <= 65535
-        except Exception:
-            QMessageBox.warning(self, "提示", "TCP端口无效")
-            return
-        self.tcp_thread = TcpServerThread(port)
-        self.tcp_thread.client_connected.connect(self._on_tcp_client)
-        self.tcp_thread.client_disconnected.connect(self._on_tcp_disconnect)
-        self.tcp_thread.session_resumed.connect(self._on_session_resumed)
-        self.tcp_thread.ip_list_changed.connect(self._on_ip_list)
-        self.tcp_thread.data_received_raw.connect(self.feed_data)
-        self.tcp_thread.listen_error.connect(self._on_tcp_error)
-        self.tcp_thread.start()
-        self.btn_tcp_listen.setText("停止监听")
-
-    def _on_ip_list(self, ips):
-        self.ip_cmb.clear()
-        if ips:
-            self.ip_cmb.addItems(ips)
-        else:
-            self.ip_cmb.addItem("无客户端")
-
-    def _on_tcp_client(self, ip):
-        pass
-
-    def _on_session_resumed(self, ip):
-        if self.running and self.channel == 'tcp':
-            self._log(f"握手成功, 升级目标: {ip}", "ok")
-            idx = self.ip_cmb.findText(ip)
-            if idx >= 0:
-                self.ip_cmb.setCurrentIndex(idx)
-
-    def _on_tcp_disconnect(self, ip, was_session):
-        if was_session and self.running and self.channel == 'tcp':
-            self._log(f"升级会话TCP断开(IP={ip}),等待网关模组重连后自动恢复...", "err")
-
-    def _on_tcp_error(self, msg):
-        self._log(f"TCP监听失败: {msg}", "err")
-        if self.tcp_thread:
-            self.tcp_thread.stop()
-            self.tcp_thread = None
-        self.btn_tcp_listen.setText("开始监听")
-
-    def _send(self, frame):
-        """按当前通道发送升级帧(TCP通道按协议约定发ASCII hex文本, 设备端AsciiToHex还原)。"""
-        if self.channel == 'tcp':
-            if not (self.tcp_thread and self.tcp_thread.is_client_connected()):
-                self._log("TCP未连接,发送失败", "err")
-                return False
-            return self.tcp_thread.send_data(frame.hex().upper().encode('ascii'))
-        if not (self.ser and self.ser.is_open):
-            self._log("串口未打开,发送失败", "err")
-            return False
-        try:
-            self.ser.write(frame)
-            return True
-        except Exception:
-            self._log("串口发送失败", "err")
-            return False
-
     def _choose_file(self):
         path, _ = QFileDialog.getOpenFileName(
             self, "选择固件文件", "", "固件文件 (*.bin);;所有文件 (*)"
@@ -1096,16 +731,8 @@ class UpgradeDialog(QDialog):
             if text:
                 self._log(f"[设备] {text}")
 
-    def _on_start_btn(self):
-        """升级中=取消; 空闲=开始升级。"""
-        if self.running:
-            self._cancel_upgrade()
-        else:
-            self._start()
-
     def _start(self):
         if self.running:
-            self._cancel_upgrade()
             return
         path = self.fw_edit.text().strip()
         mac = parse_mac(self.mac_edit.text())
@@ -1115,11 +742,7 @@ class UpgradeDialog(QDialog):
         if mac is None:
             QMessageBox.warning(self, "提示", "设备MAC格式错误，应为 81-00-00-06-00-00")
             return
-        if self.channel == 'tcp':
+        if not self.main.serial_port or not self.main.serial_port.is_open:
-            if not (self.tcp_thread and self.tcp_thread.is_client_connected()):
-                QMessageBox.warning(self, "提示", "TCP未监听或网关未连接, 请先监听并等待网关接入")
-                return
-        elif not self.ser and self.ser.is_open:
             QMessageBox.warning(self, "提示", "请先打开串口")
             return
         try:
@@ -1131,39 +754,28 @@ class UpgradeDialog(QDialog):
         if not fw:
             QMessageBox.warning(self, "提示", "固件文件为空")
             return
-        if len(fw) > 232 * 1024:
-            QMessageBox.warning(self, "提示", f"固件大小{len(fw)}字节超出A区上限(237568字节), 无法升级")
-            return
 
         self._mac = mac
-        if getattr(self, 'tcp_thread', None) is not None:
-            self.tcp_thread.expect_mac = mac
-            self.tcp_thread.release_session()
         self._fw_data = fw
-        self._got_ack = False
-        self._announce_frame = None
         self._pkg_num = (len(fw) + UPG_PACKET_DATA - 1) // UPG_PACKET_DATA
         self._sent.clear()
         self._buf = b""
         self.running = True
-        self.start_btn.setText("取消")
+        self.start_btn.setEnabled(False)
         self.progress.setValue(0)
-        self._window_start = 0
-        self._retry_cnt = 0
-        self._resume_base = 0
         self.status_lbl.setText("等待握手...")
 
         app_crc = zlib.crc32(fw) & 0xFFFFFFFF
         payload = struct.pack('<H', self._pkg_num) + struct.pack('<I', len(fw)) + struct.pack('<I', app_crc)
         frame = build_frame(mac, CMD_ANNOUNCE, payload)
         self._log(f"下发APP信息: 包数={self._pkg_num}, 大小={len(fw)}字节, CRC32=0x{app_crc:08X}")
-        self._announce_frame = frame
+        self.main.send_raw(frame)
-        self._send(frame)
         self._log("等待设备握手后接收数据请求...")
-        self._timer.start(10000 if self.channel == 'tcp' else 5000)
+        self._timer.start(5000)
 
     def feed_data(self, data):
-        # keep parsing after finish: device sends REQ(0) to restart download on CRC fail, gate moved to _handle
+        if not self.running:
+            return
         self._buf += data
         while True:
             frame = self._try_next_frame()
@@ -1197,29 +809,8 @@ class UpgradeDialog(QDialog):
         return None
 
     def _handle(self, cmd, payload):
-        if not self.running and cmd != CMD_REQ_PKG:
+        self._timer.start(5000)
-            return   # finished: only REQ(0) restart passes, other frames dropped
-        if not self.running:
-            return
-        self._timer.start(3000 if self.channel == 'tcp' else 5000)
-        self._retry_cnt = 0
         if cmd == CMD_ACK:
-            self._got_ack = True
-            # 兼容旧格式(1字节0x20)与新格式{Status, ResumedIdx}: 0x20=全新, 0x21=断点续传
-            if len(payload) >= 3:
-                status, resumed = struct.unpack('<BH', payload[0:3])
-                if status == 0x21 and resumed > 0:
-                    self._resume_base = resumed
-                    self._log(f"设备断点续传: 已接收 {resumed} 包, 从断点继续", "ok")
-                else:
-                    self._resume_base = 0
-                    self._log("收到从机应答(0x01), 全新升级", "ok")
-                    if self.channel == 'tcp':
-                        self._window_start = 0
-                        self._send_window(0, self._window)
-                        return
-            else:
-                self._resume_base = 0
             self._log("收到从机应答(0x01)", "ok")
             self.status_lbl.setText("设备就绪")
             return
@@ -1228,43 +819,23 @@ class UpgradeDialog(QDialog):
                 self._log("从机请求包帧格式错误", "err")
                 return
             idx, total = struct.unpack('<HH', payload[0:4])
-            if idx == 0 and not self.running:
-                # device CRC failed, full re-download: reset progress and resend from pkt 0
-                self.running = True
-                self._sent.clear()
-                self.progress.setValue(0)
-                self.start_btn.setEnabled(False)
-                self._log("设备CRC校验失败, 已重置进度重新下载", "warn")
             if idx >= self._pkg_num:
                 self._log(f"从机请求包序号越界({idx})，视为完成", "ok")
                 self._finish()
                 return
-            batch = self._window if self.channel == 'tcp' else 1
+            start = idx * UPG_PACKET_DATA
-            self._window_start = idx
+            data = self._fw_data[start:start + UPG_PACKET_DATA]
-            self._send_window(idx, batch)
-            return
-        self._log(f"收到其他帧 Cmd={cmd:#04x}", "err")
-
-    def _send_window(self, start, batch):
-        """从start包起连发batch包(TCP窗口流控; 串口停等batch=1)。"""
-        for k in range(batch):
-            idx = start + k
-            if idx >= self._pkg_num:
-                break
-            s = idx * UPG_PACKET_DATA
-            data = self._fw_data[s:s + UPG_PACKET_DATA]
             p = struct.pack('<HHB', idx, self._pkg_num, len(data)) + data
-            if not self._send(build_frame(self._mac, CMD_SEND_PKG, p)):
+            frame = build_frame(self._mac, CMD_SEND_PKG, p)
-                self._log("发送失败, 通道异常", "err")
+            self.main.send_raw(frame)
-                return
             self._sent.add(idx)
-            if k < batch - 1:
+            pct = len(self._sent) * 100.0 / self._pkg_num
-                time.sleep(0.005)   # Cat1模组URC输出限流: 防LIPURC截断丢包
+            self.progress.setValue(int(pct))
-        done = max(self._sent) + 1
+            self.status_lbl.setText(f"{len(self._sent)}/{self._pkg_num} 包")
-        self.progress.setValue(min(int(done * 100.0 / self._pkg_num), 100))
-        self.status_lbl.setText(f"{done}/{self._pkg_num} 包")
             if len(self._sent) >= self._pkg_num:
                 self._finish()
+            return
+        self._log(f"收到其他帧 Cmd={cmd:#04x}", "err")
 
     def _finish(self):
         self.running = False
@@ -1277,43 +848,20 @@ class UpgradeDialog(QDialog):
         else:
             self._log(f"升级未完成，已发送 {len(self._sent)}/{self._pkg_num} 包", "err")
 
-        self._release_session()
-        self.start_btn.setText("开始升级")
     def _on_timeout(self):
         if not self.running:
             return
-        if self.channel == 'tcp' and not self._got_ack and self._retry_cnt < 5:
-            # 握手阶段(未收到ACK): 重发0x81升级请求而非数据批次
-            self._retry_cnt += 1
-            self._log(f"握手超时, 重发升级请求({self._retry_cnt}/5)", "err")
-            self._timer.start(10000)
-            self._send(self._announce_frame)
-            return
-        if self.channel == 'tcp' and self._retry_cnt < 5:
-            # Cat1链路抖动: 重发当前批次(设备按期望包号丢弃重复包)
-            self._retry_cnt += 1
-            self._log(f"超时, 从第{self._window_start}包起重发批次({self._retry_cnt}/5)", "err")
-            self._timer.start(3000)
-            self._send_window(self._window_start, self._window)
-            return
         self.running = False
         self._timer.stop()
         self.start_btn.setEnabled(True)
-        self._log("升级超时(无响应)", "err")
+        self._log("升级超时(5秒无响应)", "err")
         self.status_lbl.setText("超时")
 
-        self._release_session()
-        self.start_btn.setText("开始升级")
     def closeEvent(self, event):
-        if self.running:
-            self._cancel_upgrade()
-        else:
-            self._release_session()
-        if self.ser and self.ser.is_open:
-            self._toggle_serial()
         self._reset_ui()
         event.accept()
 
+
 class DeviceDialog(QDialog):
     """设备管理对话框：通过 culs 查询已注册通讯单元，cudel 删除设备。"""
 

generate_manual.py

@@ -211,7 +211,7 @@ features = [
     ["功能模块", "说明"],
     ["串口通信", "通过USB转串口连接网关设备，波特率默认500000可自行修改，实时收发指令"],
     ["配置读取", "一键读取网关全部参数，包括软件/硬件版本、MAC地址、电池状态、注册状态等"],
-    ["Lora信道配置", "选择并设置Lora通信信道频率（433.1MHz ~ 492.6MHz）"],
+    ["Lora信道配置", "选择并设置Lora通信信道频率（470.1MHz ~ 492.6MHz）"],
     ["自定义指令", "支持手动输入任意指令与网关交互"],
     ["通讯日志", "实时显示发送和接收的通讯数据，便于调试"],
     ["设备管理", "查询/删除网关已注册的通讯单元设备，删除后即时更新列表"],
@@ -306,8 +306,8 @@ story.append(make_table(["显示项", "指令关键字", "说明"], para_rows, c
 # 3.3
 story.append(heading2("3.3  Lora信道配置"))
 story.append(body(
-    "Lora信道配置用于设置网关的Lora无线通信频率。信道列表覆盖433.1MHz至492.6MHz范围，"
+    "Lora信道配置用于设置网关的Lora无线通信频率。信道列表覆盖470.1MHz至492.6MHz范围，"
-    "频率间隔0.5MHz，共120个信道可供选择。"
+    "频率间隔0.5MHz，共46个信道可供选择。"
 ))
 story.append(Spacer(1, 2 * mm))
 
@@ -321,8 +321,8 @@ for i, s in enumerate(lora_steps, 1):
 story.append(Spacer(1, 2 * mm))
 
 lora_range = [
-    ["起始频率", "433.1 MHz（信道0）"],
+    ["起始频率", "470.1 MHz（信道0）"],
-    ["终止频率", "492.6 MHz（信道119）"],
+    ["终止频率", "492.6 MHz（信道45）"],
     ["频率间隔", "0.5 MHz（500 kHz）"],
     ["指令格式", "lora fc [频率值，单位Hz]"],
 ]