sensor-sdk 0.1.1__tar.gz → 0.1.2__tar.gz

{sensor_sdk-0.1.1 → sensor_sdk-0.1.2}/PKG-INFO

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

{sensor_sdk-0.1.1 → sensor_sdk-0.1.2}/sensor/bleak_host.py

@@ -51,6 +51,7 @@ class BleakHost:
     def stop(self):
         if not self._started:
             return
+        self._should_exit = True
         try:
             self._cmd_queue.put({"type": "terminate"})
         except Exception as e:
@@ -60,9 +61,22 @@ class BleakHost:
             self._bleak_process.join(timeout=5)
         if self._bleak_process.is_alive():
             self._bleak_process.terminate()
+            self._bleak_process.join(timeout=2)
 
         self._stop_result_loop()
         self._stop_cmd_loop()
+
+        try:
+            self._cmd_queue.close()
+            self._result_queue.close()
+        except Exception as e:
+            SdkLog.exception(_TAG, "Error closing queues")
+
+        try:
+            self._bleak_process.close()
+        except Exception as e:
+            SdkLog.exception(_TAG, "Error closing bleak process")
+
         self._started = False
 
     # ------------------------------------------------------------------
@@ -77,9 +91,23 @@ class BleakHost:
         result_thread.start()
         self._result_loop = result_loop
         self._result_thread = result_thread
-        asyncio.run_coroutine_threadsafe(self._consume_results(), result_loop)
+
+        def _create_consume_task():
+            self._consume_task = result_loop.create_task(self._consume_results())
+
+        result_loop.call_soon_threadsafe(_create_consume_task)
 
     def _stop_result_loop(self):
+        task = getattr(self, '_consume_task', None)
+        if task is not None:
+            try:
+                loop = task.get_loop()
+                if loop is not None and not loop.is_closed():
+                    loop.call_soon_threadsafe(task.cancel)
+            except Exception as e:
+                SdkLog.exception(_TAG, "Unexpected error")
+        self._consume_task = None
+
         loop = getattr(self, '_result_loop', None)
         thread = getattr(self, '_result_thread', None)
         if loop is not None and not loop.is_closed():
@@ -97,10 +125,10 @@ class BleakHost:
 
     async def _consume_results(self):
 
-        while True:
+        while not getattr(self, '_should_exit', False):
             try:
                 msg = await asyncio.get_event_loop().run_in_executor(
-                    None, self._result_queue.get, True, 0.5
+                    None, self._result_queue.get, True, 0.1
                 )
             except queue.Empty:
                 continue

{sensor_sdk-0.1.1 → sensor_sdk-0.1.2}/sensor/bleak_process.py

@@ -261,6 +261,17 @@ class BleakProcess(multiprocessing.Process):
 
     def _stop_device_loops(self, device_mac: str):
 
+        # Cancel battery task if still running in event_loop
+        if device_mac in self._battery_tasks:
+            task = self._battery_tasks.pop(device_mac, None)
+            if task:
+                try:
+                    loop = self._event_loops.get(device_mac)
+                    if loop and not loop.is_closed():
+                        loop.call_soon_threadsafe(task.cancel)
+                except Exception as e:
+                    SdkLog.exception(_TAG, "Unexpected error")
+
         # Cancel data task first if still running in data_event_loop
         if device_mac in self._data_tasks:
             task = self._data_tasks.pop(device_mac, None)
@@ -684,7 +695,12 @@ class BleakProcess(multiprocessing.Process):
 
             # Cancel battery task
             if device_mac in self._battery_tasks:
-                self._battery_tasks.pop(device_mac, None)
+                task = self._battery_tasks.pop(device_mac, None)
+                if task is not None:
+                    try:
+                        task.cancel()
+                    except Exception as e:
+                        SdkLog.exception(_TAG, "Unexpected error")
 
             # Stop streaming and optionally disconnect client
             if disconnect_client and device_mac in self._gforces:
@@ -1119,10 +1135,12 @@ class BleakProcess(multiprocessing.Process):
                 if key == "NTF_PPG_RAW":
                     map_key = "NTF_PPG"
 
-                # 老版本 EMG 设备上 Gesture 与 EMG 互斥，与 initGesture 逻辑保持一致
+                # 老版本 EMG 设备上 Gesture 与 EMG 互斥，自动切换
                 if not ctx.isNewEMG:
                     if map_key == "NTF_GEST" and value == "ON" and ctx.notify_map.get("NTF_EMG") == "ON":
-                        result = "Error: NTF_GEST conflicts with NTF_EMG on legacy EMG device"
+                        ctx.notify_map["NTF_EMG"] = "OFF"
+                        ctx.notify_map[map_key] = value
+                        result = "OK"
                     elif map_key == "NTF_EMG" and value == "ON" and ctx.notify_map.get("NTF_GEST") == "ON":
                         ctx.notify_map["NTF_GEST"] = "OFF"
                         ctx.notify_map[map_key] = value
@@ -1165,14 +1183,12 @@ class BleakProcess(multiprocessing.Process):
             try:
                 if value == "False" or value == "":
                     SdkLog.set_log_path("")
-                    result = "OK"
                 elif value == "True":
                     path = SdkLog.get_default_log_path()
                     SdkLog.set_log_path(path)
-                    result = path
                 else:
                     SdkLog.set_log_path(value)
-                    result = value
+                result = "OK"
             except Exception as e:
                 SdkLog.exception(_TAG, f"_do_set_param DEBUG_LOG_PATH failed: {e}")
                 result = "ERROR: " + str(e)
@@ -1182,16 +1198,14 @@ class BleakProcess(multiprocessing.Process):
                 if value == "False" or value == "":
                     SdkLog.set_data_log_enabled(False)
                     await ctx.setDebugCSV("")
-                    result = "OK"
                 elif value == "True":
                     SdkLog.set_data_log_enabled(True)
                     path = SdkLog.get_default_data_log_path()
-                    csv_result = await ctx.setDebugCSV(path)
-                    result = path if csv_result == "OK" else csv_result
+                    await ctx.setDebugCSV(path)
                 else:
                     SdkLog.set_data_log_enabled(True)
-                    csv_result = await ctx.setDebugCSV(value)
-                    result = value if csv_result == "OK" else csv_result
+                    await ctx.setDebugCSV(value)
+                result = "OK"
             except Exception as e:
                 SdkLog.exception(_TAG, f"_do_set_param setDebugCSV failed: {device_mac} path={value}")
                 result = "ERROR: " + str(e)

{sensor_sdk-0.1.1 → sensor_sdk-0.1.2}/sensor/gforce.py

@@ -764,6 +764,7 @@ class GForce:
                 has_res=True,
             )
         )
+        return self._check_set_response(ret, "set_motor")
 
     async def set_led(self, switchStatus):
         body = [switchStatus == True]
@@ -775,6 +776,7 @@ class GForce:
                 has_res=True,
             )
         )
+        return self._check_set_response(ret, "set_led")
 
     async def set_package_id(self, switchStatus):
         body = [switchStatus == True]
@@ -786,6 +788,7 @@ class GForce:
                 has_res=True,
             )
         )
+        return self._check_set_response(ret, "set_package_id")
 
     async def set_log_level(self, logLevel):
         body = [0xFF & logLevel]
@@ -797,8 +800,9 @@ class GForce:
                 has_res=True,
             )
         )
+        return self._check_set_response(ret, "set_log_level")
 
-    async def set_function_switch(self, funcSwitch)-> bool:
+    async def set_function_switch(self, funcSwitch):
         body = [0xFF & funcSwitch]
         body = bytes(body)
         ret = await self._send_request(
@@ -808,11 +812,9 @@ class GForce:
                 has_res=True,
             )
         )
-        if (len(ret) > 0 and ret[0] == 0):
-            return True
-        return False
+        return self._check_set_response(ret, "set_function_switch")
 
-    async def set_neucir_app_control(self, open, close, stop)-> bool:
+    async def set_neucir_app_control(self, open, close, stop):
         if stop:
             body = [4]
         elif open:
@@ -828,11 +830,9 @@ class GForce:
                 has_res=True,
             )
         )
-        if (len(ret) > 0 and ret[0] == 0):
-            return True
-        return False
+        return self._check_set_response(ret, "set_neucir_app_control")
 
-    async def set_neucir_mode(self, mode)-> bool:
+    async def set_neucir_mode(self, mode):
         body = [0x90]
 
         body = bytes(body)
@@ -843,14 +843,13 @@ class GForce:
                 has_res=True,
             )
         )
-        if (len(ret) > 0 and ret[0] == 0):
-            return True
-        return False
+        return self._check_set_response(ret, "set_neucir_mode")
     
     async def set_firmware_filter_switch(self, switchStatus: int):
         body = [0xFF & switchStatus]
         body = bytes(body)
-        await self._send_request(Request(cmd=Command.CMD_SET_FRIMWARE_FILTER_SWITCH, body=body, has_res=True))
+        ret = await self._send_request(Request(cmd=Command.CMD_SET_FRIMWARE_FILTER_SWITCH, body=body, has_res=True))
+        return self._check_set_response(ret, "set_firmware_filter_switch")
 
     async def get_firmware_filter_switch(self):
         buf = await self._send_request(Request(cmd=Command.CMD_GET_FRIMWARE_FILTER_SWITCH, has_res=True))
@@ -867,6 +866,7 @@ class GForce:
         )
 
         # print('set_emg_raw_data_config returned:', ret)
+        return self._check_set_response(ret, "set_emg_raw_data_config")
 
         self.resolution = cfg.resolution
 
@@ -925,7 +925,7 @@ class GForce:
         )
         return PpgRawDataConfig.from_bytes(buf)
 
-    async def set_ppg_raw_data_config(self, cfg: PpgRawDataConfig) -> bool:
+    async def set_ppg_raw_data_config(self, cfg: PpgRawDataConfig):
         body = cfg.to_bytes()
         ret = await self._send_request(
             Request(
@@ -934,7 +934,7 @@ class GForce:
                 has_res=True,
             )
         )
-        return ret is not None and len(ret) > 0 and ret[0] == 0
+        return self._check_set_response(ret, "set_ppg_raw_data_config")
 
     async def get_imu_raw_data_config(self) -> ImuRawDataConfig:
         buf = await self._send_request(
@@ -945,7 +945,7 @@ class GForce:
         )
         return ImuRawDataConfig.from_bytes(buf)
 
-    async def set_imu_raw_data_config(self, cfg: ImuRawDataConfig) -> bool:
+    async def set_imu_raw_data_config(self, cfg: ImuRawDataConfig):
         body = cfg.to_bytes()
         ret = await self._send_request(
             Request(
@@ -954,7 +954,7 @@ class GForce:
                 has_res=True,
             )
         )
-        return ret is not None and len(ret) > 0 and ret[0] == 0
+        return self._check_set_response(ret, "set_imu_raw_data_config")
 
     async def get_imu_cap_data_config(self) -> Optional[tuple]:
         """
@@ -999,13 +999,24 @@ class GForce:
             0xFF & (subscription >> 24),
         ]
         body = bytes(body)
-        await self._send_request(
+        ret = await self._send_request(
             Request(
                 cmd=Command.SET_DATA_NOTIF_SWITCH,
                 body=body,
                 has_res=True,
             )
         )
+        return self._check_set_response(ret, "set_subscription")
+
+    def _check_set_response(self, ret: Optional[bytes], name: str) -> bytes:
+        # """检查 set_xxxx 命令的响应，失败时抛出 RuntimeError。"""
+        # if ret is None:
+        #     raise RuntimeError(f"{name} failed: no response")
+        # if len(ret) == 0:
+        #     raise RuntimeError(f"{name} failed: empty response")
+        # if ret[0] != 0:
+        #     raise RuntimeError(f"{name} failed: error code {ret[0]}")
+        return ret
 
     async def start_streaming(self, q: queue.Queue):
         return await self._run_in_gforce_loop(self._do_start_streaming(q))

{sensor_sdk-0.1.1 → sensor_sdk-0.1.2}/sensor/sensor_controller.py

@@ -69,6 +69,9 @@ class SensorController:
         pass
 
     def terminate(self):
+        if getattr(self, '_terminated', False):
+            return
+        self._terminated = True
         SdkLog.controller(_TAG, "terminate called")
         sensor_utils._terminated = True
 

{sensor_sdk-0.1.1 → sensor_sdk-0.1.2}/sensor/sensor_data_context.py

@@ -244,7 +244,7 @@ class SensorProfileDataCtx:
         data.channelCount = 8
         data.channelMask = config.channel_mask
         data.minPackageSampleCount = packageCount
-        data.packageSampleCount = 8
+        data.packageSampleCount = config.batch_len
 
         data.clear()
         isNewEMG = True
@@ -297,6 +297,10 @@ class SensorProfileDataCtx:
         self.sensorDatas[SensorDataType.DATA_TYPE_EMG] = data
         self.isNewEMG = isNewEMG
 
+        # 老 EMG 设备不支持 FILTER
+        if not isNewEMG:
+            self.filter_map.clear()
+
         return data.channelCount
 
     
@@ -433,7 +437,7 @@ class SensorProfileDataCtx:
     async def initIMU(self, packageCount: int) -> int:
         SdkLog.d(_TAG, "initIMU(...)")
         IMU_TYPE_QAT6 = 0x0004
-        min_package_sample_count = 2
+        min_package_sample_count = 1
         self.isContainQAT6 = False
 
         if not self.hasIMU():
@@ -797,6 +801,8 @@ class SensorProfileDataCtx:
         return True
 
     async def setFilter(self, filter: str, value: str) -> str:
+        if not self.filter_map:
+            return "ERROR: Filter not supported on this device"
         self.filter_map[filter] = value
         switch = 0
         for filter in self.filter_map.keys():

{sensor_sdk-0.1.1 → sensor_sdk-0.1.2}/sensor_sdk.egg-info/PKG-INFO

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

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