sensor-sdk 0.0.27__tar.gz → 0.0.31__tar.gz

{sensor-sdk-0.0.27 → sensor_sdk-0.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: sensor-sdk
-Version: 0.0.27
+Version: 0.0.31
 Summary: Python sdk for Synchroni
 Home-page: https://github.com/oymotion/SynchroniSDKPython
 Author: Martin Ye
@@ -8,6 +8,18 @@ Author-email: yecq_82@hotmail.com
 Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
 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
 

{sensor-sdk-0.0.27 → sensor_sdk-0.0.31}/sensor/gforce.py

@@ -3,6 +3,7 @@ import queue
 import struct
 from asyncio import Queue
 from contextlib import suppress
+from datetime import datetime
 from dataclasses import dataclass
 from enum import IntEnum
 from typing import Optional, Dict, List
@@ -88,6 +89,7 @@ class Command(IntEnum):
     GET_EMG_RAWDATA_CONFIG = (0x46,)
 
     SET_DATA_NOTIF_SWITCH = (0x4F,)
+    SET_FUNCTION_SWITCH = (0x85,)
 
     CMD_GET_EEG_CONFIG = (0xA0,)
     CMD_SET_EEG_CONFIG = (0xA1,)
@@ -372,12 +374,21 @@ class Response:
 
 
 class GForce:
-    def __init__(self, device: BLEDevice, cmd_char: str, data_char: str, isUniversalStream: bool):
+    def __init__(
+        self,
+        device: BLEDevice,
+        cmd_char: str,
+        data_char: str,
+        isUniversalStream: bool,
+        event_loop: asyncio.AbstractEventLoop,
+        gforce_event_loop: asyncio.AbstractEventLoop,
+    ):
         self.device_name = ""
         self.client = None
+        self.event_loop = event_loop
+        self.gforce_event_loop = gforce_event_loop
         self.cmd_char = cmd_char
         self.data_char = data_char
-        self.current_request: Request = None
         self.responses: Dict[Command, Queue] = {}
         self.resolution = SampleResolution.BITS_8
         self._num_channels = 8
@@ -394,7 +405,7 @@ class GForce:
         self._raw_data_buf = buf
 
         try:
-            await asyncio.wait_for(client.connect(), sensor_utils._TIMEOUT)
+            await sensor_utils.async_call(client.connect(), sensor_utils._TIMEOUT, self.gforce_event_loop)
         except Exception as e:
             return
 
@@ -403,19 +414,22 @@ class GForce:
 
         try:
             if not self._is_universal_stream:
-                await asyncio.wait_for(
+                await sensor_utils.async_call(
                     client.start_notify(self.cmd_char, self._on_cmd_response),
                     sensor_utils._TIMEOUT,
+                    self.gforce_event_loop,
                 )
+
             else:
-                await asyncio.wait_for(
+                await sensor_utils.async_call(
                     client.start_notify(self.data_char, self._on_universal_response),
                     sensor_utils._TIMEOUT,
+                    self.gforce_event_loop,
                 )
         except Exception as e:
             return
 
-    def _on_data_response(self, q: Queue[bytes], bs: bytearray):
+    def _on_data_response(self, q: queue.Queue[bytes], bs: bytearray):
         bs = bytes(bs)
 
         full_packet = []
@@ -444,63 +458,6 @@ class GForce:
             return
 
         q.put_nowait(bytes(full_packet))
-        # data = None
-        # data_type = DataType(full_packet[0])
-        # packet = full_packet[1:]
-        # match data_type:
-        #     case DataType.EMG_ADC:
-        #         data = self._convert_emg_to_raw(packet)
-
-        #     case DataType.ACC:
-        #         data = self._convert_acceleration_to_g(packet)
-
-        #     case DataType.GYO:
-        #         data = self._convert_gyro_to_dps(packet)
-
-        #     case DataType.MAG:
-        #         data = self._convert_magnetometer_to_ut(packet)
-
-        #     case DataType.EULER:
-        #         data = self._convert_euler(packet)
-
-        #     case DataType.QUAT:
-        #         data = self._convert_quaternion(packet)
-
-        #     case DataType.ROTA:
-        #         data = self._convert_rotation_matrix(packet)
-
-        #     case DataType.EMG_GEST:  # It is not supported by the device (?)
-        #         data = self._convert_emg_gesture(packet)
-
-        #     case DataType.HID_MOUSE:  # It is not supported by the device
-        #         pass
-
-        #     case DataType.HID_JOYSTICK:  # It is not supported by the device
-        #         pass
-
-        #     case DataType.PARTIAL:
-        #         pass
-        #     case _:
-        #         raise Exception(
-        #             f"Unknown data type {data_type}, full packet: {full_packet}"
-        #         )
-
-        # q.put_nowait(data)
-
-    # def _convert_emg_to_raw(self, data: bytes) -> np.ndarray[np.integer]:
-    #     match self.resolution:
-    #         case SampleResolution.BITS_8:
-    #             dtype = np.uint8
-
-    #         case SampleResolution.BITS_12:
-    #             dtype = np.uint16
-
-    #         case _:
-    #             raise Exception(f"Unsupported resolution {self.resolution}")
-
-    #     emg_data = np.frombuffer(data, dtype=dtype)
-
-    #     return emg_data.reshape(-1, self._num_channels)
 
     @staticmethod
     def _convert_acceleration_to_g(data: bytes) -> np.ndarray[np.float32]:
@@ -565,6 +522,9 @@ class GForce:
         self._raw_data_buf.put_nowait(bytes(bs))
 
     def _on_cmd_response(self, _: BleakGATTCharacteristic, bs: bytearray):
+        sensor_utils.async_exec(self.async_on_cmd_response(bs), self.event_loop)
+
+    async def async_on_cmd_response(self, bs: bytearray):
         try:
             # print(bytes(bs))
             response = self._parse_response(bytes(bs))
@@ -754,6 +714,17 @@ class GForce:
             )
         )
 
+    async def set_function_switch(self, funcSwitch):
+        body = [0xFF & funcSwitch]
+        body = bytes(body)
+        ret = await self._send_request(
+            Request(
+                cmd=Command.SET_FUNCTION_SWITCH,
+                body=body,
+                has_res=True,
+            )
+        )
+
     async def set_firmware_filter_switch(self, switchStatus: int):
         body = [0xFF & switchStatus]
         body = bytes(body)
@@ -858,22 +829,20 @@ class GForce:
         )
 
     async def start_streaming(self, q: queue.Queue):
-        await asyncio.wait_for(
+        await sensor_utils.async_call(
             self.client.start_notify(
                 self.data_char,
                 lambda _, data: self._on_data_response(q, data),
             ),
             sensor_utils._TIMEOUT,
+            self.gforce_event_loop,
         )
 
     async def stop_streaming(self):
         exceptions = []
-        # try:
-        #     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), sensor_utils._TIMEOUT)
+            await sensor_utils.async_call(self.client.stop_notify(self.data_char), sensor_utils._TIMEOUT, self.gforce_event_loop)
         except Exception as e:
             exceptions.append(e)
 
@@ -883,49 +852,62 @@ class GForce:
     async def disconnect(self):
         with suppress(asyncio.CancelledError):
             try:
-                await asyncio.wait_for(self.client.disconnect(), sensor_utils._TIMEOUT)
+                await sensor_utils.async_call(self.client.disconnect(), sensor_utils._TIMEOUT, self.gforce_event_loop)
             except Exception as e:
                 pass
 
     def _get_response_channel(self, cmd: Command) -> Queue:
         if self.responses.get(cmd) != None:
-            return None
-
-        q = Queue()
-        self.responses[cmd] = q
-        return q
+            return self.responses[cmd]
+        else:
+            q = Queue()
+            self.responses[cmd] = q
+            return q
 
     async def _send_request(self, req: Request) -> Optional[bytes]:
+        return await sensor_utils.async_call(self._send_request_internal(req=req), runloop=self.event_loop)
 
+    async def _send_request_internal(self, req: Request) -> Optional[bytes]:
         q = None
         if req.has_res:
             q = self._get_response_channel(req.cmd)
-            if q == None:
-                # print("duplicate")
-                return None
 
-        while self.current_request != None:
-            # print("wait")
-            await asyncio.sleep(0.1)
+        timeStamp_old = -1
+        while not q.empty():
+            timeStamp_old = q.get_nowait()
+
+        now = datetime.now()
+        timestamp_now = now.timestamp()
+        if (timeStamp_old > -1) and ((timestamp_now - timeStamp_old) < 3):
+            print("send request too fast")
+            q.put_nowait(timeStamp_old)
+            return None
 
-        self.current_request = req
         bs = bytes([req.cmd])
         if req.body is not None:
             bs += req.body
 
         # print(str(req.cmd) + str(req.body))
-        await asyncio.wait_for(self.client.write_gatt_char(self.cmd_char, bs, response=False), 0.1)
+        try:
+            await sensor_utils.async_call(
+                self.client.write_gatt_char(self.cmd_char, bs),
+                1,
+                runloop=self.gforce_event_loop,
+            )
+        except Exception as e:
+            self.responses[req.cmd] = None
+            return None
 
         if not req.has_res:
-            self.current_request = None
+            self.responses[req.cmd] = None
             return None
 
         try:
-            ret = await asyncio.wait_for(q.get(), 0.5)
-            self.current_request = None
-            self.responses[req.cmd] = None
+            ret = await asyncio.wait_for(q.get(), 2)
+            now = datetime.now()
+            timestamp_now = now.timestamp()
+            q.put_nowait(timestamp_now)
             return ret
         except Exception as e:
-            self.current_request = None
             self.responses[req.cmd] = None
             return None

{sensor-sdk-0.0.27 → sensor_sdk-0.0.31}/sensor/sensor_data_context.py

@@ -138,6 +138,9 @@ class SensorProfileDataCtx:
         await self.gForce.set_emg_raw_data_config(config)
 
         await self.gForce.set_package_id(True)
+
+        await self.gForce.set_function_switch(2)
+
         return data.channelCount
 
     async def initEEG(self, packageCount: int) -> int:
@@ -350,8 +353,9 @@ class SensorProfileDataCtx:
                 if value == "ON":
                     switch |= 8
         try:
-            await self.gForce.set_firmware_filter_switch(switch)
-            # await asyncio.sleep(0.1)
+            ret = await self.gForce.set_firmware_filter_switch(switch)
+            if ret == None:
+                return "ERROR: not success"
             return "OK"
         except Exception as e:
             return "ERROR: " + str(e)
@@ -372,10 +376,8 @@ class SensorProfileDataCtx:
     ####################################################################################
 
     async def process_data(self, buf: Queue[SensorData], sensor, callback):
-        while self._is_running and self._rawDataBuffer.empty():
-            await asyncio.sleep(0.1)
-
-            while self._is_running and not self._rawDataBuffer.empty():
+        while self._is_running:
+            while not self._rawDataBuffer.empty():
                 try:
                     data: bytes = self._rawDataBuffer.get_nowait()
                 except Exception as e:
@@ -385,7 +387,7 @@ class SensorProfileDataCtx:
                     self._processDataPackage(data, buf, sensor)
                 self._rawDataBuffer.task_done()
 
-            while self._is_running and self.isDataTransfering and not buf.empty():
+            if self.isDataTransfering and not buf.empty():
                 sensorData: SensorData = None
                 try:
                     sensorData = buf.get_nowait()
@@ -398,6 +400,8 @@ class SensorProfileDataCtx:
                         print(e)
 
                 buf.task_done()
+            else:
+                await asyncio.sleep(0.01)
 
     def _processDataPackage(self, data: bytes, buf: Queue[SensorData], sensor):
         v = data[0] & 0x7F
@@ -673,7 +677,21 @@ class SensorProfileDataCtx:
 
         while self._is_running:
             while self._is_running and self._rawDataBuffer.empty():
-                await asyncio.sleep(0.1)
+                if self._is_running and self.isDataTransfering and not buf.empty():
+                    sensorData: SensorData = None
+                    try:
+                        sensorData = buf.get_nowait()
+                    except Exception as e:
+                        break
+                    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:
+                            print(e)
+
+                    buf.task_done()
+                else:
+                    await asyncio.sleep(0.01)
                 continue
 
             try:
@@ -708,21 +726,7 @@ class SensorProfileDataCtx:
                     if self._is_data_transfering:
                         data_package = bytes(self._concatDataBuffer[index + 2 : index + 2 + n])
                         self._processDataPackage(data_package, buf, sensor)
-                        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 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:
-                                    print(e)
-
-                            buf.task_done()
                     last_cut = index = index + 2 + n
-
                 elif self._concatDataBuffer[index] == 0xAA:
                     if (index + 1) >= data_size:
                         index += 1
@@ -737,10 +741,10 @@ class SensorProfileDataCtx:
                         index += 1
                         continue
                     data_package = bytes(self._concatDataBuffer[index + 2 : index + 2 + n])
+
                     if not sensor_utils._terminated:
-                        self.gForce._on_cmd_response(None, data_package)
+                        await sensor_utils.async_call(self.gForce.async_on_cmd_response(data_package), runloop=sensor._event_loop)
                     last_cut = index = index + 2 + n
-
                 else:
                     index += 1
 

{sensor-sdk-0.0.27 → sensor_sdk-0.0.31}/sensor/sensor_profile.py

@@ -62,6 +62,8 @@ class SensorProfile:
         self._gforce: GForce = None
         self._data_event_loop: asyncio.AbstractEventLoop = None
         self._data_event_thread: threading.Thread = None
+        self._gforce_event_loop: asyncio.AbstractEventLoop = None
+        self._gforce_event_thread: threading.Thread = None
         self._event_loop: asyncio.AbstractEventLoop = None
         self._event_thread: threading.Thread = None
         self._is_starting = False
@@ -92,6 +94,17 @@ class SensorProfile:
             except Exception as e:
                 pass
 
+        if self._gforce_event_loop != None:
+            try:
+                self._gforce_event_loop.stop()
+                self._gforce_event_loop.close()
+                self._gforce_event_loop = None
+            except Exception as e:
+                pass
+
+        self._is_starting = False
+        self._is_setting_param = False
+
     @property
     def deviceState(self) -> DeviceStateEx:
         """
@@ -215,6 +228,13 @@ class SensorProfile:
         self._on_power_changed = callback
 
     async def _initGforce(self):
+
+        self._gforce_event_loop = asyncio.new_event_loop()
+        self._gforce_event_thread = threading.Thread(target=sensor_utils.start_loop, args=(self._gforce_event_loop,))
+        self._gforce_event_thread.daemon = True
+        self._gforce_event_thread.name = self._detail_device.name + "data event"
+        self._gforce_event_thread.start()
+
         if self._gforce == None:
             if self._adv.service_data.get(SERVICE_GUID) != None:
                 # print("OYM_SERVICE:" + self._detail_device.name)
@@ -223,21 +243,31 @@ class SensorProfile:
                     OYM_CMD_NOTIFY_CHAR_UUID,
                     OYM_DATA_NOTIFY_CHAR_UUID,
                     False,
+                    self._event_loop,
+                    self._gforce_event_loop,
                 )
             elif self._adv.service_data.get(RFSTAR_SERVICE_GUID) != None:
                 # print("RFSTAR_SERVICE:" + self._detail_device.name)
-                self._gforce = GForce(self._detail_device, RFSTAR_CMD_UUID, RFSTAR_DATA_UUID, True)
-                self._data_event_loop = asyncio.new_event_loop()
+                self._gforce = GForce(
+                    self._detail_device, RFSTAR_CMD_UUID, RFSTAR_DATA_UUID, True, self._event_loop, self._gforce_event_loop
+                )
+
             else:
                 print("Invalid device service uuid:" + self._detail_device.name + str(self._adv))
                 return False
 
+        self._data_event_loop = asyncio.new_event_loop()
+        self._data_event_thread = threading.Thread(target=sensor_utils.start_loop, args=(self._data_event_loop,))
+        self._data_event_thread.daemon = True
+        self._data_event_thread.name = self._detail_device.name + "data event"
+        self._data_event_thread.start()
+
         if self._data_ctx == None and self._gforce != None:
             self._data_ctx = SensorProfileDataCtx(self._gforce, self._device.Address, self._raw_data_buf)
         if self._data_ctx.isUniversalStream:
-            async_exec(self._process_universal_data(), self._event_loop)
+            async_exec(self._process_universal_data(), self._data_event_loop)
         else:
-            async_exec(self._process_data(), self._event_loop)
+            async_exec(self._process_data(), self._data_event_loop)
 
     async def _connect(self) -> bool:
         if sensor_utils._terminated:
@@ -249,6 +279,7 @@ class SensorProfile:
             self._event_thread.daemon = True
             self._event_thread.name = self._detail_device.name + "event"
             self._event_thread.start()
+
             self._data_buffer: Queue[SensorData] = Queue()
             self._raw_data_buf: Queue[bytes] = Queue()
 
@@ -269,7 +300,7 @@ class SensorProfile:
             self._set_device_state(DeviceStateEx.Disconnected)
             pass
 
-        await async_call(self._gforce.connect(handle_disconnect, self._raw_data_buf), runloop=self._event_loop)
+        await self._gforce.connect(handle_disconnect, self._raw_data_buf)
 
         if self._gforce != None and self._gforce.client.is_connected:
             self._set_device_state(DeviceStateEx.Connected)
@@ -313,7 +344,7 @@ class SensorProfile:
         if self._data_ctx == None:
             return False
         self._set_device_state(DeviceStateEx.Disconnecting)
-        async_exec(self._gforce.disconnect(), self._event_loop)
+        await self._gforce.disconnect()
         await asyncio.wait_for(self._waitForDisconnect(), sensor_utils._TIMEOUT)
 
         return True
@@ -341,6 +372,7 @@ class SensorProfile:
 
     async def _process_universal_data(self):
         await self._data_ctx.processUniversalData(self._data_buffer, self, self._on_data_callback)
+        print("finished")
 
     async def _startDataNotification(self) -> bool:
         if self.deviceState != DeviceStateEx.Ready:
@@ -353,13 +385,10 @@ class SensorProfile:
         if self._data_ctx.isDataTransfering:
             return True
 
-        if self._data_event_loop == None:
-            self._data_event_loop = asyncio.new_event_loop()
-
         self._raw_data_buf.queue.clear()
         self._data_buffer.queue.clear()
 
-        result = await async_call(self._data_ctx.start_streaming(), runloop=self._event_loop)
+        result = await async_call(self._data_ctx.start_streaming(), runloop=None)
         await asyncio.sleep(0.2)
 
         return result
@@ -413,7 +442,7 @@ class SensorProfile:
         if not self._data_ctx.isDataTransfering:
             return True
 
-        result = await async_call(self._data_ctx.stop_streaming(), runloop=self._event_loop)
+        result = await async_call(self._data_ctx.stop_streaming(), runloop=None)
         return result
 
     def stopDataNotification(self) -> bool:
@@ -565,7 +594,6 @@ class SensorProfile:
         if key == "DEBUG_BLE_DATA_PATH":
             result = await self._data_ctx.setDebugCSV(value)
 
-        self._is_setting_param = False
         return result
 
     def setParam(self, key: str, value: str) -> str:
@@ -581,11 +609,17 @@ class SensorProfile:
         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,
-        )
+        try:
+            self._is_setting_param = True
+            ret = sync_call(
+                self._setParam(key, value),
+                1,
+            )
+            self._is_setting_param = False
+            return ret
+        except Exception as e:
+            self._is_setting_param = False
+            print(e)
 
     async def asyncSetParam(self, key: str, value: str) -> str:
         """
@@ -600,8 +634,14 @@ class SensorProfile:
         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,
-        )
+        try:
+            self._is_setting_param = True
+            ret = await async_call(
+                self._setParam(key, value),
+                1,
+            )
+            self._is_setting_param = False
+            return ret
+        except Exception as e:
+            self._is_setting_param = False
+            print(e)

{sensor-sdk-0.0.27 → sensor_sdk-0.0.31}/sensor_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: sensor-sdk
-Version: 0.0.27
+Version: 0.0.31
 Summary: Python sdk for Synchroni
 Home-page: https://github.com/oymotion/SynchroniSDKPython
 Author: Martin Ye
@@ -8,6 +8,18 @@ Author-email: yecq_82@hotmail.com
 Requires-Python: >=3.9.0
 Description-Content-Type: text/markdown
 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
 

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