moons-motor 0.0.8__tar.gz → 0.0.10__tar.gz

{moons_motor-0.0.8 → moons_motor-0.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moons_motor
-Version: 0.0.8
+Version: 0.0.10
 Summary: This is a python library for controlling the Moons' motor through the serial port.
 Author-email: miroc <mike8503111@gmail.com>
 Project-URL: Repository, https://github.com/miroc99/moons_motor.git
@@ -22,15 +22,20 @@ Requires-Dist: requests
 This is a python library for control moons motor through serial port.
 
 ## Compatibility
+
 Now only support Windows.
 
 ## Installing
+
 Install through `pip`
+
 ```bash
 python -m pip install moons_motor
 
 ```
+
 ## Usage
+
 ```python
 from motor import MoonsStepper, StepperModules
 import simulate
@@ -46,7 +51,9 @@ sleep(5)
 motor.stop_jog()
 
 ```
+
 ## Tested Motor
+
 1. STM17S-3RN
 
 ## Reference

{moons_motor-0.0.8 → moons_motor-0.0.10}/README.md

@@ -3,15 +3,20 @@
 This is a python library for control moons motor through serial port.
 
 ## Compatibility
+
 Now only support Windows.
 
 ## Installing
+
 Install through `pip`
+
 ```bash
 python -m pip install moons_motor
 
 ```
+
 ## Usage
+
 ```python
 from motor import MoonsStepper, StepperModules
 import simulate
@@ -27,7 +32,9 @@ sleep(5)
 motor.stop_jog()
 
 ```
+
 ## Tested Motor
+
 1. STM17S-3RN
 
 ## Reference

{moons_motor-0.0.8 → moons_motor-0.0.10}/moons_motor/motor.py

@@ -147,25 +147,28 @@ class MoonsStepper(Subject):
         ports = list(list_ports.comports())
         for p in ports:
             m = re.match(
-                r"USB\s*VID:PID=(\w+):(\w+)\s*SER=([A-Za-z0-9]+)", p.usb_info()
+                r"USB\s*VID:PID=(\w+):(\w+)\s*SER=([A-Za-z0-9]*)", p.usb_info()
             )
+            print(m, p.usb_info())
             if (
                 m
                 and m.group(1) == self.VID
                 and m.group(2) == self.PID
-                and m.group(3) == self.SERIAL_NUM
+                # and m.group(3) == self.SERIAL_NUM
             ):
-                print(
-                    f"Device: {p.description} | VID: {m.group(1)} | PID: {m.group(2)} | SER: {m.group(3)} connected"
-                )
-
-                self.device = p.description
-
-                attempt_connect(p.device, baudrate)
-                if callback:
-                    callback(self.device, self.Opened)
+                print("find vid pid match")
+                if m.group(3) == self.SERIAL_NUM or self.SERIAL_NUM == "":
+                    print(
+                        f"Device: {p.description} | VID: {m.group(1)} | PID: {m.group(2)} | SER: {m.group(3)} connected"
+                    )
+
+                    self.device = p.description
+
+                    attempt_connect(p.device, baudrate)
+                    if callback:
+                        callback(self.device, self.Opened)
+                        break
                     break
-                break
 
             if self.only_simulate:
                 self.device = "Simulate"
@@ -210,6 +213,37 @@ class MoonsStepper(Subject):
         else:
             print(f"Target device is not opened. Command: {command}")
 
+    def read(self, timeout=1):
+        if self.ser is not None and self.ser.is_open:
+            print("reading...")
+            try:
+                start_time = time.time()
+                while time.time() - start_time < timeout:
+                    if self.ser.in_waiting > 0:
+                        response = self.ser.read(self.ser.in_waiting)
+                        response = response.decode("utf-8").strip()
+                        if self.is_log_message:
+                            print(
+                                f"[bold blue]Recv from {self.device} :[/bold blue] {response}"
+                            )
+                        return response
+                    time.sleep(0.01)
+                print("reading timeout")
+                return None
+            except Exception as e:
+                print(f"Error when reading serial port: {str(e)}")
+                return None
+        elif self.only_simulate:
+            simulated_response = "simulate response"
+            if self.is_log_message:
+                print(
+                    f"[bold blue]Recv from simulate device:[/bold blue] {simulated_response}"
+                )
+            return simulated_response
+        else:
+            print("Device not open, read fail.")
+            return None
+
     # endregion
 
     # region motor motion functions
@@ -278,63 +312,93 @@ class MoonsStepper(Subject):
     # region motor status functions
     def get_position(self, motor_address):
         self.send(self.addressed_cmd(motor_address, "IP"))
-        self.new_value_event.wait(timeout=0.5)
-        return self.get_value()
+        return self.read()
+        # self.new_value_event.wait(timeout=0.5)
+        # return self.get_value()
 
     def get_temperature(self, motor_address):
         self.send(self.addressed_cmd(motor_address, "IT"))
-        self.new_value_event.wait(timeout=0.5)
-        return int(self.get_value()) / 10
+        # self.new_value_event.wait(timeout=0.5)
+        return self.read()
+        # return int(self.get_value()) / 10
 
     def get_sensor_status(self, motor_address):
         self.send(self.addressed_cmd(motor_address, "IS"))
-        self.new_value_event.wait(timeout=0.5)
-        return self.get_value()
+        return self.read()
+        # self.new_value_event.wait(timeout=0.5)
+        # return self.get_value()
 
     def get_votalge(self, motor_address):
         self.send(self.addressed_cmd(motor_address, "IU"))
-        self.new_value_event.wait(timeout=0.5)
-        return self.get_value()
+        return self.read()
+        # self.new_value_event.wait(timeout=0.5)
+        # return self.get_value()
 
     def get_acceleration(self, motor_address):
         self.send(self.addressed_cmd(motor_address, "AC"))
-        self.new_value_event.wait(timeout=0.5)
-        return self.get_value()
+        return self.read()
+        # self.new_value_event.wait(timeout=0.5)
+        # return self.get_value()
 
     def get_deceleration(self, motor_address):
         self.send(self.addressed_cmd(motor_address, "DE"))
-        self.new_value_event.wait(timeout=0.5)
-        return self.get_value()
+        return self.read()
+        # self.new_value_event.wait(timeout=0.5)
+        # return self.get_value()
 
     def get_velocity(self, motor_address):
         self.send(self.addressed_cmd(motor_address, "VE"))
-        self.new_value_event.wait(timeout=0.5)
-        return self.get_value()
+        return self.read()
+        # self.new_value_event.wait(timeout=0.5)
+        # return self.get_value()
 
     def get_distance(self, motor_address):
         self.send(self.addressed_cmd(motor_address, "DI"))
-        self.new_value_event.wait(timeout=0.5)
-        return self.get_value()
+        return self.read()
+        # self.new_value_event.wait(timeout=0.5)
+        # return self.get_value()
 
     def get_jog_speed(self, motor_address):
         self.send(self.addressed_cmd(motor_address, "JS"))
-        self.new_value_event.wait(timeout=0.5)
-        return self.get_value()
+        # self.new_value_event.wait(timeout=0.5)
+        # return self.get_value()
+        return self.read()
 
-    def get_info(self, motor_address):
+    def get_info(self, motor_address, progress=None):
         self.set_return_format_dexcimal(motor_address)
         self.motor_wait(motor_address, 0.1)
+        totalInfoCount = 7
+        pos = self.extractValueFromResponse(self.get_position(motor_address))
+        if progress:
+            progress(round(1 / totalInfoCount, 1))
+        temp = (
+            int(self.extractValueFromResponse(self.get_temperature(motor_address))) / 10
+        )
+        if progress:
+            progress(round(2 / totalInfoCount, 1))
+        vol = int(self.extractValueFromResponse(self.get_votalge(motor_address))) / 10
+        if progress:
+            progress(round(3 / totalInfoCount, 1))
+        accel = self.extractValueFromResponse(self.get_acceleration(motor_address))
+        if progress:
+            progress(round(4 / totalInfoCount, 1))
+        decel = self.extractValueFromResponse(self.get_deceleration(motor_address))
+        if progress:
+            progress(round(5 / totalInfoCount, 1))
+        jogsp = self.extractValueFromResponse(self.get_jog_speed(motor_address))
+        if progress:
+            progress(round(6 / totalInfoCount, 1))
         info = {
-            "pos": str(self.get_position(motor_address)),
-            "temp": str(self.get_temperature(motor_address)),
-            "sensor": str(self.get_sensor_status(motor_address)),
-            "vol": str(self.get_votalge(motor_address)),
-            "accel": str(self.get_acceleration(motor_address)),
-            "decel": str(self.get_deceleration(motor_address)),
-            "vel": str(self.get_velocity(motor_address)),
-            "dis": str(self.get_distance(motor_address)),
-            "jogsp": str(self.get_jog_speed(motor_address)),
+            "pos": pos,
+            "temp": temp,
+            "vol": vol,
+            "accel": accel,
+            "decel": decel,
+            "jogsp": jogsp,
         }
+        if progress:
+            progress(round(7 / totalInfoCount))
+
         return info
 
     def get_status(self, motor_address) -> str:
@@ -360,26 +424,37 @@ class MoonsStepper(Subject):
             return f"~{command}"
         return f"{motor_address}{command}"
 
+    def extractValueFromResponse(self, response):
+        pattern = r"=(.*)"
+        if response == None:
+            return None
+        result = re.search(pattern, response)
+        if result:
+            return result.group(1)
+        else:
+            return None
+
     def get_value(self):
         print("Waiting for value")
         self.new_data_event.wait(timeout=0.5)
         print("Recv:" + self.listeningBufferPre)
         self.new_data_event.clear()
-        if "%" in self.listeningBufferPre:
-            return "success_ack"
-        if "?" in self.listeningBufferPre:
-            return "fail_ack"
-        if "*" in self.listeningBufferPre:
-            return "buffered_ack"
-        self.new_value_event.set()
-        pattern = r"=(\w+(?:\.\w+)?|\d+(?:\.\d+)?)"
-        result = re.search(pattern, self.listeningBufferPre)
-        self.listeningBufferPre = ""
-        self.new_value_event.clear()
-        if result:
-            return result.group(1)
-        else:
-            return "No_value_found"
+        return self.listeningBufferPre
+        # if "%" in self.listeningBufferPre:
+        #     return "success_ack"
+        # if "?" in self.listeningBufferPre:
+        #     return "fail_ack"
+        # if "*" in self.listeningBufferPre:
+        #     return "buffered_ack"
+        # self.new_value_event.set()
+        # pattern = r"=(\w+(?:\.\w+)?|\d+(?:\.\d+)?)"
+        # result = re.search(pattern, self.listeningBufferPre)
+        # self.listeningBufferPre = ""
+        # self.new_value_event.clear()
+        # if result:
+        #     return result.group(1)
+        # else:
+        #     return "No_value_found"
 
 
 # endregion

{moons_motor-0.0.8 → moons_motor-0.0.10}/moons_motor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moons_motor
-Version: 0.0.8
+Version: 0.0.10
 Summary: This is a python library for controlling the Moons' motor through the serial port.
 Author-email: miroc <mike8503111@gmail.com>
 Project-URL: Repository, https://github.com/miroc99/moons_motor.git
@@ -22,15 +22,20 @@ Requires-Dist: requests
 This is a python library for control moons motor through serial port.
 
 ## Compatibility
+
 Now only support Windows.
 
 ## Installing
+
 Install through `pip`
+
 ```bash
 python -m pip install moons_motor
 
 ```
+
 ## Usage
+
 ```python
 from motor import MoonsStepper, StepperModules
 import simulate
@@ -46,7 +51,9 @@ sleep(5)
 motor.stop_jog()
 
 ```
+
 ## Tested Motor
+
 1. STM17S-3RN
 
 ## Reference

{moons_motor-0.0.8 → moons_motor-0.0.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "moons_motor"
-version = "0.0.8"
+version = "0.0.10"
 authors = [{ name = "miroc", email = "mike8503111@gmail.com" }]
 description = "This is a python library for controlling the Moons' motor through the serial port."
 readme = "README.md"