sensor-sdk 0.2.2__tar.gz → 0.2.4__tar.gz

{sensor_sdk-0.2.2/sensor_sdk.egg-info → sensor_sdk-0.2.4}/PKG-INFO

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

{sensor_sdk-0.2.2 → sensor_sdk-0.2.4}/sensor/bleak_process.py

@@ -30,16 +30,6 @@ _MAX_RECONNECT_ATTEMPTS = 5
 _RECONNECT_DELAY_SECONDS = 1.0
 
 
-def _is_core_bluetooth(client) -> bool:
-    """判断 bleak 当前是否使用 macOS CoreBluetooth 后端。"""
-    if client is None:
-        return False
-    backend = getattr(client, "_backend", None)
-    if backend is None:
-        return False
-    return "corebluetooth" in type(backend).__module__.lower()
-
-
 def _extract_mac(_device: bleak.BLEDevice, adv: AdvertisementData) -> str:
 
     mac = None
@@ -108,7 +98,6 @@ class BleakProcess(multiprocessing.Process):
         self._data_tasks: dict = {}       # mac -> asyncio.Task
         self._battery_tasks: dict = {}    # mac -> asyncio.Task
         self._reconnect_info: dict = {}   # mac -> {cmd, attempts, task, normal_disconnect}
-        self._restore_info: dict = {}     # mac -> {package_sample_count, power_refresh_interval, streaming}
         self._main_event_loop = None      # BleakProcess 主事件循环
 
         # Per-device event loops and threads
@@ -1352,26 +1341,15 @@ class BleakProcess(multiprocessing.Process):
 
         if needs_restart or oym_needs_subscribe:
             try:
-                is_oym = ctx.getChipType() == BLEChipType.OYM
-                # macOS CoreBluetooth 在流传输中 stop_notify 容易导致设备断开，
-                # 因此 OYM 设备在 CoreBluetooth 后端上直接更新订阅掩码，不启停通知。
-                oym_skip_stop_start = is_oym and _is_core_bluetooth(ctx.gForce.client)
-                if oym_skip_stop_start:
-                    SdkLog.d(_TAG, f"OYM CoreBluetooth: skip stop/start, set subscription directly for {device_mac}")
-                if was_streaming and not oym_skip_stop_start:
+                if was_streaming:
                     await ctx.stop_streaming()
-                if oym_needs_subscribe and is_oym:
+                if oym_needs_subscribe and ctx.getChipType() == BLEChipType.OYM:
                     await ctx.gForce.set_subscription(ctx.notifyDataFlag)
-                if was_streaming and not oym_skip_stop_start:
+                if was_streaming:
                     await ctx.start_streaming()
             except Exception as e:
-                err_msg = str(e)
                 SdkLog.exception(_TAG, f"_do_set_param restart stream failed: {device_mac}")
-                result = "ERROR: restart stream fail: " + err_msg
-                # 如果是因为设备已经断开，直接触发自动重连
-                if "disconnected" in err_msg.lower() or "not connected" in err_msg.lower():
-                    SdkLog.w(_TAG, f"Device disconnected during setParam restart, scheduling reconnect for {device_mac}")
-                    self._schedule_reconnect(device_mac)
+                result = "ERROR: restart stream fail: " + str(e)
 
         if key == "DEBUG_LOG_PATH":
             try:

{sensor_sdk-0.2.2 → sensor_sdk-0.2.4}/sensor/sensor_data_context.py

@@ -714,8 +714,10 @@ class SensorProfileDataCtx:
             data.clear()
             self.sensorDatas[SensorDataType.DATA_TYPE_EULER] = data
 
-        # EEG + OYM 设备默认不订阅 IMU
-        if not (self._chip_type == BLEChipType.OYM and self.hasEEG()):
+        # EEG + OYM 设备默认不订阅 IMU；带 PPG 的设备保留
+        if not (self._chip_type == BLEChipType.OYM
+                and self.hasEEG()
+                and not self.hasPPG()):
             self.notifyDataFlag |= DataSubscription.DNF_IMU
         if self._device_info is not None:
             self._device_info.AccChannelCount = 3
@@ -872,8 +874,10 @@ class SensorProfileDataCtx:
             self._device_info = info
             await self.initDataTransfer(True)
 
-            # EEG + OYM 设备默认关闭 IMU
-            if self._chip_type == BLEChipType.OYM and self.hasEEG():
+            # EEG + OYM 设备默认关闭 IMU；带 PPG 的设备保留 IMU 默认开启
+            if (self._chip_type == BLEChipType.OYM
+                    and self.hasEEG()
+                    and not self.hasPPG()):
                 self.notify_map["NTF_IMU"] = "OFF"
                 self.notify_map["NTF_GFORCE_ACC"] = "OFF"
                 self.notify_map["NTF_GFORCE_GYRO"] = "OFF"
@@ -1292,7 +1296,11 @@ class SensorProfileDataCtx:
         if sensor_data is None or sensor_data.sampleRate <= 0:
             return True
 
-        self.checkReadSamples(data, sensor_data, 0, -1)
+        res = self.checkReadSamples(data, sensor_data, 0, -1, on_error_callback)
+        if res == ReadSamplesResult.Error:
+            return False
+        if res == ReadSamplesResult.Repeated:
+            return True
         sampleInterval = 1000.0 / sensor_data.sampleRate
         lastSampleIndex = sensor_data.lastPackageCounter * sensor_data.packageSampleCount
         sensor_data.channelSamples = []
@@ -1345,7 +1353,11 @@ class SensorProfileDataCtx:
             return False
 
         sensor_data = self.sensorDatas[SensorDataType.DATA_TYPE_IMPEDANCE]
-        self.checkReadSamples(data, sensor_data, 0, -1, on_error_callback)
+        res = self.checkReadSamples(data, sensor_data, 0, -1, on_error_callback)
+        if res == ReadSamplesResult.Error:
+            return False
+        if res == ReadSamplesResult.Repeated:
+            return True
         sampleInterval = 1000.0 / sensor_data.sampleRate if sensor_data.sampleRate > 0 else 0
 
         for index in range(channelCount):

{sensor_sdk-0.2.2 → sensor_sdk-0.2.4}/sensor/sensor_profile.py

@@ -93,11 +93,6 @@ class SensorProfile:
         self._device_info: Optional[DeviceInfo] = None
         self._chip_type: BLEChipType = BLEChipType.Unknown
 
-        # 异常断开后自动恢复流状态所需信息
-        self._last_init_args: Optional[tuple] = None  # (packageSampleCount, powerRefreshInterval)
-        self._was_streaming_before_disconnect = False
-        self._auto_restoring = False
-
         # 用于在独立线程中执行用户回调，避免阻塞 BLE/数据解析线程
         # onDataCallback 使用单线程池，保证数据回调严格按到达顺序执行
         self._callback_executor = ThreadPoolExecutor(max_workers=4)
@@ -227,8 +222,7 @@ class SensorProfile:
         return self._device_state
 
     def _set_device_state(self, newState: DeviceStateEx):
-        old_state = self._device_state
-        if old_state != newState:
+        if self._device_state != newState:
             self._device_state = newState
             if newState == DeviceStateEx.Disconnected:
                 self._has_inited = False
@@ -241,33 +235,6 @@ class SensorProfile:
                     SdkLog.e(_TAG, f"Error occurred while processing state change: {e}")
                     raise RuntimeError("Set device state %s fail: %s" % (self.BLEDevice.Name , e))
 
-            # 异常断开后重连成功，自动恢复 init + 数据流
-            if (newState == DeviceStateEx.Connected
-                    and old_state == DeviceStateEx.Disconnected
-                    and self._last_init_args is not None
-                    and self._was_streaming_before_disconnect
-                    and not self._auto_restoring):
-                SdkLog.i(_TAG, f"Auto-restoring stream state for {self._device_mac}")
-                threading.Thread(target=self._auto_restore, daemon=True).start()
-
-    def _auto_restore(self):
-        """在异常断开后自动恢复 init 和数据流。"""
-        if self._auto_restoring:
-            return
-        self._auto_restoring = True
-        try:
-            package_sample_count, power_refresh_interval = self._last_init_args
-            SdkLog.i(_TAG, f"Auto-restore init for {self._device_mac}")
-            if self.init(package_sample_count, power_refresh_interval):
-                SdkLog.i(_TAG, f"Auto-restore start data notification for {self._device_mac}")
-                self.startDataNotification()
-            else:
-                SdkLog.w(_TAG, f"Auto-restore init failed for {self._device_mac}")
-        except Exception as e:
-            SdkLog.exception(_TAG, f"Auto-restore failed for {self._device_mac}: {e}")
-        finally:
-            self._auto_restoring = False
-
     @property
     def hasInited(self) -> bool:
 

{sensor_sdk-0.2.2 → sensor_sdk-0.2.4/sensor_sdk.egg-info}/PKG-INFO

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

{sensor_sdk-0.2.2 → sensor_sdk-0.2.4}/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.2.2",
+    version="0.2.4",
     description="Python sdk for Synchroni",
     long_description=long_description,
     long_description_content_type="text/markdown",