sensor-sdk 0.0.13__py3-none-any.whl → 0.0.16__py3-none-any.whl

sensor/gforce.py

@@ -728,6 +728,17 @@ class GForce:
             )
         )
 
+    async def set_package_id(self, switchStatus):
+        body = [switchStatus == True]
+        body = bytes(body)
+        ret = await self._send_request(
+            Request(
+                cmd=Command.PACKAGE_ID_CONTROL,
+                body=body,
+                has_res=True,
+            )
+        )
+
     async def set_log_level(self, logLevel):
         body = [0xFF & logLevel]
         body = bytes(body)
@@ -853,10 +864,10 @@ class GForce:
 
     async def stop_streaming(self):
         exceptions = []
-        try:
-            await asyncio.wait_for(self.set_subscription(DataSubscription.OFF), utils._TIMEOUT)
-        except Exception as e:
-            exceptions.append(e)
+        # try:
+        #     await asyncio.wait_for(self.set_subscription(DataSubscription.OFF), utils._TIMEOUT)
+        # except Exception as e:
+        #     exceptions.append(e)
         try:
             await asyncio.wait_for(self.client.stop_notify(self.data_char), utils._TIMEOUT)
         except Exception as e:

sensor/sensor_data.py

@@ -38,6 +38,7 @@ class Sample:
 class DataType(IntEnum):
     NTF_ACC = 0x1  # 加速度，用于标识加速度传感器采集的数据
     NTF_GYRO = 0x2  # 陀螺仪，用于标识陀螺仪传感器采集的数据
+    NTF_EMG = 0x8  # EMG，用于标识肌电传感器采集的数据
     NTF_EEG = 0x10  # EEG，用于标识脑电传感器采集的数据
     NTF_ECG = 0x11  # ECG，用于标识心电传感器采集的数据
     NTF_IMPEDANCE = (0x12,)  # 阻抗数据

sensor/sensor_data_context.py

@@ -8,7 +8,7 @@ from typing import Deque, List
 from concurrent.futures import ThreadPoolExecutor
 import csv
 from sensor import utils
-from sensor.gforce import DataSubscription, GForce
+from sensor.gforce import DataSubscription, GForce, SamplingRate
 from sensor.sensor_data import DataType, Sample, SensorData
 
 from enum import Enum, IntEnum
@@ -22,7 +22,8 @@ class SensorDataType(IntEnum):
     DATA_TYPE_ACC = 2
     DATA_TYPE_GYRO = 3
     DATA_TYPE_BRTH = 4
-    DATA_TYPE_COUNT = 5
+    DATA_TYPE_EMG = 5
+    DATA_TYPE_COUNT = 6
 
 
 # 枚举 FeatureMaps 的 Python 实现
@@ -114,6 +115,31 @@ class SensorProfileDataCtx:
     def hasConcatBLE(self):
         return (self.featureMap & FeatureMaps.GFD_FEAT_CONCAT_BLE.value) != 0
 
+    async def initEMG(self, packageCount: int) -> int:
+        config = await self.gForce.get_emg_raw_data_config()
+        data = SensorData()
+        data.deviceMac = self.deviceMac
+        data.dataType = DataType.NTF_EMG
+        data.sampleRate = 500
+        data.resolutionBits = 0
+        data.channelCount = 8
+        data.channelMask = config.channel_mask
+        data.minPackageSampleCount = packageCount
+        data.packageSampleCount = 8
+        data.K = 4000000.0 / 8388607.0
+        data.clear()
+        self.sensorDatas[SensorDataType.DATA_TYPE_EMG] = data
+        self.notifyDataFlag |= DataSubscription.EMG_RAW
+
+        config.fs = SamplingRate.HZ_500
+        config.channel_mask = 255
+        config.resolution = 8
+        config.batch_len = 128
+        await self.gForce.set_emg_raw_data_config(config)
+
+        await self.gForce.set_package_id(True)
+        return data.channelCount
+
     async def initEEG(self, packageCount: int) -> int:
         config = await self.gForce.get_eeg_raw_data_config()
         cap = await self.gForce.get_eeg_raw_data_cap()
@@ -234,23 +260,23 @@ class SensorProfileDataCtx:
             if self.hasImpedance():
                 self.notifyDataFlag |= DataSubscription.DNF_IMPEDANCE
 
-            if self.hasEEG() & (self.init_map["NTF_EEG"] == "ON"):
-                # print("initEEG")
+            if self.hasEMG() and (self.init_map["NTF_EMG"] == "ON"):
+                info.EmgChannelCount = await self.initEMG(packageCount)
+                info.EmgSampleRate = self.sensorDatas[SensorDataType.DATA_TYPE_EMG].sampleRate
+
+            if self.hasEEG() and (self.init_map["NTF_EEG"] == "ON"):
                 info.EegChannelCount = await self.initEEG(packageCount)
                 info.EegSampleRate = self.sensorDatas[SensorDataType.DATA_TYPE_EEG].sampleRate
 
-            if self.hasECG() & (self.init_map["NTF_ECG"] == "ON"):
-                # print("initECG")
+            if self.hasECG() and (self.init_map["NTF_ECG"] == "ON"):
                 info.EcgChannelCount = await self.initECG(packageCount)
                 info.EcgSampleRate = self.sensorDatas[SensorDataType.DATA_TYPE_ECG].sampleRate
 
-            if self.hasBrth() & (self.init_map["NTF_BRTH"] == "ON"):
-                # print("initBrth")
+            if self.hasBrth() and (self.init_map["NTF_BRTH"] == "ON"):
                 info.BrthChannelCount = await self.initBrth(packageCount)
                 info.BrthSampleRate = self.sensorDatas[SensorDataType.DATA_TYPE_BRTH].sampleRate
 
-            if self.hasIMU() & (self.init_map["NTF_IMU"] == "ON"):
-                # print("initIMU")
+            if self.hasIMU() and (self.init_map["NTF_IMU"] == "ON"):
                 imuChannelCount = await self.initIMU(packageCount)
                 info.AccChannelCount = imuChannelCount
                 info.GyroChannelCount = imuChannelCount
@@ -274,12 +300,15 @@ class SensorProfileDataCtx:
             return True
         self._is_data_transfering = True
         self._rawDataBuffer.queue.clear()
+        self._concatDataBuffer.clear()
+        self.clear()
+
         if not self.isUniversalStream:
             await self.gForce.start_streaming(self._rawDataBuffer)
-            return True
         else:
             await self.gForce.set_subscription(self.notifyDataFlag)
-            return True
+
+        return True
 
     async def stop_streaming(self) -> bool:
         if not self._is_data_transfering:
@@ -287,12 +316,21 @@ class SensorProfileDataCtx:
 
         self._is_data_transfering = False
 
-        if not self.isUniversalStream:
-            await self.gForce.stop_streaming()
-            return True
-        else:
-            await self.gForce.set_subscription(0)
-            return True
+        try:
+
+            if not self.isUniversalStream:
+                await self.gForce.stop_streaming()
+            else:
+                await self.gForce.set_subscription(0)
+
+            while self._is_running and not self._rawDataBuffer.empty():
+                await asyncio.sleep(0.1)
+
+        except Exception as e:
+            print(e)
+            return False
+
+        return True
 
     async def setFilter(self, filter: str, value: str) -> str:
         self.filter_map[filter] = value
@@ -313,6 +351,7 @@ class SensorProfileDataCtx:
                     switch |= 8
         try:
             await self.gForce.set_firmware_filter_switch(switch)
+            await asyncio.sleep(0.1)
             return "OK"
         except Exception as e:
             return "ERROR: " + str(e)
@@ -342,25 +381,26 @@ class SensorProfileDataCtx:
                 except Exception as e:
                     continue
 
-                self._processDataPackage(data, buf, sensor)
+                if self.isDataTransfering:
+                    self._processDataPackage(data, buf, sensor)
                 self._rawDataBuffer.task_done()
 
-                while self._is_running and self.isDataTransfering and not buf.empty():
-                    sensorData: SensorData = None
+            while self._is_running and self.isDataTransfering and not buf.empty():
+                sensorData: SensorData = None
+                try:
+                    sensorData = buf.get_nowait()
+                except Exception as e:
+                    break
+                if sensorData != None and callback != None:
                     try:
-                        sensorData = buf.get_nowait()
+                        asyncio.get_event_loop().run_in_executor(self.dataPool, callback, sensor, sensorData)
                     except Exception as e:
-                        break
-                    if sensorData != None and callback != None:
-                        try:
-                            asyncio.get_event_loop().run_in_executor(self.dataPool, callback, sensor, sensorData)
-                        except Exception as e:
-                            print(e)
+                        print(e)
 
-                    buf.task_done()
+                buf.task_done()
 
     def _processDataPackage(self, data: bytes, buf: Queue[SensorData], sensor):
-        v = data[0]
+        v = data[0] & 0x7F
         if v == DataType.NTF_IMPEDANCE:
             offset = 1
             # packageIndex = ((data[offset + 1] & 0xff) << 8) | (data[offset] & 0xff)
@@ -383,7 +423,10 @@ class SensorProfileDataCtx:
 
             self.impedanceData = impedanceData
             self.saturationData = saturationData
-
+        elif v == DataType.NTF_EMG:
+            sensor_data = self.sensorDatas[SensorDataType.DATA_TYPE_EMG]
+            if self.checkReadSamples(sensor, data, sensor_data, 3, 0):
+                self.sendSensorData(sensor_data, buf)
         elif v == DataType.NTF_EEG:
             sensor_data = self.sensorDatas[SensorDataType.DATA_TYPE_EEG]
             if self.checkReadSamples(sensor, data, sensor_data, 3, 0):
@@ -407,7 +450,7 @@ class SensorProfileDataCtx:
 
     def checkReadSamples(self, sensor, data: bytes, sensorData: SensorData, dataOffset: int, dataGap: int):
         offset = 1
-        v = data[0]
+
         if not self._is_data_transfering:
             return False
         try:
@@ -439,8 +482,9 @@ class SensorProfileDataCtx:
                         asyncio.get_event_loop().run_in_executor(None, sensor._on_error_callback, sensor, lostLog)
                     except Exception as e:
                         pass
+                if lostSampleCount < 100:
+                    self.readSamples(data, sensorData, 0, dataGap, lostSampleCount)
 
-                self.readSamples(data, sensorData, 0, dataGap, lostSampleCount)
                 if newPackageIndex == 0:
                     sensorData.lastPackageIndex = 65535
                 else:
@@ -455,6 +499,12 @@ class SensorProfileDataCtx:
             return False
         return True
 
+    def transTrainData(self, data: int):
+        xout = data >> 4
+        exp = data & 0x0000000F
+        xout = xout << exp
+        return xout
+
     def readSamples(
         self,
         data: bytes,
@@ -522,6 +572,10 @@ class SensorProfileDataCtx:
                             rawData = (data[offset] << 16) | (data[offset + 1] << 8) | data[offset + 2]
                             rawData -= 8388608
                             offset += 3
+                        elif sensorData.resolutionBits == 0:
+                            rawData = struct.unpack_from("<h", data, offset)[0]
+                            offset += 2
+                            rawData = self.transTrainData(rawData)
 
                         converted = rawData * K
                         dataItem.rawData = rawData

sensor/sensor_profile.py

@@ -61,6 +61,8 @@ class SensorProfile:
         self._gforce: GForce = None
         self._data_event_loop: asyncio.AbstractEventLoop = None
         self._event_loop: asyncio.AbstractEventLoop = None
+        self._is_starting = False
+        self._is_setting_param = False
 
     def __del__(self) -> None:
         """
@@ -239,6 +241,8 @@ class SensorProfile:
             self._data_ctx = SensorProfileDataCtx(self._gforce, self._device.Address, self._raw_data_buf)
         if self._data_ctx.isUniversalStream:
             async_exec(self._process_universal_data())
+        else:
+            async_exec(self._process_data())
 
         if self.deviceState == DeviceStateEx.Connected or self.deviceState == DeviceStateEx.Ready:
             return True
@@ -288,7 +292,7 @@ class SensorProfile:
         return await async_call(self._connect())
 
     async def _waitForDisconnect(self) -> bool:
-        while self.deviceState != DeviceStateEx.Disconnected:
+        while not utils._terminated and self.deviceState != DeviceStateEx.Disconnected:
             await asyncio.sleep(1)
         return True
 
@@ -341,11 +345,13 @@ class SensorProfile:
         if self._data_event_loop == None:
             self._data_event_loop = asyncio.new_event_loop()
 
-        result = await self._data_ctx.start_streaming()
+        self._raw_data_buf.queue.clear()
         self._data_buffer.queue.clear()
-        self._data_ctx.clear()
-        if not self._data_ctx.isUniversalStream:
-            async_exec(self._process_data())
+
+        result = await self._data_ctx.start_streaming()
+        await asyncio.sleep(0.2)
+
+        self._is_starting = False
         return result
 
     def startDataNotification(self) -> bool:
@@ -355,6 +361,10 @@ class SensorProfile:
         :return:            bool: 如果开始数据通知成功，返回 True；否则返回 False。
 
         """
+        if self._is_starting:
+            return False
+
+        self._is_starting = True
         return sync_call(self._startDataNotification())
 
     async def asyncStartDataNotification(self) -> bool:
@@ -364,6 +374,10 @@ class SensorProfile:
         :return:            bool: 如果开始数据通知成功，返回 True；否则返回 False。
 
         """
+        if self._is_starting:
+            return False
+
+        self._is_starting = True
         return await async_call(self._startDataNotification())
 
     async def _stopDataNotification(self) -> bool:
@@ -377,7 +391,9 @@ class SensorProfile:
         if not self._data_ctx.isDataTransfering:
             return True
 
-        return not await self._data_ctx.stop_streaming()
+        result = await self._data_ctx.stop_streaming()
+        self._is_starting = False
+        return not result
 
     def stopDataNotification(self) -> bool:
         """
@@ -386,6 +402,10 @@ class SensorProfile:
         :return:            bool: 如果停止数据通知成功，返回 True；否则返回 False。
 
         """
+        if self._is_starting:
+            return False
+
+        self._is_starting = True
         return sync_call(self._stopDataNotification())
 
     async def asyncStopDataNotification(self) -> bool:
@@ -395,6 +415,10 @@ class SensorProfile:
         :return:            bool: 如果停止数据通知成功，返回 True；否则返回 False。
 
         """
+        if self._is_starting:
+            return False
+
+        self._is_starting = True
         return await async_call(self._stopDataNotification())
 
     async def _refresh_power(self):
@@ -474,21 +498,35 @@ class SensorProfile:
         return None
 
     async def _setParam(self, key: str, value: str) -> str:
+        result = "Error: Not supported"
         if self.deviceState != DeviceStateEx.Ready:
-            return "Please connect first"
+            result = "Error: Please connect first"
 
         if key in ["NTF_EMG", "NTF_EEG", "NTF_ECG", "NTF_IMU", "NTF_BRTH"]:
             if value in ["ON", "OFF"]:
                 self._data_ctx.init_map[key] = value
-                return "OK"
+                result = "OK"
 
         if key in ["FILTER_50Hz", "FILTER_60Hz", "FILTER_HPF", "FILTER_LPF"]:
             if value in ["ON", "OFF"]:
-                return await self._data_ctx.setFilter(key, value)
+                needPauseTransfer = self.isDataTransfering
+                if needPauseTransfer:
+                    if self._is_starting:
+                        self._is_setting_param = False
+                        return "Error: Please pause data transfer first"
+
+                    self._is_starting = True
+                    await self._stopDataNotification()
+                result = await self._data_ctx.setFilter(key, value)
+                if needPauseTransfer:
+                    self._is_starting = True
+                    await self._startDataNotification()
 
         if key == "DEBUG_BLE_DATA_PATH":
-            return await self._data_ctx.setDebugCSV(value)
-        return "Not supported"
+            result = await self._data_ctx.setDebugCSV(value)
+
+        self._is_setting_param = False
+        return result
 
     def setParam(self, key: str, value: str) -> str:
         """
@@ -500,6 +538,10 @@ class SensorProfile:
         :return:            str: 设置参数的结果。
 
         """
+        if self._is_setting_param:
+            return "Error: Please wait for the previous operation to complete"
+
+        self._is_setting_param = True
         return sync_call(
             self._setParam(key, value),
             20,
@@ -515,6 +557,10 @@ class SensorProfile:
         :return:            str: 设置参数的结果。
 
         """
+        if self._is_setting_param:
+            return "Error: Please wait for the previous operation to complete"
+
+        self._is_setting_param = True
         return await async_call(
             self._setParam(key, value),
             20,

{sensor_sdk-0.0.13.dist-info → sensor_sdk-0.0.16.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: sensor-sdk
-Version: 0.0.13
+Version: 0.0.16
 Summary: Python sdk for Synchroni
 Home-page: https://github.com/oymotion/SynchroniSDKPython
 Author: Martin Ye
 Author-email: yecq_82@hotmail.com
-Requires-Python: >=3.8.0
+Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: numpy

sensor_sdk-0.0.16.dist-info/RECORD

@@ -0,0 +1,14 @@
+sensor/__init__.py,sha256=L1VyAP0EDEnJIMeMTzp4iXHSRUUHyHScF_GIl3iYKRI,123
+sensor/gforce.py,sha256=gpetzJD0b4zezCMdhzodjjj55eb2C37ApeiNIYzRf1Q,26078
+sensor/sensor_controller.py,sha256=qnM9mVwpJn9PCnxlvbgWFeaLktqVnmaquZgasYGEHqs,9451
+sensor/sensor_data.py,sha256=vKreLHZs7WbQcnfqHiLLfHQ3cCmvD1K2xl2WUQg8vv0,4005
+sensor/sensor_data_context.py,sha256=FpZlgEq98MPRR3SGOy4LimXaiU3SBVuxtDCbSMPro1M,30560
+sensor/sensor_device.py,sha256=eO1vaqjxCc2UCPBoKXqlk6o498uRyWt6IYs7r7wXSD0,3042
+sensor/sensor_profile.py,sha256=NJsPr9l4VB9zAjfkaD28chGnJiSCnYAGFdkkN9Wyky0,19669
+sensor/utils.py,sha256=BudTD083ucGxcTXfmksF-2gLRi_i-k7tMytruLUUKJc,6503
+sensor_sdk-0.0.16.dist-info/LICENSE.txt,sha256=8CSivOpub3IuXODTyqBRI91AxouJZk02YrcKuOAkWu8,1111
+sensor_sdk-0.0.16.dist-info/METADATA,sha256=dxmSp_3HYa2gUxk9bpCeqsynksYfw1Km-SeIhsTtsFc,9825
+sensor_sdk-0.0.16.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+sensor_sdk-0.0.16.dist-info/top_level.txt,sha256=Ftq49B6bH0Ffdc7c8LkcyakHo6lsg_snlBbpEUoILSk,7
+sensor_sdk-0.0.16.dist-info/zip-safe,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
+sensor_sdk-0.0.16.dist-info/RECORD,,

sensor_sdk-0.0.13.dist-info/RECORD

@@ -1,14 +0,0 @@
-sensor/__init__.py,sha256=L1VyAP0EDEnJIMeMTzp4iXHSRUUHyHScF_GIl3iYKRI,123
-sensor/gforce.py,sha256=QsbHhTieVKMJ_KHn7nEchh7sChZWL-iSP0LmfxhYYXw,25753
-sensor/sensor_controller.py,sha256=qnM9mVwpJn9PCnxlvbgWFeaLktqVnmaquZgasYGEHqs,9451
-sensor/sensor_data.py,sha256=Hu7Ql0LgQ7V24xYZhaLrKPwU4KWZeWE655v8Gy8xphY,3934
-sensor/sensor_data_context.py,sha256=a45WJPE-8-CzzMn9BlCjjC39fiIxkjV-UQw2Rok-OyM,28536
-sensor/sensor_device.py,sha256=eO1vaqjxCc2UCPBoKXqlk6o498uRyWt6IYs7r7wXSD0,3042
-sensor/sensor_profile.py,sha256=qxjTYt7X45rmVcapI93ynB4dTFLLt0M-WKCp-cpqKrM,18167
-sensor/utils.py,sha256=BudTD083ucGxcTXfmksF-2gLRi_i-k7tMytruLUUKJc,6503
-sensor_sdk-0.0.13.dist-info/LICENSE.txt,sha256=8CSivOpub3IuXODTyqBRI91AxouJZk02YrcKuOAkWu8,1111
-sensor_sdk-0.0.13.dist-info/METADATA,sha256=6hKH69-rbvoswQ9LGvPVcGiY0v8qKKN9rfiVXjX0hLs,9825
-sensor_sdk-0.0.13.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-sensor_sdk-0.0.13.dist-info/top_level.txt,sha256=Ftq49B6bH0Ffdc7c8LkcyakHo6lsg_snlBbpEUoILSk,7
-sensor_sdk-0.0.13.dist-info/zip-safe,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-sensor_sdk-0.0.13.dist-info/RECORD,,