sensor-sdk 0.0.16__tar.gz → 0.0.18__tar.gz

{sensor-sdk-0.0.16 → sensor-sdk-0.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sensor-sdk
-Version: 0.0.16
+Version: 0.0.18
 Summary: Python sdk for Synchroni
 Home-page: https://github.com/oymotion/SynchroniSDKPython
 Author: Martin Ye
@@ -92,10 +92,10 @@ isScanning = SensorControllerInstance.isScanning
 
 ### 5. Check if bluetooth is enabled
 
-Use `property isEnabled: bool` to check if bluetooth is enabled
+Use `property isEnable: bool` to check if bluetooth is enable
 
 ```python
-isEnabled = SensorControllerInstance.isEnabled
+isEnable = SensorControllerInstance.isEnable
 ```
 
 ### 6. Create SensorProfile

{sensor-sdk-0.0.16 → sensor-sdk-0.0.18}/README.md

@@ -81,10 +81,10 @@ isScanning = SensorControllerInstance.isScanning
 
 ### 5. Check if bluetooth is enabled
 
-Use `property isEnabled: bool` to check if bluetooth is enabled
+Use `property isEnable: bool` to check if bluetooth is enable
 
 ```python
-isEnabled = SensorControllerInstance.isEnabled
+isEnable = SensorControllerInstance.isEnable
 ```
 
 ### 6. Create SensorProfile

{sensor-sdk-0.0.16 → sensor-sdk-0.0.18}/sensor/gforce.py

@@ -16,7 +16,7 @@ from bleak import (
     BleakGATTCharacteristic,
 )
 
-from sensor import utils
+from sensor import sensor_utils
 
 
 @dataclass
@@ -393,7 +393,7 @@ class GForce:
         self._raw_data_buf = buf
 
         try:
-            await asyncio.wait_for(client.connect(), utils._TIMEOUT)
+            await asyncio.wait_for(client.connect(), sensor_utils._TIMEOUT)
         except Exception as e:
             return
 
@@ -404,12 +404,12 @@ class GForce:
             if not self._is_universal_stream:
                 await asyncio.wait_for(
                     client.start_notify(self.cmd_char, self._on_cmd_response),
-                    utils._TIMEOUT,
+                    sensor_utils._TIMEOUT,
                 )
             else:
                 await asyncio.wait_for(
                     client.start_notify(self.data_char, self._on_universal_response),
-                    utils._TIMEOUT,
+                    sensor_utils._TIMEOUT,
                 )
         except Exception as e:
             return
@@ -859,17 +859,17 @@ class GForce:
                 self.data_char,
                 lambda _, data: self._on_data_response(q, data),
             ),
-            utils._TIMEOUT,
+            sensor_utils._TIMEOUT,
         )
 
     async def stop_streaming(self):
         exceptions = []
         # try:
-        #     await asyncio.wait_for(self.set_subscription(DataSubscription.OFF), utils._TIMEOUT)
+        #     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), utils._TIMEOUT)
+            await asyncio.wait_for(self.client.stop_notify(self.data_char), sensor_utils._TIMEOUT)
         except Exception as e:
             exceptions.append(e)
 
@@ -879,7 +879,7 @@ class GForce:
     async def disconnect(self):
         with suppress(asyncio.CancelledError):
             try:
-                await asyncio.wait_for(self.client.disconnect(), utils._TIMEOUT)
+                await asyncio.wait_for(self.client.disconnect(), sensor_utils._TIMEOUT)
             except Exception as e:
                 pass
 
@@ -896,12 +896,12 @@ class GForce:
         bs = bytes([req.cmd])
         if req.body is not None:
             bs += req.body
-        await asyncio.wait_for(self.client.write_gatt_char(self.cmd_char, bs), utils._TIMEOUT)
+        await asyncio.wait_for(self.client.write_gatt_char(self.cmd_char, bs), sensor_utils._TIMEOUT)
 
         if not req.has_res:
             return None
 
         try:
-            return await asyncio.wait_for(q.get(), utils._TIMEOUT)
+            return await asyncio.wait_for(q.get(), sensor_utils._TIMEOUT)
         except Exception as e:
             return None

{sensor-sdk-0.0.16 → sensor-sdk-0.0.18}/sensor/sensor_controller.py

@@ -6,10 +6,10 @@ from typing import Callable, Dict, List, Optional, Tuple
 import bleak
 
 from sensor import sensor_profile
-from sensor import utils
+from sensor import sensor_utils
 from sensor.sensor_profile import DeviceStateEx, SensorProfile
 
-from sensor.utils import async_call, sync_call, async_exec
+from sensor.sensor_utils import async_call, sync_call, async_exec
 from bleak import (
     BleakScanner,
     AdvertisementData,
@@ -52,13 +52,13 @@ class SensorController:
         """
 
     def terminate(self):
-        utils._terminated = True
+        sensor_utils._terminated = True
 
         for sensor in self._sensor_profiles.values():
             if sensor.deviceState == DeviceStateEx.Connected or sensor.deviceState == DeviceStateEx.Ready:
                 sensor._destroy()
 
-        utils.Terminate()
+        sensor_utils.Terminate()
 
     def _match_device(self, _device: bleak.BLEDevice, adv: AdvertisementData):
         if _device.name == None:
@@ -71,7 +71,7 @@ class SensorController:
         return False
 
     @property
-    def isScaning(self) -> bool:
+    def isScanning(self) -> bool:
         """
         检查是否正在扫描。
 
@@ -181,13 +181,13 @@ class SensorController:
         return await async_call(self._async_scan(period))
 
     async def _device_scan_callback(self, devices: List[sensor_profile.BLEDevice]):
-        if self._device_callback:
+        if not sensor_utils._terminated and self._device_callback:
             try:
                 asyncio.get_event_loop().run_in_executor(None, self._device_callback, devices)
             except Exception as e:
                 print(e)
 
-        if self._is_scanning:
+        if not sensor_utils._terminated and self._is_scanning:
             async_exec(self._startScan())
 
     async def _startScan(self) -> bool:

{sensor-sdk-0.0.16 → sensor-sdk-0.0.18}/sensor/sensor_data_context.py

@@ -7,7 +7,7 @@ import struct
 from typing import Deque, List
 from concurrent.futures import ThreadPoolExecutor
 import csv
-from sensor import utils
+from sensor import sensor_utils
 from sensor.gforce import DataSubscription, GForce, SamplingRate
 from sensor.sensor_data import DataType, Sample, SensorData
 
@@ -391,7 +391,7 @@ class SensorProfileDataCtx:
                     sensorData = buf.get_nowait()
                 except Exception as e:
                     break
-                if sensorData != None and callback != None:
+                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:
@@ -459,6 +459,8 @@ class SensorProfileDataCtx:
             offset += 2
             newPackageIndex = packageIndex
             lastPackageIndex = sensorData.lastPackageIndex
+            if sensorData.lastPackageCounter == 0 and sensorData.lastPackageIndex == 0 and packageIndex > 1:
+                return False
 
             if packageIndex < lastPackageIndex:
                 packageIndex += 65536  # 包索引是 U16 类型
@@ -477,7 +479,7 @@ class SensorProfileDataCtx:
                     + str(lostSampleCount)
                 )
                 # print(lostLog)
-                if sensor._event_loop != None and sensor._on_error_callback != None:
+                if not sensor_utils._terminated and sensor._event_loop != None and sensor._on_error_callback != None:
                     try:
                         asyncio.get_event_loop().run_in_executor(None, sensor._on_error_callback, sensor, lostLog)
                     except Exception as e:
@@ -699,7 +701,7 @@ class SensorProfileDataCtx:
                         index += 1
                         continue
                     crc = self._concatDataBuffer[index + 1 + n + 1]
-                    calc_crc = utils.calc_crc8(self._concatDataBuffer[index + 2 : index + 2 + n])
+                    calc_crc = sensor_utils.calc_crc8(self._concatDataBuffer[index + 2 : index + 2 + n])
                     if crc != calc_crc:
                         index += 1
                         continue
@@ -712,7 +714,7 @@ class SensorProfileDataCtx:
                                 sensorData = buf.get_nowait()
                             except Exception as e:
                                 break
-                            if sensorData != None and callback != None:
+                            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:
@@ -730,12 +732,13 @@ class SensorProfileDataCtx:
                         index += 1
                         continue
                     crc = self._concatDataBuffer[index + 1 + n + 1]
-                    calc_crc = utils.calc_crc8(self._concatDataBuffer[index + 2 : index + 2 + n])
+                    calc_crc = sensor_utils.calc_crc8(self._concatDataBuffer[index + 2 : index + 2 + n])
                     if crc != calc_crc:
                         index += 1
                         continue
                     data_package = bytes(self._concatDataBuffer[index + 2 : index + 2 + n])
-                    asyncio.get_event_loop().run_in_executor(None, self.gForce._on_cmd_response, None, data_package)
+                    if not sensor_utils._terminated:
+                        asyncio.get_event_loop().run_in_executor(None, self.gForce._on_cmd_response, None, data_package)
                     last_cut = index = index + 2 + n
 
                 else:

{sensor-sdk-0.0.16 → sensor-sdk-0.0.18}/sensor/sensor_profile.py

@@ -10,7 +10,7 @@ from bleak import (
     BleakClient,
 )
 
-from sensor import utils
+from sensor import sensor_utils
 from sensor.gforce import GForce
 from sensor.sensor_data import SensorData
 import asyncio
@@ -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
+from sensor.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"
@@ -212,7 +212,7 @@ class SensorProfile:
         self._on_power_changed = callback
 
     async def _connect(self) -> bool:
-        if utils._terminated:
+        if sensor_utils._terminated:
             return False
 
         if self._event_loop == None:
@@ -292,7 +292,7 @@ class SensorProfile:
         return await async_call(self._connect())
 
     async def _waitForDisconnect(self) -> bool:
-        while not utils._terminated and self.deviceState != DeviceStateEx.Disconnected:
+        while not sensor_utils._terminated and self.deviceState != DeviceStateEx.Disconnected:
             await asyncio.sleep(1)
         return True
 
@@ -303,7 +303,7 @@ class SensorProfile:
             return False
         self._set_device_state(DeviceStateEx.Disconnecting)
         await self._gforce.disconnect()
-        await asyncio.wait_for(self._waitForDisconnect(), utils._TIMEOUT)
+        await asyncio.wait_for(self._waitForDisconnect(), sensor_utils._TIMEOUT)
 
         return True
 
@@ -393,7 +393,7 @@ class SensorProfile:
 
         result = await self._data_ctx.stop_streaming()
         self._is_starting = False
-        return not result
+        return result
 
     def stopDataNotification(self) -> bool:
         """
@@ -422,12 +422,12 @@ class SensorProfile:
         return await async_call(self._stopDataNotification())
 
     async def _refresh_power(self):
-        while not utils._terminated and self.deviceState == DeviceStateEx.Ready:
+        while not sensor_utils._terminated and self.deviceState == DeviceStateEx.Ready:
             await asyncio.sleep(self._power_interval / 1000)
 
             self._power = await self._gforce.get_battery_level()
 
-            if self._event_loop != None and self._on_power_changed != None:
+            if not sensor_utils._terminated and self._event_loop != None and self._on_power_changed != None:
                 try:
                     asyncio.get_event_loop().run_in_executor(None, self._on_power_changed, self, self._power)
                 except Exception as e:
@@ -443,7 +443,7 @@ class SensorProfile:
 
         if await self._data_ctx.init(packageSampleCount):
             self._power_interval = powerRefreshInterval
-            utils.async_exec(self._refresh_power())
+            sensor_utils.async_exec(self._refresh_power())
 
         return self._data_ctx.hasInit()
 

sensor-sdk-0.0.16/sensor/utils.py → sensor-sdk-0.0.18/sensor/sensor_utils.py

@@ -25,10 +25,18 @@ def checkRunLoop():
             _event_thread.daemon = True
             _event_thread.name = "SensorController event"
             _event_thread.start()
+            time.sleep(0.1)
 
 
 def Terminate():
-    global _runloop, _needCloseRunloop, _event_thread
+    global _runloop, _needCloseRunloop, _event_thread, _terminated
+    _terminated = True
+    try:
+        for task in asyncio.all_tasks():
+            task.cancel()
+    except Exception as e:
+        pass
+
     if _needCloseRunloop:
         try:
             _runloop.stop()
@@ -85,6 +93,7 @@ async def async_call(function, _timeout=_TIMEOUT) -> any:
 
 
 def start_loop(loop: asyncio.BaseEventLoop):
+    # asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
     asyncio.set_event_loop(loop)
     loop.run_forever()
 

{sensor-sdk-0.0.16 → sensor-sdk-0.0.18}/sensor_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sensor-sdk
-Version: 0.0.16
+Version: 0.0.18
 Summary: Python sdk for Synchroni
 Home-page: https://github.com/oymotion/SynchroniSDKPython
 Author: Martin Ye
@@ -92,10 +92,10 @@ isScanning = SensorControllerInstance.isScanning
 
 ### 5. Check if bluetooth is enabled
 
-Use `property isEnabled: bool` to check if bluetooth is enabled
+Use `property isEnable: bool` to check if bluetooth is enable
 
 ```python
-isEnabled = SensorControllerInstance.isEnabled
+isEnable = SensorControllerInstance.isEnable
 ```
 
 ### 6. Create SensorProfile

{sensor-sdk-0.0.16 → sensor-sdk-0.0.18}/sensor_sdk.egg-info/SOURCES.txt

@@ -8,7 +8,7 @@ sensor/sensor_data.py
 sensor/sensor_data_context.py
 sensor/sensor_device.py
 sensor/sensor_profile.py
-sensor/utils.py
+sensor/sensor_utils.py
 sensor_sdk.egg-info/PKG-INFO
 sensor_sdk.egg-info/SOURCES.txt
 sensor_sdk.egg-info/dependency_links.txt

{sensor-sdk-0.0.16 → sensor-sdk-0.0.18}/setup.py

@@ -8,7 +8,7 @@ with open(os.path.join(this_directory, "README.md"), "r", encoding="utf-8") as f
 
 setup(
     name="sensor-sdk",
-    version="0.0.16",
+    version="0.0.18",
     description="Python sdk for Synchroni",
     long_description=long_description,
     long_description_content_type="text/markdown",