moons-motor 0.0.7__tar.gz → 0.0.9__tar.gz

{moons_motor-0.0.7 → moons_motor-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moons_motor
-Version: 0.0.7
+Version: 0.0.9
 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.7 → moons_motor-0.0.9}/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.7 → moons_motor-0.0.9}/moons_motor/motor.py

@@ -7,6 +7,7 @@ from rich.console import Console
 from rich.panel import Panel
 import queue
 from moons_motor.subject import Subject
+import time
 
 
 class StepperModules:
@@ -146,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"
@@ -199,6 +203,7 @@ class MoonsStepper(Subject):
             else:
                 self.usedSendQueue.put(self.temp_cmd)
             if self.ser is not None or not self.only_simulate:
+                self.temp_cmd += "\r"
                 self.ser.write(self.temp_cmd.encode("ascii"))
             if self.is_log_message:
                 print(
@@ -225,7 +230,9 @@ class MoonsStepper(Subject):
 
     def start_jog(self, motor_address="", speed=0.15, direction="CW"):
         self.send(self.addressed_cmd(motor_address, "JS{}".format(speed)))
+        time.sleep(0.01)
         self.send(self.addressed_cmd(motor_address, "CJ"))
+        # self.send(self.addressed_cmd(motor_address, "CS{}".format(speed)))
 
     def change_jog_speed(self, motor_address="", speed=0.15):
         self.send(self.addressed_cmd(motor_address, "CS{}".format(speed)))
@@ -253,11 +260,18 @@ class MoonsStepper(Subject):
 
     def calibrate(self, motor_address="", speed=0.3, onStart=None, onComplete=None):
         self.send(self.addressed_cmd(motor_address, "VE{}".format(speed)))
+        # time.sleep(0.01)
         self.send(self.addressed_cmd(motor_address, "DI10"))
+        # time.sleep(0.01)
         self.send(self.addressed_cmd(motor_address, "SH3F"))
+        # time.sleep(0.01)
         self.send(self.addressed_cmd(motor_address, "EP0"))
+        # time.sleep(0.01)
         self.send(self.addressed_cmd(motor_address, "SP0"))
 
+    def alarm_reset(self, motor_address=""):
+        self.send(self.addressed_cmd(motor_address, "AR"))
+
     # speed slow= 0.25, medium=1, fast=5
     def set_transmit_delay(self, motor_address="", delay=15):
         self.send(self.addressed_cmd(motor_address, "TD{}".format(delay)))

{moons_motor-0.0.7 → moons_motor-0.0.9}/moons_motor/simulate.py

@@ -10,15 +10,18 @@ class MoonsStepperSimulate(Observer):
         moons_motor: MoonsStepper,
         universe: int = 0,
         server_address: str = "http://localhost:3001",
+        log_message: bool = True,
     ):
         self.server_address = server_address
         self.universe = universe
         self.moons_motor = moons_motor
         self.io = socketio.SimpleClient()
         self.connected = False
-        self.is_log_message = True
+        self.log_message = True
 
     def update(self, event):
+        if self.log_message == False:
+            return
         print(f"Simulate send: {event}")
         self.emit("motor", event)
 

{moons_motor-0.0.7 → moons_motor-0.0.9}/moons_motor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moons_motor
-Version: 0.0.7
+Version: 0.0.9
 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.7 → moons_motor-0.0.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "moons_motor"
-version = "0.0.7"
+version = "0.0.9"
 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"