From b2349365048c9e8c0cd36edeacfee62b400c114e Mon Sep 17 00:00:00 2001
From: yanganjie <yanganjie@xj-robot.com>
Date: Tue, 4 Nov 2025 15:00:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=96=99=E6=96=97=E5=8F=98=E9=80=81?=
 =?UTF-8?q?=E5=99=A8=E9=87=8D=E9=87=8F=E6=95=B0=E6=8D=AE=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   4 +-
 hardware/__pycache__/__init__.cpython-39.pyc  | Bin 420 -> 0 bytes
 hardware/__pycache__/inverter.cpython-39.pyc  | Bin 2356 -> 0 bytes
 hardware/__pycache__/relay.cpython-39.pyc     | Bin 2711 -> 0 bytes
 .../__pycache__/transmitter.cpython-39.pyc    | Bin 1877 -> 0 bytes
 hardware/transmitter.py                       |  83 ++++++++++++++----
 6 files changed, 70 insertions(+), 17 deletions(-)
 delete mode 100644 hardware/__pycache__/__init__.cpython-39.pyc
 delete mode 100644 hardware/__pycache__/inverter.cpython-39.pyc
 delete mode 100644 hardware/__pycache__/relay.cpython-39.pyc
 delete mode 100644 hardware/__pycache__/transmitter.cpython-39.pyc

diff --git a/.gitignore b/.gitignore
index 6fb6717..4570eb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,6 @@ dist/
 PyQt_Fluent_Widgets.egg-info/
 PySide6_Fluent_Widgets.egg-info/
 PyQt6_Fluent_Widgets.egg-info/
-PySide2_Fluent_Widgets.egg-info/
\ No newline at end of file
+PySide2_Fluent_Widgets.egg-info/
+/hardware/__pycache__
+__pycache__
diff --git a/hardware/__pycache__/__init__.cpython-39.pyc b/hardware/__pycache__/__init__.cpython-39.pyc
deleted file mode 100644
index c70084f396446f3191673c9efcae64ae3db466fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 420
zcmYe~<>g`k0!``P8M=%N439w^WWWUEH~?|636Mx(h+;@#Okv7l%w>vVVg#|7bC`2k
zqFBIemK@exwkS46hIED$)<uj_>?v%)44UkvHbAXh&lj$FvU}UJzU5Clwmn<1@af#?
zTu*yipH5i)th3?SoKA@Ji*@^+E@^*0s|BjAZ|T$i#au6e4r9<{yu}}snv+=RoS#=x
zl%JE6S_Bjl^2{qsEh<SZLJ<`WDN4*M&dn@Am0&Ic`KE{&M6dt}KTVEX?D6p_`N{F|
zQLIHE!@(+|I5MH8g4ITGmmrJ-YXs>^%*lz5U&&C!4l)fy{IYSeib>Ng&o9c3Daj~G
zO^r{6xHP`FvbZEQH>M=DxTH8nPcJ4Tu_&cHu_!erK0Y%qvm`!Vub}c4hfQvNN@-52
R9mtKv96*AFg@+LcnE>7yhLZpQ

diff --git a/hardware/__pycache__/inverter.cpython-39.pyc b/hardware/__pycache__/inverter.cpython-39.pyc
deleted file mode 100644
index d3fae76e081cb31adde0e40b15bb793a2b91c6c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2356
zcmZ{m|8EpU6u@U@zuew+?>Gu-O8s(vNz4&#_`w*{5JQ3@n%G}TV!T|kS#PFg%XP2J
z?iKE`M<6AUkbn>&iWJil3HXCFMkGc8{1?XTkILP(zxj)aLKNTIz1z05?q=WIyf^da
z?d<!!IXj!p5V(rNj}G243Hcp6YcB;ld*Jb&2f+!aRWeOWl#=%dXIwc+xH88|jH~0M
zsI9;lQl#OQ4{Q9By7%tUikR`8np;8r+KWMF4?Ny0AOtB<PQVA{>?A2ET;VFTD%ZFU
zt;SQ}+Xx5WcV~t4h1^?neOaqkg{+{T{)N9&@a%;r@*B{ASP(Ht@Ql%-XK1x~9dwKn
z@T-qa#ts^LRw(?EC|0(CDC(i%Rqa_}IXoPkkm7J%xRr(_#iZjw7-7!yZRscdQr7cp
zGf6juE}AQ~>1o^Lp&40wy`mE4rKs8sF!x_3%ud@!tz?~02h)TzS!AK=iRy$LfSA4|
zatkyMcfT`Qo_PI8O&%)y2c-~wH<s6c(5B12@O-a4GEzQhOMb+bqU`iGZ)Bzs8kXg_
zj&E5y`0@rp5UNvMWi+`THitKE_eg)<x_w6{m_yON?}Y6;N1NN5_X09Srsx7&B;JUx
za5@J$^AX%Vy}C#!WY9RluQa6%lNR&!0KU<7GDlmApW>=-a3z53nqw^`o;8(*Hp8_c
z5}+o-^&!GjXOx!e4+N@j&M~<FYZ-xhnOtH2w<3&42lO)GnJdbsV+O{FO8o3O+R!O!
zX_Pc~!W=WuR=s{qc($b-(>A_Otlvd;J@Kw?E`EoF=*@S*e8|3B{VCYF<(v1qcW<^o
z`*P*#`Szt7AiHNj{qt3@biP>V{BUvk{@0ze*SdGlckj%1?_BR*_z_0Mh;`=Av`;VY
zbMi3S`Qz8ek0l}?@tXjLT9m)_?a3Ok>-IO_FW<U0TBr{th9?$(@YBzQ65HQAP=5}F
zB*u8nmE&JMxWBk^;nMQb(r96<n2S;q(l>(Ms#G1}`e6#v*A*2%)MlgueXUZhc|t;s
zA)$f_1=1aa<A%8-((y$?j?ChijN>^jAmmm=m`*B*M9Pc0%t2F1ufmd<focHD+LI#G
zX6<TSgt`=7z3PWlM9jn@kFK+x@K-^@-SI|25T;X;8dM!JyQ-3*rjlm{^cgk&(e(_?
zQPnX2Qdyp=n)yhjdC-{5{5Q{<g-u{tx5zqTR9Gt^rVPXcl+#%%clbaAW@enbTp34}
zUTgjWnM0@8f&wh<hcW7!tVMmy5{w2v+94*7$K$6oXmw;HYE!+|0A|v_3<FOY^yIz?
z^9Eqv?M>&Io6O7NJU<mM-vH)*15det_2ceQzAmy2x-Ai7X<+OvU`&Y^BRn4{t6qSy
ztu5u45;3;UTdYqQOKcHiNe>v?3XBa#jCIalZ=brIWODo5Qv1X_)K)F3(okZdcGoeh
z5V?z|I-j3;aCd&Ruuo!nlrN(&P^3{rcqw7Z<{XmDlP{nW&x|@&XY_sgMzWN|Gfv|7
zj;$x=JKtSRtnr$0a6K#!)Sp2w{c;dTzKUB$K8+6XIFOjT5=)50DRLME(j%Wmf$YY>
zs1Y!sZddR)mIXAthyvqXLk2>NXX_iF_C5eX6a(|VPsR?jqee_17eIxU!8X33XRwHp
zl=-*HHZZbd6GnQ=jp12qS*|@TEGx`d7L<~D6@QzSb+~R<V~gC1(Y}NNi{qN$qt`&T
yr2;~O$HQ*~k>!j+q#J`HciT)Ou2CbR|IfsW_9q&#nY+-~9f$HZ)*TOpsr&~fiiIHn

diff --git a/hardware/__pycache__/relay.cpython-39.pyc b/hardware/__pycache__/relay.cpython-39.pyc
deleted file mode 100644
index 3bd4bf5cbd9b4152ee5252b77df9b2fa674870d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2711
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
C|I2Rx

diff --git a/hardware/__pycache__/transmitter.cpython-39.pyc b/hardware/__pycache__/transmitter.cpython-39.pyc
deleted file mode 100644
index bbd5444e2c14048dffd1888dbced74bc748d90b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1877
zcmb7F|7#pY6rY*>a(kD(%e6^bLbW{*Dkm87Lw^cV1C5A3m|r4@$KkTxY%ZH@_TtQL
zV#1!ZBv27!A|#sDv@~d`{-9B;PzcgLLs;-9d*6N+gq9ZH%=XeVtp#_PH#7U*`@A=w
znR#nxvl#?W@zjHv#WX^Hib?OIz+@a6KMjH+iaj)sOBka!5hYYvLsVHMB|_CHRMa|P
zgNiurf4fFM2>BZyRh)&ut@#!4z4sw78HdJS0O6n#rU)=FC2OdpP=%_{t5gF_Jsx_8
z**>3lgTP@IYJR|Kp69TNfapGAtU<c~jh_V(;RsoftbnA-t^%?<Qg;dHAfQNivV+08
zBm9d>Y;ezBbS#&~{Y#Epoe3=FR9y~n<6L)SRcfIh6bVzohl!v?66cxY*~_5nW*6%)
zo_4FCQ@P_!GoTiIkC+MF{nsbP%G0kd)!1A)m|>37^|Sag#F{S$4i9*FWTZS}GrD9m
zryM+CU}RxAHZ05a-N3SRfa8N85Y{z<;eDv;kNf*8r=LmONZ0va45k1>90bYWBOqlH
zue6~}3MOaKB4+0TU^BvBqibXpw*OstK|^Mh8|ogya2Te<9GD+QbzoR(v^~V9!B2UP
z2O!Mq5gedl1X7byA4W8_uGEzv6)AzSO4uDhF+_Bljugm2{ZB-RK{IoNwIgLVT~{NO
z_5q%G9>FL(j83Au7HKqh3VMGciAl3_WD_$z$Os={zluS77NYhi7SCHZSmkAI$07|f
zJbq0R*+tq>j;4@`g1$|>yn|6)$7tmh@EnNrC)n=+k9GZH{b_EK@1p|20ED;)VetPU
zj2_uJKi9jDqjD#UL*WpdhW7qJW8=%l#!lzrrN))-n%h4$*MAHLK-2u{Msxd<L(N+g
zV};4^<;RL&w%d2FH$T7G`t6I>!EWo|R%`25a8HUtb9cS*=^hgYju}FTLkyQMWmC!=
z&SOp9uvn9qG0cPZNE(Gu+@?a~+n?LFZ;ln@C1mm*3uAdPt1y5HvoRjN2>rb~>&>nG
z=4Y2$SJxW*YmFavlEri`Z;TZ}aqJHlQV9EDT1X;xF0V_I5}B)p;+iEZ=v=&d@9th_
z>q>inAN++PVWxfSo96Y+uA*o%0Uc`#%!Rrja*ng}vM^c|&vpC&mg?2G6Q`h9_)aB=
zPcX-()=bT#u3tSYK0MC2-1T{2`xPfnA6C^k-7QK$+O$`*111YuiuFOPQm&_JKut@M
z(ShR73u1%WOBS^QyQC+jF2;_mPKn5hWC0$s5k@Cr%HIcph=DUWht;C_yGk;|#0FMh
zGXGHFyDr{`x}L#<SRFQ7s$vqI3`+YvIgVA+{7WS#u%0&mCL|9ire;1cu^bWeQJ$=v
zd3MD*%ww{siQ?zm^NwZ38Os7XLr;uN%la_1y+p%ukSRMOgebT@Lad94Uz#Y~T$FGF
p8^`3ANjQT83(Ls{jX2$37nht$iyj;aD@ih5OL90bsOLhM%0GQ$2^#<a

diff --git a/hardware/transmitter.py b/hardware/transmitter.py
index dd72798..1bd2ef4 100644
--- a/hardware/transmitter.py
+++ b/hardware/transmitter.py
@@ -20,7 +20,8 @@ class TransmitterController:
             }
         }
 
-    def read_data_back(self, transmitter_id):
+    # 备份 （modbus 读取数据）
+    def read_data_bak(self, transmitter_id):
         """读取变送器数据"""
         try:
             if transmitter_id not in self.config:
@@ -68,7 +69,7 @@ class TransmitterController:
         finally:
             self.relay_controller.modbus_client.close()
 
-    # 直接读取 变送器返回的数据
+    # 直接读取 变送器返回的数据并解析
     def read_data(self, transmitter_id):
         """
             Args: transmitter_id 为1 表示上料斗, 为2 表示下料斗
@@ -79,6 +80,7 @@ class TransmitterController:
             IP = "192.168.250.63"
             PORT = 502
             TIMEOUT = 5 # 超时时间为 5秒
+            BUFFER_SIZE= 1024
             weight = None
 
             import socket
@@ -86,34 +88,83 @@ class TransmitterController:
                 try:
                     s.settimeout(TIMEOUT)
                     s.connect((IP, PORT))
-                    print(f"✅ 连接 {IP}:{PORT} 成功")
+                    # print(f"连接上料斗变送器 {IP}:{PORT} 成功")
                     
-                    # 接收数据（变送器主动推送，单次recv即可获取一条完整数据）
-                    data = s.recv(1024)
+                    # 接收数据（变送器主动推送，recv即可获取数据）
+                    data = s.recv(BUFFER_SIZE)
                     if data:
                         # print(f"收到原始数据：{data}")
-                        weight = self.parse_weight(data)
+
+                        # 提取出完整的一个数据包 (\r\n结尾)
+                        packet = self.get_latest_valid_packet(data)
+                        if not packet:
+                            print("未获取到有效数据包!!")
+                            return None
+                        # 解析重量
+                        weight = self.parse_weight(packet)
                     else:
-                        print("❌ 未收到设备数据")
+                        print("未收到设备数据")
                 
                 except ConnectionRefusedError:
-                    print(f"❌ 连接失败：{IP}:{PORT} 拒绝连接（设备离线/端口错误）")
+                    print(f"连接失败：{IP}:{PORT} 拒绝连接（设备离线/端口错误）")
                 except socket.timeout:
-                    print(f"❌ 超时：{TIMEOUT}秒内未收到数据")
+                    print(f"超时：{TIMEOUT}秒内未收到数据")
                 except Exception as e:
-                    print(f"❌ 读取异常：{e}")
+                    print(f"读取异常：{e}")
             
             # 成功返回重量（int），失败返回None
             return weight  
+        
+    def get_latest_valid_packet(self, raw_data):
+        """
+        解决TCP粘包:
+            从原始数据中，筛选所有有效包，返回最新的一个有效包
+                有效包标准: 1. 能UTF-8解码 2. 按逗号拆分≥3个字段 3. 第三个字段含数字（重量）
+        """
+        DELIMITER = b'\r\n'
+        # 1. 按分隔符拆分，过滤空包
+        packets = [p for p in raw_data.split(DELIMITER) if p]
+        if not packets:
+            return None
 
-    def parse_weight(raw_data):
-        """解析函数：提取重量数值（如从 b'ST,NT,+0000175\r\n' 中提取 175)"""
+        valid_packets = []
+        for packet in packets:
+            try:
+                # 过滤无效ASCII字符（只保留可见字符）
+                valid_chars = [c for c in packet if 32 <= c <= 126]
+                filtered_packet = bytes(valid_chars)
+                # 2. 验证解码
+                data_str = filtered_packet.decode('utf-8').strip()
+                # 3. 验证字段数量
+                parts = data_str.split(',')
+                if len(parts) < 3:
+                    continue
+                # 4. 验证重量字段含数字
+                weight_part = parts[2].strip()
+                if not any(char.isdigit() for char in weight_part):
+                    continue
+                # 满足所有条件，加入有效包列表
+                valid_packets.append(packet)
+            except (UnicodeDecodeError, IndexError):
+                # 解码失败或字段异常，跳过该包
+                continue
+
+        # 返回最后一个有效包（最新），无有效包则返回None
+        return valid_packets[-1] if valid_packets else None
+
+    def parse_weight(self, packet_data):
+        """解析重量函数：提取重量数值（如从 b'ST,NT,+0000175\r\n' 中提取 175)"""
         try:
-            data_str = raw_data.decode('utf-8').strip()
+            data_str = packet_data.decode('utf-8').strip()
             parts = data_str.split(',')
+            # 确保有完整的数据包，三个字段
+            if len(parts) < 3:
+                print(f"parse_weight: 包格式错误（字段不足）：{data_str}")
+                return None
+
             weight_part = parts[2].strip()
             return int(''.join(filter(str.isdigit, weight_part)))
         except (IndexError, ValueError, UnicodeDecodeError) as e:
-            # print(f"数据解析失败：{e}，原始数据：{raw_data}")
-            # 注意：可能会出现解析失败的情况，此时返回None，界面不用更新数据就行
-            return None
\ No newline at end of file
+            # print(f"数据解析失败：{e}，原始数据包：{packet_data}")
+            return None
+    
\ No newline at end of file