tmpCommit

src/fc_network_adapter/fc_network_adapter/mavlinkVehicleView.py

@@ -277,6 +277,12 @@ class RFModule:
         self.status = RFStatus()
         self.socket_info = SocketInfo()
 
+        self.poll_data_times: deque[int] = deque([0] * N,maxlen=N) # ms
+        self.poll_data_sizes: deque[int] = deque([0] * N, maxlen=N) # num
+        self.poll_total_time = 0 # ms
+        self.poll_total_size = 0 # num
+        self.remain_bytes = 0 # num
+
     def update_avg_bandwidth(self, bandwidth: float, timestamp: Optional[float] = None) -> None:
         self.status.avg_bandwidth = bandwidth
         if timestamp:

src/fc_network_adapter/fc_network_adapter/serialManager.py

@@ -461,9 +461,7 @@ class XBeeFrameProcessor_ESPv1(XBeeFrameProcessor_Base):
                 logger.debug(f"send Completed !")
         
         if delivery != 0x00:
-            logger.warning(
+            logger.warning( f"TX failed fid=0x{frame[4]:02X} delivery=0x{delivery:02X}" )
-                f"TX failed fid=0x{frame[4]:02X} delivery=0x{delivery:02X}"
-            )
 
     # 把 udp_transmit_queue 的 mavlink 封包依照大小打包出來
     def _pop_flush_batch(self, max_bytes: int) -> List[bytes]:
@@ -590,11 +588,14 @@ class XBeeFrameProcessor_ESPv1(XBeeFrameProcessor_Base):
   
             vehicle = vehicle_registry.get(system_id)
             if vehicle and not vehicle.rf_module:
+                N = 10
                 vehicle.rf_module = RFModule(RFModuleType.XBEE_ESP)
                 vehicle.rf_module.poll_data_times: deque[int] = deque([0] * N,maxlen=N) # ms
                 vehicle.rf_module.poll_data_sizes: deque[int] = deque([0] * N, maxlen=N) # num
                 vehicle.rf_module.poll_total_time = 0 # ms
                 vehicle.rf_module.poll_total_size = 0 # num
+                vehicle.rf_module.remain_bytes = 0 # num
+                logger.debug(f"mark A")
 
             logger.debug(
                 f"new HELO system_id={system_id}, address_64={sender_address_64.hex()}")