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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moons_motor
-Version: 0.0.6
+Version: 0.0.8
 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

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

@@ -6,7 +6,8 @@ from rich import print
 from rich.console import Console
 from rich.panel import Panel
 import queue
-from subject import Subject
+from moons_motor.subject import Subject
+import time
 
 
 class StepperModules:
@@ -199,6 +200,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 +227,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 +257,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.6 → moons_motor-0.0.8}/moons_motor/simulate.py

@@ -1,24 +1,27 @@
 import socketio
-import motor
-from observer import Observer
+from moons_motor.motor import MoonsStepper
+from moons_motor.observer import Observer
 import time
 
 
 class MoonsStepperSimulate(Observer):
     def __init__(
         self,
-        moons_motor: motor.MoonsStepper,
+        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.6 → moons_motor-0.0.8}/moons_motor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moons_motor
-Version: 0.0.6
+Version: 0.0.8
 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

{moons_motor-0.0.6 → moons_motor-0.0.8}/moons_motor.egg-info/SOURCES.txt

@@ -3,7 +3,6 @@ README.md
 pyproject.toml
 setup.py
 moons_motor/__init__.py
-moons_motor/example.py
 moons_motor/motor.py
 moons_motor/observer.py
 moons_motor/simulate.py

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

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

moons_motor-0.0.6/moons_motor/example.py

@@ -1,17 +0,0 @@
-from motor import MoonsStepper, StepperModules
-import simulate
-from time import sleep
-
-motor = MoonsStepper(StepperModules.STM17S_3RN, "0403", "6001", "TESTA", False)
-
-simulate = simulate.moons_stepper_simulate(motor, 0, "http://localhost:3002")
-
-MoonsStepper.list_all_ports()
-motor.connect()
-simulate.connect()
-
-motor.start_jog("", 10)
-
-sleep(5)
-
-motor.stop_jog()