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

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
 
@@ -340,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":
@@ -427,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):
@@ -712,39 +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)
-                    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:
                         await sensor_utils.async_call(self.gForce.async_on_cmd_response(data_package), runloop=sensor._event_loop)
-                    last_cut = index = index + 2 + n
+                    last_cut = index = index + 2 + n + 1
                 else:
                     index += 1
 

sensor/sensor_profile.py

@@ -582,12 +582,12 @@ 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)
 

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.31.dist-info → sensor_sdk-0.0.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: sensor-sdk
-Version: 0.0.31
+Version: 0.0.32
 Summary: Python sdk for Synchroni
 Home-page: https://github.com/oymotion/SynchroniSDKPython
 Author: Martin Ye
@@ -11,15 +11,6 @@ License-File: LICENSE.txt
 Requires-Dist: numpy
 Requires-Dist: setuptools
 Requires-Dist: bleak
-Dynamic: author
-Dynamic: author-email
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license-file
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
 
 # sensor-sdk
 
@@ -387,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.31.dist-info → sensor_sdk-0.0.32.dist-info}/WHEEL

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

sensor_sdk-0.0.31.dist-info/RECORD

@@ -1,14 +0,0 @@
-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=vKreLHZs7WbQcnfqHiLLfHQ3cCmvD1K2xl2WUQg8vv0,4005
-sensor/sensor_data_context.py,sha256=YGDEbUYElHE8PZLQIcCR08N8Jk3j5UNH2odo43nmba8,30856
-sensor/sensor_device.py,sha256=eO1vaqjxCc2UCPBoKXqlk6o498uRyWt6IYs7r7wXSD0,3042
-sensor/sensor_profile.py,sha256=KDmOQjBM_diG5PDVth9s1ALN-Sd4Y_zpEVkDjW-khSk,22654
-sensor/sensor_utils.py,sha256=7JIZF6uhOcHuAPXwwrQi5FwGU5BVLc6Aml-n9QXzupM,6998
-sensor_sdk-0.0.31.dist-info/licenses/LICENSE.txt,sha256=8CSivOpub3IuXODTyqBRI91AxouJZk02YrcKuOAkWu8,1111
-sensor_sdk-0.0.31.dist-info/METADATA,sha256=Y25zWQWh_rF42spGr1eZf9DDQtQ_fS33vxJNYfHReTQ,10029
-sensor_sdk-0.0.31.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-sensor_sdk-0.0.31.dist-info/top_level.txt,sha256=Ftq49B6bH0Ffdc7c8LkcyakHo6lsg_snlBbpEUoILSk,7
-sensor_sdk-0.0.31.dist-info/zip-safe,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-sensor_sdk-0.0.31.dist-info/RECORD,,