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

sensor/gforce.py

@@ -853,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

@@ -274,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:
@@ -287,12 +290,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 +325,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,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)
-
-                    buf.task_done()
+                        print(e)
+
+                buf.task_done()
 
     def _processDataPackage(self, data: bytes, buf: Queue[SensorData], sensor):
         v = data[0]

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.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sensor-sdk
-Version: 0.0.13
+Version: 0.0.15
 Summary: Python sdk for Synchroni
 Home-page: https://github.com/oymotion/SynchroniSDKPython
 Author: Martin Ye

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.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,,