sensor-sdk 0.0.27__py3-none-any.whl → 0.0.32__py3-none-any.whl

sensor/gforce.py

@@ -3,6 +3,7 @@ import queue
 import struct
 from asyncio import Queue
 from contextlib import suppress
+from datetime import datetime
 from dataclasses import dataclass
 from enum import IntEnum
 from typing import Optional, Dict, List
@@ -88,6 +89,7 @@ class Command(IntEnum):
     GET_EMG_RAWDATA_CONFIG = (0x46,)
 
     SET_DATA_NOTIF_SWITCH = (0x4F,)
+    SET_FUNCTION_SWITCH = (0x85,)
 
     CMD_GET_EEG_CONFIG = (0xA0,)
     CMD_SET_EEG_CONFIG = (0xA1,)
@@ -372,12 +374,21 @@ class Response:
 
 
 class GForce:
-    def __init__(self, device: BLEDevice, cmd_char: str, data_char: str, isUniversalStream: bool):
+    def __init__(
+        self,
+        device: BLEDevice,
+        cmd_char: str,
+        data_char: str,
+        isUniversalStream: bool,
+        event_loop: asyncio.AbstractEventLoop,
+        gforce_event_loop: asyncio.AbstractEventLoop,
+    ):
         self.device_name = ""
         self.client = None
+        self.event_loop = event_loop
+        self.gforce_event_loop = gforce_event_loop
         self.cmd_char = cmd_char
         self.data_char = data_char
-        self.current_request: Request = None
         self.responses: Dict[Command, Queue] = {}
         self.resolution = SampleResolution.BITS_8
         self._num_channels = 8
@@ -394,7 +405,7 @@ class GForce:
         self._raw_data_buf = buf
 
         try:
-            await asyncio.wait_for(client.connect(), sensor_utils._TIMEOUT)
+            await sensor_utils.async_call(client.connect(), sensor_utils._TIMEOUT, self.gforce_event_loop)
         except Exception as e:
             return
 
@@ -403,19 +414,22 @@ class GForce:
 
         try:
             if not self._is_universal_stream:
-                await asyncio.wait_for(
+                await sensor_utils.async_call(
                     client.start_notify(self.cmd_char, self._on_cmd_response),
                     sensor_utils._TIMEOUT,
+                    self.gforce_event_loop,
                 )
+
             else:
-                await asyncio.wait_for(
+                await sensor_utils.async_call(
                     client.start_notify(self.data_char, self._on_universal_response),
                     sensor_utils._TIMEOUT,
+                    self.gforce_event_loop,
                 )
         except Exception as e:
             return
 
-    def _on_data_response(self, q: Queue[bytes], bs: bytearray):
+    def _on_data_response(self, q: queue.Queue[bytes], bs: bytearray):
         bs = bytes(bs)
 
         full_packet = []
@@ -444,63 +458,6 @@ class GForce:
             return
 
         q.put_nowait(bytes(full_packet))
-        # data = None
-        # data_type = DataType(full_packet[0])
-        # packet = full_packet[1:]
-        # match data_type:
-        #     case DataType.EMG_ADC:
-        #         data = self._convert_emg_to_raw(packet)
-
-        #     case DataType.ACC:
-        #         data = self._convert_acceleration_to_g(packet)
-
-        #     case DataType.GYO:
-        #         data = self._convert_gyro_to_dps(packet)
-
-        #     case DataType.MAG:
-        #         data = self._convert_magnetometer_to_ut(packet)
-
-        #     case DataType.EULER:
-        #         data = self._convert_euler(packet)
-
-        #     case DataType.QUAT:
-        #         data = self._convert_quaternion(packet)
-
-        #     case DataType.ROTA:
-        #         data = self._convert_rotation_matrix(packet)
-
-        #     case DataType.EMG_GEST:  # It is not supported by the device (?)
-        #         data = self._convert_emg_gesture(packet)
-
-        #     case DataType.HID_MOUSE:  # It is not supported by the device
-        #         pass
-
-        #     case DataType.HID_JOYSTICK:  # It is not supported by the device
-        #         pass
-
-        #     case DataType.PARTIAL:
-        #         pass
-        #     case _:
-        #         raise Exception(
-        #             f"Unknown data type {data_type}, full packet: {full_packet}"
-        #         )
-
-        # q.put_nowait(data)
-
-    # def _convert_emg_to_raw(self, data: bytes) -> np.ndarray[np.integer]:
-    #     match self.resolution:
-    #         case SampleResolution.BITS_8:
-    #             dtype = np.uint8
-
-    #         case SampleResolution.BITS_12:
-    #             dtype = np.uint16
-
-    #         case _:
-    #             raise Exception(f"Unsupported resolution {self.resolution}")
-
-    #     emg_data = np.frombuffer(data, dtype=dtype)
-
-    #     return emg_data.reshape(-1, self._num_channels)
 
     @staticmethod
     def _convert_acceleration_to_g(data: bytes) -> np.ndarray[np.float32]:
@@ -565,6 +522,9 @@ class GForce:
         self._raw_data_buf.put_nowait(bytes(bs))
 
     def _on_cmd_response(self, _: BleakGATTCharacteristic, bs: bytearray):
+        sensor_utils.async_exec(self.async_on_cmd_response(bs), self.event_loop)
+
+    async def async_on_cmd_response(self, bs: bytearray):
         try:
             # print(bytes(bs))
             response = self._parse_response(bytes(bs))
@@ -754,6 +714,17 @@ class GForce:
             )
         )
 
+    async def set_function_switch(self, funcSwitch):
+        body = [0xFF & funcSwitch]
+        body = bytes(body)
+        ret = await self._send_request(
+            Request(
+                cmd=Command.SET_FUNCTION_SWITCH,
+                body=body,
+                has_res=True,
+            )
+        )
+
     async def set_firmware_filter_switch(self, switchStatus: int):
         body = [0xFF & switchStatus]
         body = bytes(body)
@@ -858,22 +829,20 @@ class GForce:
         )
 
     async def start_streaming(self, q: queue.Queue):
-        await asyncio.wait_for(
+        await sensor_utils.async_call(
             self.client.start_notify(
                 self.data_char,
                 lambda _, data: self._on_data_response(q, data),
             ),
             sensor_utils._TIMEOUT,
+            self.gforce_event_loop,
         )
 
     async def stop_streaming(self):
         exceptions = []
-        # try:
-        #     await asyncio.wait_for(self.set_subscription(DataSubscription.OFF), sensor_utils._TIMEOUT)
-        # except Exception as e:
-        #     exceptions.append(e)
+
         try:
-            await asyncio.wait_for(self.client.stop_notify(self.data_char), sensor_utils._TIMEOUT)
+            await sensor_utils.async_call(self.client.stop_notify(self.data_char), sensor_utils._TIMEOUT, self.gforce_event_loop)
         except Exception as e:
             exceptions.append(e)
 
@@ -883,49 +852,62 @@ class GForce:
     async def disconnect(self):
         with suppress(asyncio.CancelledError):
             try:
-                await asyncio.wait_for(self.client.disconnect(), sensor_utils._TIMEOUT)
+                await sensor_utils.async_call(self.client.disconnect(), sensor_utils._TIMEOUT, self.gforce_event_loop)
             except Exception as e:
                 pass
 
     def _get_response_channel(self, cmd: Command) -> Queue:
         if self.responses.get(cmd) != None:
-            return None
-
-        q = Queue()
-        self.responses[cmd] = q
-        return q
+            return self.responses[cmd]
+        else:
+            q = Queue()
+            self.responses[cmd] = q
+            return q
 
     async def _send_request(self, req: Request) -> Optional[bytes]:
+        return await sensor_utils.async_call(self._send_request_internal(req=req), runloop=self.event_loop)
 
+    async def _send_request_internal(self, req: Request) -> Optional[bytes]:
         q = None
         if req.has_res:
             q = self._get_response_channel(req.cmd)
-            if q == None:
-                # print("duplicate")
-                return None
 
-        while self.current_request != None:
-            # print("wait")
-            await asyncio.sleep(0.1)
+        timeStamp_old = -1
+        while not q.empty():
+            timeStamp_old = q.get_nowait()
+
+        now = datetime.now()
+        timestamp_now = now.timestamp()
+        if (timeStamp_old > -1) and ((timestamp_now - timeStamp_old) < 3):
+            print("send request too fast")
+            q.put_nowait(timeStamp_old)
+            return None
 
-        self.current_request = req
         bs = bytes([req.cmd])
         if req.body is not None:
             bs += req.body
 
         # print(str(req.cmd) + str(req.body))
-        await asyncio.wait_for(self.client.write_gatt_char(self.cmd_char, bs, response=False), 0.1)
+        try:
+            await sensor_utils.async_call(
+                self.client.write_gatt_char(self.cmd_char, bs),
+                1,
+                runloop=self.gforce_event_loop,
+            )
+        except Exception as e:
+            self.responses[req.cmd] = None
+            return None
 
         if not req.has_res:
-            self.current_request = None
+            self.responses[req.cmd] = None
             return None
 
         try:
-            ret = await asyncio.wait_for(q.get(), 0.5)
-            self.current_request = None
-            self.responses[req.cmd] = None
+            ret = await asyncio.wait_for(q.get(), 2)
+            now = datetime.now()
+            timestamp_now = now.timestamp()
+            q.put_nowait(timestamp_now)
             return ret
         except Exception as e:
-            self.current_request = None
             self.responses[req.cmd] = None
             return None

sensor/sensor_data.py

@@ -41,10 +41,12 @@ class DataType(IntEnum):
     NTF_EMG = 0x8  # EMG，用于标识肌电传感器采集的数据
     NTF_EEG = 0x10  # EEG，用于标识脑电传感器采集的数据
     NTF_ECG = 0x11  # ECG，用于标识心电传感器采集的数据
-    NTF_IMPEDANCE = (0x12,)  # 阻抗数据
-    NTF_IMU = (0x13,)  # 包含ACC和GYRO数据
-    NTF_ADS = (0x14,)  # 无单位ads数据
+    NTF_IMPEDANCE = 0x12  # 阻抗数据
+    NTF_IMU = 0x13  # 包含ACC和GYRO数据
+    NTF_ADS = 0x14  # 无单位ads数据
     NTF_BRTH = 0x15  # 呼吸，用于标识呼吸传感器采集的数据
+    NTF_IMPEDANCE_EXT = 0x16  # 阻抗数据扩展
+    NTF_DATA_TYPE_MAX = 0x17
 
 
 # 一次采样的数据，包含多个通道的数据，channal_samples 为一个二维数组, 第一个维度为通道索引，第二个维度为采样索引

sensor/sensor_data_context.py

@@ -61,7 +61,7 @@ class SensorProfileDataCtx:
         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.filter_map = {"FILTER_50HZ": "ON", "FILTER_60HZ": "ON", "FILTER_HPF": "ON", "FILTER_LPF": "ON"}
         self.debugCSVWriter = None
         self.debugCSVPath = None
 
@@ -138,6 +138,9 @@ class SensorProfileDataCtx:
         await self.gForce.set_emg_raw_data_config(config)
 
         await self.gForce.set_package_id(True)
+
+        await self.gForce.set_function_switch(2)
+
         return data.channelCount
 
     async def initEEG(self, packageCount: int) -> int:
@@ -337,10 +340,10 @@ class SensorProfileDataCtx:
         switch = 0
         for filter in self.filter_map.keys():
             value = self.filter_map[filter]
-            if filter == "FILTER_50Hz":
+            if filter == "FILTER_50HZ":
                 if value == "ON":
                     switch |= 1
-            elif filter == "FILTER_60Hz":
+            elif filter == "FILTER_60HZ":
                 if value == "ON":
                     switch |= 2
             elif filter == "FILTER_HPF":
@@ -350,8 +353,9 @@ class SensorProfileDataCtx:
                 if value == "ON":
                     switch |= 8
         try:
-            await self.gForce.set_firmware_filter_switch(switch)
-            # await asyncio.sleep(0.1)
+            ret = await self.gForce.set_firmware_filter_switch(switch)
+            if ret == None:
+                return "ERROR: not success"
             return "OK"
         except Exception as e:
             return "ERROR: " + str(e)
@@ -372,10 +376,8 @@ class SensorProfileDataCtx:
     ####################################################################################
 
     async def process_data(self, buf: Queue[SensorData], sensor, callback):
-        while self._is_running and self._rawDataBuffer.empty():
-            await asyncio.sleep(0.1)
-
-            while self._is_running and not self._rawDataBuffer.empty():
+        while self._is_running:
+            while not self._rawDataBuffer.empty():
                 try:
                     data: bytes = self._rawDataBuffer.get_nowait()
                 except Exception as e:
@@ -385,7 +387,7 @@ class SensorProfileDataCtx:
                     self._processDataPackage(data, buf, sensor)
                 self._rawDataBuffer.task_done()
 
-            while self._is_running and self.isDataTransfering and not buf.empty():
+            if self.isDataTransfering and not buf.empty():
                 sensorData: SensorData = None
                 try:
                     sensorData = buf.get_nowait()
@@ -398,6 +400,8 @@ class SensorProfileDataCtx:
                         print(e)
 
                 buf.task_done()
+            else:
+                await asyncio.sleep(0.01)
 
     def _processDataPackage(self, data: bytes, buf: Queue[SensorData], sensor):
         v = data[0] & 0x7F
@@ -423,6 +427,29 @@ class SensorProfileDataCtx:
 
             self.impedanceData = impedanceData
             self.saturationData = saturationData
+        elif v == DataType.NTF_IMPEDANCE_EXT:
+            offset = 1
+            # packageIndex = ((data[offset + 1] & 0xff) << 8) | (data[offset] & 0xff)
+            offset += 2
+
+            impedanceData = []
+            saturationData = []
+
+            dataCount = self._device_info.EegChannelCount + self._device_info.EcgChannelCount
+
+            for index in range(dataCount):
+                impedance = struct.unpack_from("<f", data, offset)[0]
+                offset += 4
+                impedanceData.append(impedance)
+
+            for index in range(dataCount):
+                saturation = struct.unpack_from("<H", data, offset)[0]
+                offset += 2
+                saturationData.append(saturation / 10)  # firmware value range 0 - 1000
+
+            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):
@@ -673,7 +700,21 @@ class SensorProfileDataCtx:
 
         while self._is_running:
             while self._is_running and self._rawDataBuffer.empty():
-                await asyncio.sleep(0.1)
+                if self._is_running and self.isDataTransfering and not buf.empty():
+                    sensorData: SensorData = None
+                    try:
+                        sensorData = buf.get_nowait()
+                    except Exception as e:
+                        break
+                    if not sensor_utils._terminated and sensorData != None and callback != None:
+                        try:
+                            asyncio.get_event_loop().run_in_executor(self.dataPool, callback, sensor, sensorData)
+                        except Exception as e:
+                            print(e)
+
+                    buf.task_done()
+                else:
+                    await asyncio.sleep(0.01)
                 continue
 
             try:
@@ -694,53 +735,39 @@ class SensorProfileDataCtx:
 
                 if self._concatDataBuffer[index] == 0x55:
                     if (index + 1) >= data_size:
-                        index += 1
+                        index = data_size
                         continue
                     n = self._concatDataBuffer[index + 1]
-                    if (index + 1 + n + 1) >= data_size:
-                        index += 1
+                    if (index + 1 + n + 2) >= data_size:
+                        index = data_size
                         continue
-                    crc = self._concatDataBuffer[index + 1 + n + 1]
-                    calc_crc = sensor_utils.calc_crc8(self._concatDataBuffer[index + 2 : index + 2 + n])
-                    if crc != calc_crc:
+                    crc16 = (self._concatDataBuffer[index + 1 + n + 2] << 8) | self._concatDataBuffer[index + 1 + n + 1]
+                    calc_crc = sensor_utils.crc16_cal(self._concatDataBuffer[index + 2 : index + 2 + n], n)
+                    if crc16 != calc_crc:
                         index += 1
                         continue
                     if self._is_data_transfering:
                         data_package = bytes(self._concatDataBuffer[index + 2 : index + 2 + n])
                         self._processDataPackage(data_package, buf, sensor)
-                        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 not sensor_utils._terminated and sensorData != None and callback != None:
-                                try:
-                                    asyncio.get_event_loop().run_in_executor(self.dataPool, callback, sensor, sensorData)
-                                except Exception as e:
-                                    print(e)
-
-                            buf.task_done()
-                    last_cut = index = index + 2 + n
-
+                    last_cut = index = index + 2 + n + 1
                 elif self._concatDataBuffer[index] == 0xAA:
                     if (index + 1) >= data_size:
-                        index += 1
+                        index = data_size
                         continue
                     n = self._concatDataBuffer[index + 1]
-                    if (index + 1 + n + 1) >= data_size:
-                        index += 1
+                    if (index + 1 + n + 2) >= data_size:
+                        index = data_size
                         continue
-                    crc = self._concatDataBuffer[index + 1 + n + 1]
-                    calc_crc = sensor_utils.calc_crc8(self._concatDataBuffer[index + 2 : index + 2 + n])
-                    if crc != calc_crc:
+                    crc16 = (self._concatDataBuffer[index + 1 + n + 2] << 8) | self._concatDataBuffer[index + 1 + n + 1]
+                    calc_crc = sensor_utils.crc16_cal(self._concatDataBuffer[index + 2 : index + 2 + n], n)
+                    if crc16 != calc_crc:
                         index += 1
                         continue
                     data_package = bytes(self._concatDataBuffer[index + 2 : index + 2 + n])
-                    if not sensor_utils._terminated:
-                        self.gForce._on_cmd_response(None, data_package)
-                    last_cut = index = index + 2 + n
 
+                    if not sensor_utils._terminated:
+                        await sensor_utils.async_call(self.gForce.async_on_cmd_response(data_package), runloop=sensor._event_loop)
+                    last_cut = index = index + 2 + n + 1
                 else:
                     index += 1
 

sensor/sensor_profile.py

@@ -62,6 +62,8 @@ class SensorProfile:
         self._gforce: GForce = None
         self._data_event_loop: asyncio.AbstractEventLoop = None
         self._data_event_thread: threading.Thread = None
+        self._gforce_event_loop: asyncio.AbstractEventLoop = None
+        self._gforce_event_thread: threading.Thread = None
         self._event_loop: asyncio.AbstractEventLoop = None
         self._event_thread: threading.Thread = None
         self._is_starting = False
@@ -92,6 +94,17 @@ class SensorProfile:
             except Exception as e:
                 pass
 
+        if self._gforce_event_loop != None:
+            try:
+                self._gforce_event_loop.stop()
+                self._gforce_event_loop.close()
+                self._gforce_event_loop = None
+            except Exception as e:
+                pass
+
+        self._is_starting = False
+        self._is_setting_param = False
+
     @property
     def deviceState(self) -> DeviceStateEx:
         """
@@ -215,6 +228,13 @@ class SensorProfile:
         self._on_power_changed = callback
 
     async def _initGforce(self):
+
+        self._gforce_event_loop = asyncio.new_event_loop()
+        self._gforce_event_thread = threading.Thread(target=sensor_utils.start_loop, args=(self._gforce_event_loop,))
+        self._gforce_event_thread.daemon = True
+        self._gforce_event_thread.name = self._detail_device.name + "data event"
+        self._gforce_event_thread.start()
+
         if self._gforce == None:
             if self._adv.service_data.get(SERVICE_GUID) != None:
                 # print("OYM_SERVICE:" + self._detail_device.name)
@@ -223,21 +243,31 @@ class SensorProfile:
                     OYM_CMD_NOTIFY_CHAR_UUID,
                     OYM_DATA_NOTIFY_CHAR_UUID,
                     False,
+                    self._event_loop,
+                    self._gforce_event_loop,
                 )
             elif self._adv.service_data.get(RFSTAR_SERVICE_GUID) != None:
                 # print("RFSTAR_SERVICE:" + self._detail_device.name)
-                self._gforce = GForce(self._detail_device, RFSTAR_CMD_UUID, RFSTAR_DATA_UUID, True)
-                self._data_event_loop = asyncio.new_event_loop()
+                self._gforce = GForce(
+                    self._detail_device, RFSTAR_CMD_UUID, RFSTAR_DATA_UUID, True, self._event_loop, self._gforce_event_loop
+                )
+
             else:
                 print("Invalid device service uuid:" + self._detail_device.name + str(self._adv))
                 return False
 
+        self._data_event_loop = asyncio.new_event_loop()
+        self._data_event_thread = threading.Thread(target=sensor_utils.start_loop, args=(self._data_event_loop,))
+        self._data_event_thread.daemon = True
+        self._data_event_thread.name = self._detail_device.name + "data event"
+        self._data_event_thread.start()
+
         if self._data_ctx == None and self._gforce != None:
             self._data_ctx = SensorProfileDataCtx(self._gforce, self._device.Address, self._raw_data_buf)
         if self._data_ctx.isUniversalStream:
-            async_exec(self._process_universal_data(), self._event_loop)
+            async_exec(self._process_universal_data(), self._data_event_loop)
         else:
-            async_exec(self._process_data(), self._event_loop)
+            async_exec(self._process_data(), self._data_event_loop)
 
     async def _connect(self) -> bool:
         if sensor_utils._terminated:
@@ -249,6 +279,7 @@ class SensorProfile:
             self._event_thread.daemon = True
             self._event_thread.name = self._detail_device.name + "event"
             self._event_thread.start()
+
             self._data_buffer: Queue[SensorData] = Queue()
             self._raw_data_buf: Queue[bytes] = Queue()
 
@@ -269,7 +300,7 @@ class SensorProfile:
             self._set_device_state(DeviceStateEx.Disconnected)
             pass
 
-        await async_call(self._gforce.connect(handle_disconnect, self._raw_data_buf), runloop=self._event_loop)
+        await self._gforce.connect(handle_disconnect, self._raw_data_buf)
 
         if self._gforce != None and self._gforce.client.is_connected:
             self._set_device_state(DeviceStateEx.Connected)
@@ -313,7 +344,7 @@ class SensorProfile:
         if self._data_ctx == None:
             return False
         self._set_device_state(DeviceStateEx.Disconnecting)
-        async_exec(self._gforce.disconnect(), self._event_loop)
+        await self._gforce.disconnect()
         await asyncio.wait_for(self._waitForDisconnect(), sensor_utils._TIMEOUT)
 
         return True
@@ -341,6 +372,7 @@ class SensorProfile:
 
     async def _process_universal_data(self):
         await self._data_ctx.processUniversalData(self._data_buffer, self, self._on_data_callback)
+        print("finished")
 
     async def _startDataNotification(self) -> bool:
         if self.deviceState != DeviceStateEx.Ready:
@@ -353,13 +385,10 @@ class SensorProfile:
         if self._data_ctx.isDataTransfering:
             return True
 
-        if self._data_event_loop == None:
-            self._data_event_loop = asyncio.new_event_loop()
-
         self._raw_data_buf.queue.clear()
         self._data_buffer.queue.clear()
 
-        result = await async_call(self._data_ctx.start_streaming(), runloop=self._event_loop)
+        result = await async_call(self._data_ctx.start_streaming(), runloop=None)
         await asyncio.sleep(0.2)
 
         return result
@@ -413,7 +442,7 @@ class SensorProfile:
         if not self._data_ctx.isDataTransfering:
             return True
 
-        result = await async_call(self._data_ctx.stop_streaming(), runloop=self._event_loop)
+        result = await async_call(self._data_ctx.stop_streaming(), runloop=None)
         return result
 
     def stopDataNotification(self) -> bool:
@@ -553,19 +582,18 @@ class SensorProfile:
         if self.deviceState != DeviceStateEx.Ready:
             result = "Error: Please connect first"
 
-        if key in ["NTF_EMG", "NTF_EEG", "NTF_ECG", "NTF_IMU", "NTF_BRTH"]:
+        if key in ["NTF_EMG", "NTF_EEG", "NTF_ECG", "NTF_IMU", "NTF_BRTH", "NTF_IMPEDANCE"]:
             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 key in ["FILTER_50HZ", "FILTER_60HZ", "FILTER_HPF", "FILTER_LPF"]:
             if value in ["ON", "OFF"]:
                 result = await self._data_ctx.setFilter(key, value)
 
         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:
@@ -581,11 +609,17 @@ class SensorProfile:
         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,
-        )
+        try:
+            self._is_setting_param = True
+            ret = sync_call(
+                self._setParam(key, value),
+                1,
+            )
+            self._is_setting_param = False
+            return ret
+        except Exception as e:
+            self._is_setting_param = False
+            print(e)
 
     async def asyncSetParam(self, key: str, value: str) -> str:
         """
@@ -600,8 +634,14 @@ class SensorProfile:
         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,
-        )
+        try:
+            self._is_setting_param = True
+            ret = await async_call(
+                self._setParam(key, value),
+                1,
+            )
+            self._is_setting_param = False
+            return ret
+        except Exception as e:
+            self._is_setting_param = False
+            print(e)

sensor/sensor_utils.py

@@ -371,3 +371,536 @@ def calc_crc8(data):
         crc8 = crc8Table[crc8]
 
     return crc8
+
+
+def crc16_cal(data, iLen):
+    auchCRCHi = [
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x01,
+        0xC0,
+        0x80,
+        0x41,
+        0x00,
+        0xC1,
+        0x81,
+        0x40,
+    ]
+
+    auchCRCLo = [
+        0x00,
+        0xC0,
+        0xC1,
+        0x01,
+        0xC3,
+        0x03,
+        0x02,
+        0xC2,
+        0xC6,
+        0x06,
+        0x07,
+        0xC7,
+        0x05,
+        0xC5,
+        0xC4,
+        0x04,
+        0xCC,
+        0x0C,
+        0x0D,
+        0xCD,
+        0x0F,
+        0xCF,
+        0xCE,
+        0x0E,
+        0x0A,
+        0xCA,
+        0xCB,
+        0x0B,
+        0xC9,
+        0x09,
+        0x08,
+        0xC8,
+        0xD8,
+        0x18,
+        0x19,
+        0xD9,
+        0x1B,
+        0xDB,
+        0xDA,
+        0x1A,
+        0x1E,
+        0xDE,
+        0xDF,
+        0x1F,
+        0xDD,
+        0x1D,
+        0x1C,
+        0xDC,
+        0x14,
+        0xD4,
+        0xD5,
+        0x15,
+        0xD7,
+        0x17,
+        0x16,
+        0xD6,
+        0xD2,
+        0x12,
+        0x13,
+        0xD3,
+        0x11,
+        0xD1,
+        0xD0,
+        0x10,
+        0xF0,
+        0x30,
+        0x31,
+        0xF1,
+        0x33,
+        0xF3,
+        0xF2,
+        0x32,
+        0x36,
+        0xF6,
+        0xF7,
+        0x37,
+        0xF5,
+        0x35,
+        0x34,
+        0xF4,
+        0x3C,
+        0xFC,
+        0xFD,
+        0x3D,
+        0xFF,
+        0x3F,
+        0x3E,
+        0xFE,
+        0xFA,
+        0x3A,
+        0x3B,
+        0xFB,
+        0x39,
+        0xF9,
+        0xF8,
+        0x38,
+        0x28,
+        0xE8,
+        0xE9,
+        0x29,
+        0xEB,
+        0x2B,
+        0x2A,
+        0xEA,
+        0xEE,
+        0x2E,
+        0x2F,
+        0xEF,
+        0x2D,
+        0xED,
+        0xEC,
+        0x2C,
+        0xE4,
+        0x24,
+        0x25,
+        0xE5,
+        0x27,
+        0xE7,
+        0xE6,
+        0x26,
+        0x22,
+        0xE2,
+        0xE3,
+        0x23,
+        0xE1,
+        0x21,
+        0x20,
+        0xE0,
+        0xA0,
+        0x60,
+        0x61,
+        0xA1,
+        0x63,
+        0xA3,
+        0xA2,
+        0x62,
+        0x66,
+        0xA6,
+        0xA7,
+        0x67,
+        0xA5,
+        0x65,
+        0x64,
+        0xA4,
+        0x6C,
+        0xAC,
+        0xAD,
+        0x6D,
+        0xAF,
+        0x6F,
+        0x6E,
+        0xAE,
+        0xAA,
+        0x6A,
+        0x6B,
+        0xAB,
+        0x69,
+        0xA9,
+        0xA8,
+        0x68,
+        0x78,
+        0xB8,
+        0xB9,
+        0x79,
+        0xBB,
+        0x7B,
+        0x7A,
+        0xBA,
+        0xBE,
+        0x7E,
+        0x7F,
+        0xBF,
+        0x7D,
+        0xBD,
+        0xBC,
+        0x7C,
+        0xB4,
+        0x74,
+        0x75,
+        0xB5,
+        0x77,
+        0xB7,
+        0xB6,
+        0x76,
+        0x72,
+        0xB2,
+        0xB3,
+        0x73,
+        0xB1,
+        0x71,
+        0x70,
+        0xB0,
+        0x50,
+        0x90,
+        0x91,
+        0x51,
+        0x93,
+        0x53,
+        0x52,
+        0x92,
+        0x96,
+        0x56,
+        0x57,
+        0x97,
+        0x55,
+        0x95,
+        0x94,
+        0x54,
+        0x9C,
+        0x5C,
+        0x5D,
+        0x9D,
+        0x5F,
+        0x9F,
+        0x9E,
+        0x5E,
+        0x5A,
+        0x9A,
+        0x9B,
+        0x5B,
+        0x99,
+        0x59,
+        0x58,
+        0x98,
+        0x88,
+        0x48,
+        0x49,
+        0x89,
+        0x4B,
+        0x8B,
+        0x8A,
+        0x4A,
+        0x4E,
+        0x8E,
+        0x8F,
+        0x4F,
+        0x8D,
+        0x4D,
+        0x4C,
+        0x8C,
+        0x44,
+        0x84,
+        0x85,
+        0x45,
+        0x87,
+        0x47,
+        0x46,
+        0x86,
+        0x82,
+        0x42,
+        0x43,
+        0x83,
+        0x41,
+        0x81,
+        0x80,
+        0x40,
+    ]
+
+    uchCRCHi = 0xFF
+    uchCRCLo = 0xFF
+    index = 0
+
+    iLenCount = range(iLen)
+
+    for i in iLenCount:
+        index = uchCRCHi ^ data[i]
+        uchCRCHi = uchCRCLo ^ auchCRCHi[index]
+        uchCRCLo = auchCRCLo[index]
+
+    return (uchCRCHi << 8) | uchCRCLo

{sensor_sdk-0.0.27.dist-info → sensor_sdk-0.0.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sensor-sdk
-Version: 0.0.27
+Version: 0.0.32
 Summary: Python sdk for Synchroni
 Home-page: https://github.com/oymotion/SynchroniSDKPython
 Author: Martin Ye
@@ -378,10 +378,10 @@ result = sensorProfile.setParam("NTF_IMU", "ON")
 result = sensorProfile.setParam("NTF_BRTH", "ON")
 # set BRTH data to ON or OFF, result is "OK" if succeed
 
-result = sensorProfile.setParam("FILTER_50Hz", "ON")
+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")
+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")

sensor_sdk-0.0.32.dist-info/RECORD

@@ -0,0 +1,14 @@
+sensor/__init__.py,sha256=L1VyAP0EDEnJIMeMTzp4iXHSRUUHyHScF_GIl3iYKRI,123
+sensor/gforce.py,sha256=k6nHsNV_IM8ymGYrZXXD3oHC5Ed0qODlvk8W6dhtMMk,26291
+sensor/sensor_controller.py,sha256=cjVOcGaU9_8_eWFamtOpXsqSZMzD7lGU24gC_rsm2FQ,9546
+sensor/sensor_data.py,sha256=RRj5k3F7Cwv_sFvOPN3HqtklntUHFCFMIqzp8QHIhxM,4078
+sensor/sensor_data_context.py,sha256=Y13eTdCKPHAptuMLH8AYozWjxBz2BIEPfcilba5nJX0,31888
+sensor/sensor_device.py,sha256=eO1vaqjxCc2UCPBoKXqlk6o498uRyWt6IYs7r7wXSD0,3042
+sensor/sensor_profile.py,sha256=cCAw8jDSp-EN7eznLhrbJo6dFhOLIOfgTunj47e3qT0,22671
+sensor/sensor_utils.py,sha256=Laj9rJG_6e7mfrXBlw5_NKJC93mOKogati_YQso11Tw,15043
+sensor_sdk-0.0.32.dist-info/LICENSE.txt,sha256=8CSivOpub3IuXODTyqBRI91AxouJZk02YrcKuOAkWu8,1111
+sensor_sdk-0.0.32.dist-info/METADATA,sha256=Os3_yXfiRlJJRSBo9BBULzDpez7sVughbflcN2u2-Ic,9821
+sensor_sdk-0.0.32.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+sensor_sdk-0.0.32.dist-info/top_level.txt,sha256=Ftq49B6bH0Ffdc7c8LkcyakHo6lsg_snlBbpEUoILSk,7
+sensor_sdk-0.0.32.dist-info/zip-safe,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
+sensor_sdk-0.0.32.dist-info/RECORD,,

{sensor_sdk-0.0.27.dist-info → sensor_sdk-0.0.32.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

sensor_sdk-0.0.27.dist-info/RECORD

@@ -1,14 +0,0 @@
-sensor/__init__.py,sha256=L1VyAP0EDEnJIMeMTzp4iXHSRUUHyHScF_GIl3iYKRI,123
-sensor/gforce.py,sha256=0Jpou51yJxg7B8NjFG_A1j43Rtj95rk8YDDI2FEStR4,26892
-sensor/sensor_controller.py,sha256=cjVOcGaU9_8_eWFamtOpXsqSZMzD7lGU24gC_rsm2FQ,9546
-sensor/sensor_data.py,sha256=vKreLHZs7WbQcnfqHiLLfHQ3cCmvD1K2xl2WUQg8vv0,4005
-sensor/sensor_data_context.py,sha256=3EaCXuLNLQ7OgU2FkpbM5nQvhVyhA68cuw-yX_LpA78,30832
-sensor/sensor_device.py,sha256=eO1vaqjxCc2UCPBoKXqlk6o498uRyWt6IYs7r7wXSD0,3042
-sensor/sensor_profile.py,sha256=sLkOautCTfV-SdOhLXEcZwmjBk2lGx11-JKnkOPP2NM,21176
-sensor/sensor_utils.py,sha256=7JIZF6uhOcHuAPXwwrQi5FwGU5BVLc6Aml-n9QXzupM,6998
-sensor_sdk-0.0.27.dist-info/LICENSE.txt,sha256=8CSivOpub3IuXODTyqBRI91AxouJZk02YrcKuOAkWu8,1111
-sensor_sdk-0.0.27.dist-info/METADATA,sha256=Ut2upEYe7-oFiyEtLeL6Ft65RSTC7Vm5lN3ddTZ8lqU,9821
-sensor_sdk-0.0.27.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-sensor_sdk-0.0.27.dist-info/top_level.txt,sha256=Ftq49B6bH0Ffdc7c8LkcyakHo6lsg_snlBbpEUoILSk,7
-sensor_sdk-0.0.27.dist-info/zip-safe,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-sensor_sdk-0.0.27.dist-info/RECORD,,