moons-motor 0.0.6__py3-none-any.whl → 0.0.8__py3-none-any.whl

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/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.dist-info → moons_motor-0.0.8.dist-info}/METADATA

@@ -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.8.dist-info/RECORD

@@ -0,0 +1,11 @@
+moons_motor/__init__.py,sha256=qOpsRwizV-DpKSvNzyvj8ju3cs6vwgIICur1Oe6sxOA,27
+moons_motor/motor.py,sha256=KM2DIHB3RRx21pMPp7q6q1XNFDfSoiNV8Lk0jaqYyD4,13221
+moons_motor/observer.py,sha256=PXzuPYKRb2HpjArJcD8HakYIPfFGAs1uBDIL8PSizgA,124
+moons_motor/simulate.py,sha256=J0y1fZhoOim9i-BAkprxnPern1SAdkDfKPqT2MWyDwU,2561
+moons_motor/status.py,sha256=jXQZFZTt9ugHktkWKLII8MpEQQaeO-UjlwTrrP4LJNE,2872
+moons_motor/subject.py,sha256=L_GS6fvJTeX7X23o3T92oiZ4rtLVKA2OEd9GpHn_Dz4,445
+moons_motor-0.0.8.dist-info/LICENSE,sha256=nsYjO800SjIjI85y2kVHR5mC3tca2vs4kK_BhNe89bM,1074
+moons_motor-0.0.8.dist-info/METADATA,sha256=qbzG4yrvxm5yjawnb_4zGG2f7hPhQtQJSyYSDNQ3Sgk,1267
+moons_motor-0.0.8.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+moons_motor-0.0.8.dist-info/top_level.txt,sha256=0dE-CR5_NYBw34jHIDGQNWpMllzO6mtUIuKyRv_rJLg,12
+moons_motor-0.0.8.dist-info/RECORD,,

{moons_motor-0.0.6.dist-info → moons_motor-0.0.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (74.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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()

moons_motor-0.0.6.dist-info/RECORD

@@ -1,12 +0,0 @@
-moons_motor/__init__.py,sha256=qOpsRwizV-DpKSvNzyvj8ju3cs6vwgIICur1Oe6sxOA,27
-moons_motor/example.py,sha256=hPk3r9WyNfRrdH7B3LW_KB_tLQ3wE6bIDht3WGMSBSA,382
-moons_motor/motor.py,sha256=5tK9ynaIkG2HAiNxPnPdNawuALftsP4SK1UgdZZR3Vk,12833
-moons_motor/observer.py,sha256=PXzuPYKRb2HpjArJcD8HakYIPfFGAs1uBDIL8PSizgA,124
-moons_motor/simulate.py,sha256=zYxCmtbLh0FjmOJUjbmgBd0zuXSCupj3DMuNncYl9KA,2434
-moons_motor/status.py,sha256=jXQZFZTt9ugHktkWKLII8MpEQQaeO-UjlwTrrP4LJNE,2872
-moons_motor/subject.py,sha256=L_GS6fvJTeX7X23o3T92oiZ4rtLVKA2OEd9GpHn_Dz4,445
-moons_motor-0.0.6.dist-info/LICENSE,sha256=nsYjO800SjIjI85y2kVHR5mC3tca2vs4kK_BhNe89bM,1074
-moons_motor-0.0.6.dist-info/METADATA,sha256=Ei5c0BIh2xRdP--uYE6tR-hT8bRpbRqlhGMqcxPGV-Y,1267
-moons_motor-0.0.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-moons_motor-0.0.6.dist-info/top_level.txt,sha256=0dE-CR5_NYBw34jHIDGQNWpMllzO6mtUIuKyRv_rJLg,12
-moons_motor-0.0.6.dist-info/RECORD,,