qlsdk2 0.6.0a7__tar.gz → 0.6.0a9__tar.gz

{qlsdk2-0.6.0a7 → qlsdk2-0.6.0a9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qlsdk2
-Version: 0.6.0a7
+Version: 0.6.0a9
 Summary: SDK for quanlan device
 Home-page: https://github.com/hehuajun/qlsdk
 Author: hehuajun

{qlsdk2-0.6.0a7 → qlsdk2-0.6.0a9}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding='utf-8' ) as fh:
 
 setuptools.setup(
     name="qlsdk2",
-    version="0.6.0a7",
+    version="0.6.0a9",
     author="hehuajun",
     author_email="hehuajun@eegion.com",
     description="SDK for quanlan device",

{qlsdk2-0.6.0a7 → qlsdk2-0.6.0a9}/src/qlsdk/persist/ars_edf.py

@@ -213,12 +213,12 @@ class ARSKindlingEDFHandler(object):
         channel_pos = intersection_positions(packet.channels, channel_filter)
         
         if channel_pos is None or len(channel_pos) == 0 :
-            logger.debug(f"没有指定分区{name}的通道，跳过")
-            pass
+            logger.trace(f"没有指定分区{name}的通道，跳过")
+            return
         
         # 分区数据包写入
         if name not in self._edf_handler.keys():
-            edf_handler = RscEDFHandler(self.sample_rate,  self.digital_max , self.digital_min, self.resolution)  
+            edf_handler = RscEDFHandler(self.sample_rate,  self.physical_max , self.physical_min, self.resolution)  
             edf_handler.set_device_type(self._device_type)
             edf_handler.set_device_no(self._device_no)
             edf_handler.set_storage_path(self._storage_path)
@@ -234,7 +234,8 @@ class ARSKindlingEDFHandler(object):
         data = RscPacket()
         data.time_stamp = packet.time_stamp
         data.pkg_id = packet.pkg_id
-        data.channels = channels
+        # data.channels = channels
+        data.channels = self.channel_display(channels)
         data.origin_sample_rate = packet.origin_sample_rate
         data.sample_rate = packet.sample_rate
         data.sample_num = packet.sample_num
@@ -251,3 +252,6 @@ class ARSKindlingEDFHandler(object):
         # trigger现在（20250702）多个分区共享， 分发到所有分区文件中标记
         for k in self._edf_handler.keys():
             self._edf_handler[k].trigger(desc, cur_time) 
+            
+    def channel_display(self, channel):
+        return [self._channel_mapping.get(channel_id, []) for channel_id in channel]

{qlsdk2-0.6.0a7 → qlsdk2-0.6.0a9}/src/qlsdk/rsc/device/arskindling.py

@@ -77,19 +77,4 @@ class ARSKindling(QLBaseDevice):
         
         return body
     
-    def __str__(self):
-        return f''' 
-            Device: 
-                Name: {self.device_no}, 
-                Type: {hex(self.device_type) if self.device_type else None}, 
-                ID: {self.device_id if self.device_id else None}, 
-                Software: {self.software_version}, 
-                Hardware: {self.hardware_version}, 
-                Connect Time: {self.connect_time},
-                Current Time: {self.current_time},
-                Voltage: {str(self.voltage) + "mV" if self.voltage else None},
-                Battery Remain: {str(self.battery_remain)+ "%" if self.battery_remain else None},
-                Battery Total: {str(self.battery_total) + "%" if self.battery_total else None}
-            '''
-    
     

{qlsdk2-0.6.0a7 → qlsdk2-0.6.0a9}/src/qlsdk/rsc/device/base.py

@@ -144,14 +144,14 @@ class QLBaseDevice(IDevice):
     def _produce_signal(self, body: bytes):        
         
         # 处理信号数据
-        data = self._signal_wrapper(body)   
+        data = self._signal_wrapper(body)  
         # logger.debug("pkg_id: {}, eeg len: {}".format(data.pkg_id, len(data.eeg)))
         # 
         trigger_positions = [index for index, value in enumerate(data.trigger) if value != 0]
         if len(trigger_positions) > 0:
             # logger.debug(f"Trigger触发点位置: {trigger_positions}, 触发点时间戳: {[data.time_stamp + int(pos * 1000 / data.sample_rate) for pos in trigger_positions]}")
             for pos in trigger_positions:
-                self.trigger(data.trigger[pos])
+                self.trigger(trigger_info(data.trigger[pos]))
         # 存储
         if self.storage_enable:            
             # 确保记录线程启动
@@ -402,8 +402,8 @@ class QLBaseDevice(IDevice):
         msg = StartStimulationCommand.build(self).pack()
         logger.trace(f"start_stimulation message is {msg.hex()}")
         self.socket.sendall(msg)
-        t = Thread(target=self._stop_stimulation_trigger, args=(self.stim_paradigm.duration,), daemon=True)
-        t.start()
+        # t = Thread(target=self._stop_stimulation_trigger, args=(self.stim_paradigm.duration,), daemon=True)
+        # t.start()
         
     def get_stim_param(self) -> bytes:
         return self.stim_paradigm.to_bytes()
@@ -421,7 +421,7 @@ class QLBaseDevice(IDevice):
         
     def stop_stimulation(self):
         logger.info(f"[设备-{self.device_no}]停止电刺激")  
-        msg = StopStimulationCommand.pack()
+        msg = StopStimulationCommand.build(self).pack()
         logger.trace(f"stop_stimulation message is {msg.hex()}")
         self.socket.sendall(msg)
         
@@ -537,4 +537,15 @@ class QLBaseDevice(IDevice):
         return self.device_type == other.device_type and self.device_no == other.device_no
 
     def __hash__(self):
-        return hash((self.device_type, self.device_no))    
+        return hash((self.device_type, self.device_no))    
+    
+__TRIGGER_MAPPING = {
+    0x3E8: "Start of stimulation",
+    0x3E9: "End of stimulation",
+    0x3EA: "Ascending end of stimulation",
+    0x3EB: "Descending start of stimulation ",
+    0x3EC: "刺激参数有误",
+    0x3ED: "End of stimulation (by force)",
+}    
+def trigger_info(code: int) -> str:
+    return __TRIGGER_MAPPING.get(code, "未知触发事件")    

{qlsdk2-0.6.0a7 → qlsdk2-0.6.0a9}/src/qlsdk/rsc/parser/base.py

@@ -131,10 +131,15 @@ class TcpMessageParser(IParser):
     
     def unpack(self, packet):        
         # 提取指令码
-        cmd_code = int.from_bytes(packet[self.cmd_pos : self.cmd_pos + 2], 'little')
-        cmd_class = CommandFactory.create_command(cmd_code)
-        instance = cmd_class(self.device)
-        instance.parse_body(packet[self.header_len:-2])
+        cmd_code = None
+        try:
+            cmd_code = int.from_bytes(packet[self.cmd_pos : self.cmd_pos + 2], 'little')
+            cmd_class = CommandFactory.create_command(cmd_code)
+            instance = cmd_class(self.device)
+            instance.parse_body(packet[self.header_len:-2])
+        except Exception as e:
+            logger.error(f"指令[{cmd_code}]数据包[len={len(packet)}]解析异常: {e}")
+            
         return instance
             
     def start(self):

{qlsdk2-0.6.0a7 → qlsdk2-0.6.0a9}/src/qlsdk2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qlsdk2
-Version: 0.6.0a7
+Version: 0.6.0a9
 Summary: SDK for quanlan device
 Home-page: https://github.com/hehuajun/qlsdk
 Author: hehuajun