qlsdk2 0.6.0a6__tar.gz → 0.6.0a7__tar.gz

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

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

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

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

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

@@ -195,39 +195,14 @@ class ARSKindlingEDFHandler(object):
         if packet is None:
             # self._edf_writer_thread.stop_recording()
             for k in self._edf_handler.keys():
-                self._edf_handler[k].append(None)
+                self._edf_handler[k].write(None)
             return
          
-        #按分区写入数据
-        
+        #按分区写入数据        
         for k in self._channel_spilt.keys():      
-            logger.info(f'分区{k}, {self._channel_spilt[k]}')      
+            logger.trace(f'分区{k}, {self._channel_spilt[k]}')      
             p = packet
             self.writeA(p, self._channel_spilt[k], k)
-    
-        # with self._lock:
-        #     if self.channels is None:
-        #         logger.info(f"开始记录数据到文件...")
-        #         self.channels = packet.channels
-        #         self._first_pkg_id = packet.pkg_id if self._first_pkg_id is None else self._first_pkg_id
-        #         self._first_timestamp = packet.time_stamp if self._first_timestamp is None else self._first_timestamp
-        #         self._start_time = datetime.now()
-        #         logger.info(f"第一个包id: {self._first_pkg_id }, 时间戳:{self._first_timestamp}， 当前时间:{datetime.now().timestamp()}  offset: {datetime.now().timestamp() - self._first_timestamp}")
-                
-        #     if self._last_pkg_id and self._last_pkg_id != packet.pkg_id - 1:  
-        #         self._lost_packets += packet.pkg_id - self._last_pkg_id - 1
-        #         logger.warning(f"数据包丢失: {self._last_pkg_id} -> {packet.pkg_id}, 丢包数: {packet.pkg_id - self._last_pkg_id - 1}")
-                
-        #     self._last_pkg_id = packet.pkg_id
-        #     self._total_packets += 1
-            
-        #     if self._edf_writer_thread is None:
-        #         self._edf_writer_thread = EDFStreamWriter(self.channels, self.sample_rate, self.physical_max, self.physical_min, self.file_type, self.file_name)
-        #         self._edf_writer_thread.set_start_time(self._start_time)
-        #         self._edf_writer_thread.start()
-        #         logger.info(f"开始写入数据: {self.file_name}")
-                
-        #     self._edf_writer_thread.append(packet.eeg)
      
     def writeA(self, packet: RscPacket, channel_filter, name='A'):
         # 参数检查

{qlsdk2-0.6.0a6 → qlsdk2-0.6.0a7}/src/qlsdk/persist/rsc_edf.py

@@ -62,7 +62,7 @@ class EDFStreamWriter(Thread):
         self._recording = False
         
     def append(self, data):
-        if data:
+        if data is not None:
             # 数据
             self.data_queue.put(data)
             

{qlsdk2-0.6.0a6 → qlsdk2-0.6.0a7}/src/qlsdk/rsc/command/__init__.py

@@ -243,8 +243,9 @@ class StartStimulationCommand(DeviceCommand):
         # error_channel - 8B
         # error_channel= int.from_bytes(body[9:17], 'big')
         channels = to_channels(body[9:17])
-        logger.success(f"通道 {channels} 刺激开始")
-        self.device.trigger(f"通道 {channels} 刺激开始")
+        logger.info(f"通道 {channels} 刺激开始")
+        if self.device:
+            self.device.trigger(f"通道 {channels} 刺激开始")
         # error_type - 1B
         error_type = body[17]
 
@@ -268,8 +269,9 @@ class StopStimulationNotifyCommand(DeviceCommand):
         # error_channel - 8B
         # error_channel= int.from_bytes(body[9:17], 'big')
         channels = to_channels(body[9:17])
-        logger.success(f"通道 {channels} 刺激结束")
-        self.device.trigger(f"通道 {channels} 刺激结束", time)
+        logger.info(f"通道 {channels} 刺激结束")
+        if self.device:
+            self.device.trigger(f"通道 {channels} 刺激结束", time)
         # error_type - 1B
         error_type = body[17]   
 # 刺激信息

qlsdk2-0.6.0a7/src/qlsdk/rsc/device/arskindling.py

@@ -0,0 +1,95 @@
+from loguru import logger
+from qlsdk.persist import ARSKindlingEDFHandler
+from qlsdk.rsc.interface import IDevice
+from qlsdk.rsc.command import *
+from qlsdk.rsc.device.base import QLBaseDevice
+
+class ARSKindling(QLBaseDevice):
+    
+    device_type = 0x60 # C64RS设备类型标识符
+    
+    def __init__(self, socket):
+        super().__init__(socket)
+        
+        self.channel_mapping = {
+            "A1": 55, "A2": 56, "A3": 53, "A4": 54, "A5": 51, "A6": 52, "A7": 49, "A8": 50,
+            "A9": 57, "A10": 58, "A11": 59, "A12": 60, "A13": 61, "A14": 62, 
+            
+            "B1": 39, "B2": 40,  "B3": 37, "B4": 38, "B5": 35, "B6": 36, "B7": 33, "B8": 34,
+            "B9": 41, "B10": 42, "B11": 43, "B12": 44, "B13": 45, "B14": 46, 
+            
+            "C1": 23, "C2": 24, "C3": 21, "C4": 22, "C5": 19, "C6": 20, "C7": 17, "C8": 18,
+            "C9": 25, "C10": 26, "C11": 27, "C12": 28, "C13": 29, "C14": 30, 
+            
+            "D1": 7, "D2": 8, "D3": 5, "D4": 6, "D5": 3, "D6": 4, "D7": 1, "D8": 2,
+            "D9": 9, "D10": 10, "D11": 11, "D12": 12, "D13": 13, "D14": 14, 
+        }
+        
+    @classmethod
+    def from_parent(cls, parent:IDevice) -> IDevice:
+        rlt = cls(parent.socket)
+        rlt.device_id = parent.device_id
+        rlt._device_no = parent.device_no
+        return rlt
+        
+    def init_edf_handler(self):
+        self._edf_handler = ARSKindlingEDFHandler(self.sample_rate,  self.sample_range * 1000 , - self.sample_range * 1000, self.resolution)  
+        self._edf_handler.set_device_type(self.device_type)
+        self._edf_handler.set_device_no(self.device_no)
+        self._edf_handler.set_storage_path(self._storage_path)
+        self._edf_handler.set_file_prefix(self._file_prefix if self._file_prefix else 'ARS')
+        logger.debug(f"EDF Handler initialized")
+        
+    # 设置采集参数
+    def set_acq_param(self, channels, sample_rate = 500, sample_range = 188):
+        self._acq_param["original_channels"] = channels
+        
+        # 根据映射关系做通道转换
+        for k in channels.keys():
+            if isinstance(channels[k], list):
+                temp = [k + str(i) for i in channels[k]]
+                channels[k] = [self.channel_mapping.get(c, 1) for c in temp]
+            else:
+                channels[k] = [k + str(channels[k])]
+                
+                
+        # 更新采集参数        
+        self._acq_param["channels"] = channels 
+        self._acq_param["sample_rate"] = sample_rate
+        self._acq_param["sample_range"] = sample_range
+        self._acq_channels = channels
+        self._sample_rate = sample_rate
+        self._sample_range = sample_range     
+    
+    def gen_set_acquirement_param(self) -> bytes:
+        
+        arr = []
+        for k in self.acq_channels.keys():
+            arr = list(arr + self.acq_channels[k])
+            
+        arr = list(set(arr))
+        body = to_bytes(arr) 
+        body += self.sample_range.to_bytes(4, byteorder='little')
+        body += self.sample_rate.to_bytes(4, byteorder='little')
+        body += self.sample_num.to_bytes(4, byteorder='little')
+        body += self.resolution.to_bytes(1, byteorder='little')
+        body += bytes.fromhex('00')     
+        
+        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.0a6 → qlsdk2-0.6.0a7}/src/qlsdk/rsc/device/base.py

@@ -93,21 +93,6 @@ class QLBaseDevice(IDevice):
         }
         
         self.stim_paradigm: StimulationParadigm = None
-                      
-        signal_info = {
-            "param" : None,
-            "start_time" : None,
-            "finished_time" : None,
-            "packet_total" : None,
-            "last_packet_time" : None,
-            "state" : 0
-        }
-        stim_info = {
-            
-        }
-        Impedance_info = {
-            
-        }
         # 信号采集状态
         # 信号数据包总数（一个信号采集周期内）
         # 信号采集参数
@@ -128,6 +113,8 @@ class QLBaseDevice(IDevice):
         self.storage_enable = True 
         self._listening = False
         # self.ready()
+        self._signal_cache: Queue = None
+        self._recording = False
         
     def parser(self) -> IParser:
         return self._parser
@@ -166,9 +153,16 @@ class QLBaseDevice(IDevice):
             for pos in trigger_positions:
                 self.trigger(data.trigger[pos])
         # 存储
-        if self.storage_enable:
-            self._write_signal(data)
-                        
+        if self.storage_enable:            
+            # 确保记录线程启动
+            if self._recording is False:
+                self._start_recording() 
+                
+            # 写入文件的缓存队列
+            if self._signal_cache is None:
+                self._signal_cache = Queue(256 * 1024 * 1024)  # 256MB缓存
+            self._signal_cache.put(data)
+                                    
         if len(self.signal_consumers) > 0 :
             logger.trace(f"dg eeg: {data.eeg}")
             # 信号数字值转物理值
@@ -187,14 +181,35 @@ class QLBaseDevice(IDevice):
     def _signal_wrapper(self, body: bytes):
         return RscPacket().transfer(body)
                 
-    def _write_signal(self, data: RscPacket):
+    def _write_signal(self):
         # 文件写入到edf
         if self._edf_handler is None:
             logger.debug("Initializing EDF handler for data storage")
             self.init_edf_handler()
         
-        if self._edf_handler:  
+        while self._recording:            
+            data = self._signal_cache.get()
             self._edf_handler.write(data)
+            if data is None:
+                break
+            
+        self._recording = False
+    def _start_recording(self):
+        if self.storage_enable is False:
+            logger.trace("Storage is disabled, will not start recording")
+            return  
+        
+        if self._signal_cache is None:
+            self._signal_cache = Queue(256 * 1024 * 1024)  # 256MB缓存
+            
+        try: 
+            self._recording = True
+            t = Thread(target=self._write_signal, daemon=True)
+            t.start()
+            logger.info(f"开启记录")
+        except Exception as e:
+            logger.error(f"开启记录失败: {str(e)}")
+            return
         
     def start_listening(self):        
         
@@ -305,7 +320,7 @@ class QLBaseDevice(IDevice):
     @property
     def edf_handler(self):
         if not self.storage_enable:
-            logger.warning("EDF storage is disabled, no edf handler available")
+            logger.info("已关闭文件记录，不会生成edf/bdf文件")
             return None
         
         if self._edf_handler is None:
@@ -339,8 +354,12 @@ class QLBaseDevice(IDevice):
         return self._impedance_consumer
     
     # 设置记录文件路径
-    def set_storage_path(self, path):
-        self._storage_path = path
+    def set_storage_path(self, dir: str):
+        import os
+        
+        abs_path = os.path.abspath(dir)
+        os.makedirs(abs_path, exist_ok=True)
+        self._storage_path = abs_path
        
     # 设置记录文件名称前缀 
     def set_file_prefix(self, prefix):
@@ -362,10 +381,6 @@ class QLBaseDevice(IDevice):
         self._acq_channels = channels
         self._sample_rate = sample_rate
         self._sample_range = sample_range
-    
-    # 通用配置-TODO
-    def set_config(self, key:str, val: str):
-        pass      
         
     def start_impedance(self):
         logger.info(f"[设备-{self.device_no}]启动阻抗测量")  
@@ -399,8 +414,8 @@ class QLBaseDevice(IDevice):
             sleep(1)
             delay -= 1
         logger.debug(f"_stop_stimulation_trigger duration: {duration}")
-        if self._edf_handler:
-            self._edf_handler.trigger("stimulation should be stopped")
+        if self.edf_handler:
+            self.edf_handler.trigger("stimulation should be stopped")
         else:
             logger.warning("stop stim trigger fail. no edf writer alive")
         
@@ -411,11 +426,10 @@ class QLBaseDevice(IDevice):
         self.socket.sendall(msg)
         
     # 启动采集
-    def start_acquisition(self, recording = True):
+    def start_acquisition(self):
         logger.info(f"[设备-{self.device_no}]启动信号采集")  
-        self._recording = recording
-        # 初始化EDF处理器
-        self.init_edf_handler()
+        # 记录准备
+        self._start_recording()
         # 设置数据采集参数
         param_bytes = SetAcquisitionParamCommand.build(self).pack()
         # 启动数据采集
@@ -430,9 +444,10 @@ class QLBaseDevice(IDevice):
         msg = StopAcquisitionCommand.build(self).pack()
         logger.trace(f"stop_acquisition message is {msg.hex()}")
         self.socket.sendall(msg)
-        if self._edf_handler:
+        # 结束标识
+        if self._signal_cache:
             # 发送结束标识
-            self.edf_handler.write(None)
+            self._signal_cache.put(None)
         
     '''
         订阅数据
@@ -450,7 +465,7 @@ class QLBaseDevice(IDevice):
             
         # 数据队列
         if q is None:
-            q = Queue(maxsize=1024 * 1024)
+            q = Queue(maxsize=100 * 1024 * 1024)
         
         # 订阅生理电信号数据
         if type == "signal":
@@ -470,10 +485,10 @@ class QLBaseDevice(IDevice):
         return topic, q
     
     def trigger(self, desc):
-        if self._edf_handler:
+        if self.edf_handler:
             self.edf_handler.trigger(desc)
         else:
-            logger.warning("没有开启文件记录时，无法记录trigger信息")
+            logger.info("已关闭文件记录，不会记录trigger信息")
         
     def gen_set_acquirement_param(self) -> bytes:
         
@@ -499,6 +514,9 @@ class QLBaseDevice(IDevice):
          
         # 关闭解析器
         self._parser.stop()   
+        
+    def enable_storage(self, enable: bool = True):
+        self.storage_enable = enable
     
     def __str__(self):
         return f''' 

{qlsdk2-0.6.0a6 → qlsdk2-0.6.0a7}/src/qlsdk/rsc/device/c16_rs.py

@@ -115,11 +115,7 @@ class C16RS(QLBaseDevice):
         self._edf_handler.set_device_no(self.device_no)
         self._edf_handler.set_storage_path(self._storage_path)
         self._edf_handler.set_file_prefix(self._file_prefix if self._file_prefix else 'C16R')
-            
-    # 设置刺激参数
-    def set_stim_param(self, param):
-        self.stim_paradigm = param
-    
+                
     # 设置采集参数
     def set_acq_param(self, channels, sample_rate = 500, sample_range = 188):
         # 保存原始通道参数

{qlsdk2-0.6.0a6 → qlsdk2-0.6.0a7}/src/qlsdk/rsc/device/c256_rs.py

@@ -13,6 +13,13 @@ class C256RS(QLBaseDevice):
     def __init__(self, socket):
         super().__init__(socket)
         
+    @classmethod
+    def from_parent(cls, parent:IDevice) -> IDevice:
+        rlt = cls(parent.socket)
+        rlt.device_id = parent.device_id
+        rlt._device_no = parent.device_no
+        return rlt
+        
     def init_edf_handler(self):
         self._edf_handler = RscEDFHandler(self.sample_rate,  self.sample_range * 1000 , - self.sample_range * 1000, self.resolution)  
         self._edf_handler.set_device_type(self.device_type)
@@ -20,7 +27,12 @@ class C256RS(QLBaseDevice):
         self._edf_handler.set_storage_path(self._storage_path)
         self._edf_handler.set_file_prefix(self._file_prefix if self._file_prefix else 'C256RS')
         logger.debug(f"EDF Handler initialized")
-        
+      
+    @property
+    def acq_channels(self):
+        if self._acq_channels is None:
+            self._acq_channels = [i for i in range(1, 256)]
+        return self._acq_channels  
     
     def _signal_wrapper(self, body: bytes):
         return C256RSPacket().transfer(body)

qlsdk2-0.6.0a7/src/qlsdk/rsc/device/c64s1.py

@@ -0,0 +1,29 @@
+from loguru import logger
+from qlsdk.persist import RscEDFHandler
+from qlsdk.rsc.interface import IDevice
+from qlsdk.rsc.command import *
+from qlsdk.rsc.device.base import QLBaseDevice
+
+class C64S1(QLBaseDevice):
+    
+    device_type = 0x40  # C64RS-S1设备类型标识符
+    
+    def __init__(self, socket):
+        super().__init__(socket)
+    
+    @classmethod
+    def from_parent(cls, parent:IDevice) -> IDevice:
+        rlt = cls(parent.socket)
+        rlt.device_id = parent.device_id
+        rlt._device_no = parent.device_no
+        return rlt
+        
+        
+    def init_edf_handler(self):
+        self._edf_handler = RscEDFHandler(self.sample_rate,  self.sample_range * 1000 , - self.sample_range * 1000, self.resolution)  
+        self._edf_handler.set_device_type(self.device_type)
+        self._edf_handler.set_device_no(self.device_no)
+        self._edf_handler.set_storage_path(self._storage_path)
+        self._edf_handler.set_file_prefix(self._file_prefix if self._file_prefix else 'C64S1')
+        logger.debug(f"EDF Handler initialized")
+        

{qlsdk2-0.6.0a6 → qlsdk2-0.6.0a7}/src/qlsdk/rsc/interface/device.py

@@ -61,4 +61,12 @@ class  IDevice(ABC):
         raise NotImplementedError("Not Supported")
     def disconnect(self) -> None:
         raise NotImplementedError("Not Supported")
-        
+    
+    def set_stim_param(self, param):
+        pass
+        
+    def trigger(self, desc):
+        pass
+    
+    def enable_storage(self, enable: bool = True):
+        pass

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

@@ -64,7 +64,7 @@ class TcpMessageParser(IParser):
                 start_pos = self.buffer.tell()
                 head = self.buffer.read(2)
                 if head != self.header:
-                    logger.debug(f"数据包头部不匹配: {head.hex()}, 期望: {self.header.hex()},继续查找...")
+                    logger.trace(f"数据包头部不匹配: {head.hex()}, 期望: {self.header.hex()},继续查找...")
                     self.buffer.seek(start_pos + 1)  # 移动到下一个字节
                     continue
                 

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

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