Merge remote-tracking branch 'refs/remotes/origin/master'

flandre/__init__.py

@@ -60,7 +60,7 @@ class SoftwareConfig:
     video_height: int = 1080
     video_width: int = 960
 
-    live_ip: str = 'vmaosmax'
+    live_ip: str = 'scarlet'
     live_push_port: int = 5555
     live_rep_port: int = 5556
     device_py_rep_port: int = 5558

flandre/launcher.py

@@ -240,6 +240,12 @@ def device_end_capture():
 def device_upload(name, file: TextIOWrapper):
     dd.set_name_and_file_only(name, file.read())
 
+@device.command('recv_single')
+def device_recvmonitor():
+    r = dd.get_data()
+    seq, encoder, host_ts, device_ts_low, device_ts_high, buffer = b2t(r)
+    print(seq, encoder, host_ts, device_ts_low, device_ts_high)
+    print((buffer.__len__()//2)/256)
 
 @device.command('recvm')
 def device_recvmonitor():

flandre/nodes/Beamformer.py

@@ -113,6 +113,9 @@ class Beamformer(Node):
                         continue
                 mat = RfMat.from_rf_frame(rf_frame_msg.rf_frame, 'gpu')
                 # logger.info(mat.frame_meta.blake2b)
+                if mat is None:
+                    logger.warning(f"{rf_frame_msg.rf_frame.seq_meta.prod()} , {rf_frame_msg.rf_frame.__bytes__().__len__() // 2}")
+                    continue
 
                 last_blake2b = mat.frame_meta.blake2b
                 if mat is None:

flandre/nodes/Muxer.py

@@ -80,7 +80,8 @@ class Muxer(Node):
                     self.rep_socket.send(BeamformerMsg(b'nop').encode_msg())
                     return
                 # _, sequence_id, encoder = struct.unpack_from('=IQi', self.driver_data_raw)
-                ts, sequence_id, encoder, driver_data_body = b2t(self.driver_data_raw)
+                # ts, sequence_id, encoder, driver_data_body = b2t(self.driver_data_raw)
+                sequence_id, encoder, host_ts, device_ts_low, device_ts_high, driver_data_body = b2t(self.driver_data_raw)
                 data_msg = RfFrameMsg(0, RfFrameMemory(
                     RfFrameMeta(
                         encoder=encoder,

flandre/pyqt/Image.py

@@ -1,4 +1,4 @@
-# Form implementation generated from reading ui file '/home/lambda/source/scarlet/flandre/flandre/pyqt/Image.ui'
+# Form implementation generated from reading ui file 'C:\Users\lambda\source\scarlet\flandre\flandre\pyqt\Image.ui'
 #
 # Created by: PyQt6 UI code generator 6.8.0
 #

flandre/utils/RfFrame.py

@@ -52,6 +52,6 @@ def b2t(b: bytes):
     # device_ts_low = struct.unpack('<I', bb)
     # device_ts_low = b[4 + 8 + 4 + 8:4 + 8 + 4 + 8 + 4]
     # print(bin(device_ts_low[0]),bin(device_ts_low[1]),bin(device_ts_low[2]),bin(device_ts_low[3]))
-    buffer = b[4 + 8 + 4 + 8 + 4 + 4:]
+    buffer = b[4 + 8 + 4 + 8 + 4 + 4+4+4:]
 
     return seq, encoder, host_ts, device_ts_low, device_ts_high, buffer