sensor-sdk 0.0.11__py3-none-any.whl → 0.0.15__py3-none-any.whl

sensor/gforce.py

@@ -103,6 +103,8 @@ class Command(IntEnum):
     CMD_GET_BLE_MTU_INFO = (0xAE,)
     CMD_GET_BRT_CONFIG = (0xB3,)
 
+    CMD_SET_FRIMWARE_FILTER_SWITCH = (0xAA,)
+    CMD_GET_FRIMWARE_FILTER_SWITCH = (0xA9,)
     # Partial command packet, format: [CMD_PARTIAL_DATA, packet number in reverse order, packet content]
     MD_PARTIAL_DATA = 0xFF
 
@@ -737,6 +739,15 @@ class GForce:
             )
         )
 
+    async def set_firmware_filter_switch(self, switchStatus: int):
+        body = [0xFF & switchStatus]
+        body = bytes(body)
+        await self._send_request(Request(cmd=Command.CMD_SET_FRIMWARE_FILTER_SWITCH, body=body, has_res=True))
+
+    async def get_firmware_filter_switch(self):
+        buf = await self._send_request(Request(cmd=Command.CMD_GET_FRIMWARE_FILTER_SWITCH, has_res=True))
+        return buf[0]
+
     async def set_emg_raw_data_config(self, cfg=EmgRawDataConfig()):
         body = cfg.to_bytes()
         await self._send_request(
@@ -842,10 +853,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_context.py

@@ -1,11 +1,12 @@
 import asyncio
 from collections import deque
+import os
 import platform
 from queue import Queue
 import struct
 from typing import Deque, List
 from concurrent.futures import ThreadPoolExecutor
-
+import csv
 from sensor import utils
 from sensor.gforce import DataSubscription, GForce
 from sensor.sensor_data import DataType, Sample, SensorData
@@ -58,9 +59,15 @@ class SensorProfileDataCtx:
         self.impedanceData: List[float] = list()
         self.saturationData: List[float] = list()
         self.dataPool = ThreadPoolExecutor(1, "data")
+        self.init_map = {"NTF_EMG": "ON", "NTF_EEG": "ON", "NTF_ECG": "ON", "NTF_IMU": "ON", "NTF_BRTH": "ON"}
+        self.filter_map = {"FILTER_50Hz": "ON", "FILTER_60Hz": "ON", "FILTER_HPF": "ON", "FILTER_LPF": "ON"}
+        self.debugCSVWriter = None
+        self.debugCSVPath = None
 
     def close(self):
         self._is_running = False
+        if self.debugCSVWriter != None:
+            self.debugCSVWriter = None
 
     def clear(self):
         for sensorData in self.sensorDatas:
@@ -227,22 +234,22 @@ class SensorProfileDataCtx:
             if self.hasImpedance():
                 self.notifyDataFlag |= DataSubscription.DNF_IMPEDANCE
 
-            if self.hasEEG():
+            if self.hasEEG() & (self.init_map["NTF_EEG"] == "ON"):
                 # print("initEEG")
                 info.EegChannelCount = await self.initEEG(packageCount)
                 info.EegSampleRate = self.sensorDatas[SensorDataType.DATA_TYPE_EEG].sampleRate
 
-            if self.hasECG():
+            if self.hasECG() & (self.init_map["NTF_ECG"] == "ON"):
                 # print("initECG")
                 info.EcgChannelCount = await self.initECG(packageCount)
                 info.EcgSampleRate = self.sensorDatas[SensorDataType.DATA_TYPE_ECG].sampleRate
 
-            if self.hasBrth():
+            if self.hasBrth() & (self.init_map["NTF_BRTH"] == "ON"):
                 # print("initBrth")
                 info.BrthChannelCount = await self.initBrth(packageCount)
                 info.BrthSampleRate = self.sensorDatas[SensorDataType.DATA_TYPE_BRTH].sampleRate
 
-            if self.hasIMU():
+            if self.hasIMU() & (self.init_map["NTF_IMU"] == "ON"):
                 # print("initIMU")
                 imuChannelCount = await self.initIMU(packageCount)
                 info.AccChannelCount = imuChannelCount
@@ -267,12 +274,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:
@@ -280,16 +290,64 @@ 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
+        switch = 0
+        for filter in self.filter_map.keys():
+            value = self.filter_map[filter]
+            if filter == "FILTER_50Hz":
+                if value == "ON":
+                    switch |= 1
+            elif filter == "FILTER_60Hz":
+                if value == "ON":
+                    switch |= 2
+            elif filter == "FILTER_HPF":
+                if value == "ON":
+                    switch |= 4
+            elif filter == "FILTER_LPF":
+                if value == "ON":
+                    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)
+
+    async def setDebugCSV(self, debugFilePath) -> str:
+        if self.debugCSVWriter != None:
+            self.debugCSVWriter = None
+        if debugFilePath != None:
+            self.debugCSVPath = debugFilePath
+            try:
+                if self.debugCSVPath != "":
+                    CSVWriter = csv.writer(open(self.debugCSVPath, "w", newline=""), delimiter=",")
+                    CSVWriter = None
+            except Exception as e:
+                return "ERROR: " + str(e)
+        return "OK"
+
+    ####################################################################################
 
     async def process_data(self, buf: Queue[SensorData], sensor, callback):
         while self._is_running and self._rawDataBuffer.empty():
-            await asyncio.sleep(0.01)
+            await asyncio.sleep(0.1)
 
             while self._is_running and not self._rawDataBuffer.empty():
                 try:
@@ -297,22 +355,23 @@ 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]
@@ -527,6 +586,31 @@ class SensorProfileDataCtx:
             sensorDataResult.minPackageSampleCount = sensorData.minPackageSampleCount
             sensorDataList.append(sensorDataResult)
 
+            if self.debugCSVPath != None and self.debugCSVPath != "" and self.debugCSVWriter == None:
+                try:
+                    self.debugCSVWriter = csv.writer(open(self.debugCSVPath, "w", newline="", encoding="utf-8"))
+                    header_append_keys = ["dataType", "sampleRate"]
+                    channel_samples_header = list(vars(sensorDataResult.channelSamples[0][0]).keys())
+                    for key_item in header_append_keys:
+                        channel_samples_header.append(key_item)
+                    self.debugCSVWriter.writerow(channel_samples_header)
+                except Exception as e:
+                    print(e)
+
+            if self.debugCSVWriter != None:
+                try:
+                    for i, channel_sample_list in enumerate(sensorDataResult.channelSamples):
+                        for channel_sample in channel_sample_list:
+                            row_data = []
+
+                            for key in vars(channel_sample).keys():
+                                row_data.append(getattr(channel_sample, key))
+                            row_data.append(sensorDataResult.dataType)
+                            row_data.append(sensorDataResult.sampleRate)
+                            self.debugCSVWriter.writerow(row_data)
+                except Exception as e:
+                    print(e)
+
             startIndex += sensorData.minPackageSampleCount
 
         leftChannelSamples = []
@@ -547,7 +631,7 @@ class SensorProfileDataCtx:
 
         while self._is_running:
             while self._is_running and self._rawDataBuffer.empty():
-                await asyncio.sleep(0.01)
+                await asyncio.sleep(0.1)
                 continue
 
             try:
@@ -611,7 +695,7 @@ class SensorProfileDataCtx:
                         index += 1
                         continue
                     data_package = bytes(self._concatDataBuffer[index + 2 : index + 2 + n])
-                    asyncio.get_event_loop().run_in_executor(self.dataPool, self.gForce._on_cmd_response, None, data_package)
+                    asyncio.get_event_loop().run_in_executor(None, self.gForce._on_cmd_response, None, data_package)
                     last_cut = index = index + 2 + n
 
                 else:

sensor/sensor_profile.py

@@ -18,7 +18,7 @@ import asyncio
 
 from sensor.sensor_data_context import SensorProfileDataCtx
 from sensor.sensor_device import BLEDevice, DeviceInfo, DeviceStateEx
-from sensor.utils import async_call, sync_call, async_exec, timer
+from sensor.utils import async_call, sync_call, async_exec
 
 SERVICE_GUID = "0000ffd0-0000-1000-8000-00805f9b34fb"
 OYM_CMD_NOTIFY_CHAR_UUID = "f000ffe1-0451-4000-b000-000000000000"
@@ -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,8 +292,8 @@ class SensorProfile:
         return await async_call(self._connect())
 
     async def _waitForDisconnect(self) -> bool:
-        while self.deviceState != DeviceStateEx.Disconnected:
-            asyncio.sleep(1)
+        while not utils._terminated and self.deviceState != DeviceStateEx.Disconnected:
+            await asyncio.sleep(1)
         return True
 
     async def _disconnect(self) -> bool:
@@ -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):
@@ -473,6 +497,37 @@ class SensorProfile:
             return self._data_ctx._device_info
         return None
 
+    async def _setParam(self, key: str, value: str) -> str:
+        result = "Error: Not supported"
+        if self.deviceState != DeviceStateEx.Ready:
+            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
+                result = "OK"
+
+        if key in ["FILTER_50Hz", "FILTER_60Hz", "FILTER_HPF", "FILTER_LPF"]:
+            if value in ["ON", "OFF"]:
+                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":
+            result = await self._data_ctx.setDebugCSV(value)
+
+        self._is_setting_param = False
+        return result
+
     def setParam(self, key: str, value: str) -> str:
         """
         设置传感器的参数。
@@ -483,9 +538,16 @@ class SensorProfile:
         :return:            str: 设置参数的结果。
 
         """
-        return ""
+        if self._is_setting_param:
+            return "Error: Please wait for the previous operation to complete"
 
-    async def AsyncSetParam(self, key: str, value: str) -> str:
+        self._is_setting_param = True
+        return sync_call(
+            self._setParam(key, value),
+            20,
+        )
+
+    async def asyncSetParam(self, key: str, value: str) -> str:
         """
         设置传感器的参数。
 
@@ -495,4 +557,11 @@ class SensorProfile:
         :return:            str: 设置参数的结果。
 
         """
-        return ""
+        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/utils.py

@@ -37,30 +37,6 @@ def Terminate():
             pass
 
 
-async def delay(_time: float, function) -> any:
-    try:
-        await asyncio.sleep(_time)
-    except Exception as e:
-        pass
-
-    try:
-        return await function
-    except Exception as e:
-        pass
-
-
-def timer(_delay: float, function):
-    checkRunLoop()
-    task: asyncio.Future = None
-    try:
-        task = asyncio.run_coroutine_threadsafe(delay(_delay, function), _runloop)
-        running_tasks.add(task)
-        task.add_done_callback(lambda t: running_tasks.remove(t))
-    except Exception as e:
-        print(e)
-        pass
-
-
 def async_exec(function):
     checkRunLoop()
     task: asyncio.Future = None

{sensor_sdk-0.0.11.dist-info → sensor_sdk-0.0.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sensor-sdk
-Version: 0.0.11
+Version: 0.0.15
 Summary: Python sdk for Synchroni
 Home-page: https://github.com/oymotion/SynchroniSDKPython
 Author: Martin Ye
@@ -350,8 +350,47 @@ batteryPower = sensorProfile.getBatteryLevel()
 
 Please check console.py in examples directory
 
-## Async methods
+### Async methods
 
 all methods start with async is async methods, they has same params and return result as sync methods.
 
 Please check async_console.py in examples directory
+
+### setParam method
+
+Use `def setParam(self, key: str, value: str) -> str` to set parameter of sensor profile. Please call after device in 'Ready' state.
+
+Below is available key and value:
+
+```python
+result = sensorProfile.setParam("NTF_EMG", "ON")
+# set EMG data to ON or OFF, result is "OK" if succeed
+
+result = sensorProfile.setParam("NTF_EEG", "ON")
+# set EEG data to ON or OFF, result is "OK" if succeed
+
+result = sensorProfile.setParam("NTF_ECG", "ON")
+# set ECG data to ON or OFF, result is "OK" if succeed
+
+result = sensorProfile.setParam("NTF_IMU", "ON")
+# set IMU data to ON or OFF, result is "OK" if succeed
+
+result = sensorProfile.setParam("NTF_BRTH", "ON")
+# set BRTH data to ON or OFF, result is "OK" if succeed
+
+result = sensorProfile.setParam("FILTER_50Hz", "ON")
+# set 50Hz notch filter to ON or OFF, result is "OK" if succeed
+
+result = sensorProfile.setParam("FILTER_60Hz", "ON")
+# set 60Hz notch filter to ON or OFF, result is "OK" if succeed
+
+result = sensorProfile.setParam("FILTER_HPF", "ON")
+# set 0.5Hz hpf filter to ON or OFF, result is "OK" if succeed
+
+result = sensorProfile.setParam("FILTER_LPF", "ON")
+# set 80Hz lpf filter to ON or OFF, result is "OK" if succeed
+
+result = sensorProfile.setParam("DEBUG_BLE_DATA_PATH", "d:/temp/test.csv")
+# set debug ble data path, result is "OK" if succeed
+# please give an absolute path and make sure it is valid and writeable by yourself
+```

sensor_sdk-0.0.15.dist-info/RECORD

@@ -0,0 +1,14 @@
+sensor/__init__.py,sha256=L1VyAP0EDEnJIMeMTzp4iXHSRUUHyHScF_GIl3iYKRI,123
+sensor/gforce.py,sha256=wZ4aEFtrgeR8LsL7tm6VSsjvIVcWbfQhwAVfADveNkg,25761
+sensor/sensor_controller.py,sha256=qnM9mVwpJn9PCnxlvbgWFeaLktqVnmaquZgasYGEHqs,9451
+sensor/sensor_data.py,sha256=Hu7Ql0LgQ7V24xYZhaLrKPwU4KWZeWE655v8Gy8xphY,3934
+sensor/sensor_data_context.py,sha256=rxttt7f1BQOM2lUFys_po4BICdVl-NmIHKfnqGKs5XE,28815
+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.15.dist-info/LICENSE.txt,sha256=8CSivOpub3IuXODTyqBRI91AxouJZk02YrcKuOAkWu8,1111
+sensor_sdk-0.0.15.dist-info/METADATA,sha256=D2Zk6zQPs3XrYYVdt_ROBT-PNZaIi_EhCgFZ9iqtwb4,9825
+sensor_sdk-0.0.15.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+sensor_sdk-0.0.15.dist-info/top_level.txt,sha256=Ftq49B6bH0Ffdc7c8LkcyakHo6lsg_snlBbpEUoILSk,7
+sensor_sdk-0.0.15.dist-info/zip-safe,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
+sensor_sdk-0.0.15.dist-info/RECORD,,

sensor_sdk-0.0.11.dist-info/RECORD

@@ -1,14 +0,0 @@
-sensor/__init__.py,sha256=L1VyAP0EDEnJIMeMTzp4iXHSRUUHyHScF_GIl3iYKRI,123
-sensor/gforce.py,sha256=mTw0VVQSxPiTzZmjK7I9knTlTkEeu4PISQdlAkMU6WE,25232
-sensor/sensor_controller.py,sha256=qnM9mVwpJn9PCnxlvbgWFeaLktqVnmaquZgasYGEHqs,9451
-sensor/sensor_data.py,sha256=Hu7Ql0LgQ7V24xYZhaLrKPwU4KWZeWE655v8Gy8xphY,3934
-sensor/sensor_data_context.py,sha256=Mlq0Bflnf6Lmj9cf7ccXYnjKldKD4pM9_x1GcgFynEs,25166
-sensor/sensor_device.py,sha256=eO1vaqjxCc2UCPBoKXqlk6o498uRyWt6IYs7r7wXSD0,3042
-sensor/sensor_profile.py,sha256=64MFNyLJajX6HeGS_tmN9R9wfEW1qjsP_MjH3ZRPq4s,17322
-sensor/utils.py,sha256=FuBEChpJYbXnUaDvlta3aT6dYGAK2fQdGbIB7BYMQp4,7077
-sensor_sdk-0.0.11.dist-info/LICENSE.txt,sha256=8CSivOpub3IuXODTyqBRI91AxouJZk02YrcKuOAkWu8,1111
-sensor_sdk-0.0.11.dist-info/METADATA,sha256=VMpmAjRXMlk8u-UnHu_QrXULi0-YMxSdRSGDwPmCdPs,8375
-sensor_sdk-0.0.11.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-sensor_sdk-0.0.11.dist-info/top_level.txt,sha256=Ftq49B6bH0Ffdc7c8LkcyakHo6lsg_snlBbpEUoILSk,7
-sensor_sdk-0.0.11.dist-info/zip-safe,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-sensor_sdk-0.0.11.dist-info/RECORD,,