aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/serialhdl.py
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2017-03-05 15:00:15 -0500
committerKevin O'Connor <kevin@koconnor.net>2017-03-09 14:54:52 -0500
commita38437f378ece33cb762b482120be629c78d3540 (patch)
treea4a4ec60221aecbb3e41a5854f75bbaf629065d4 /klippy/serialhdl.py
parent8d6ecd9af87d3e0da312588bacb1c43332412107 (diff)
downloadkutter-a38437f378ece33cb762b482120be629c78d3540.tar.gz
kutter-a38437f378ece33cb762b482120be629c78d3540.tar.xz
kutter-a38437f378ece33cb762b482120be629c78d3540.zip
stepper: Introduce stepper_get_position command and remove from endstop.c
Move the logic to calculate and report the stepper's current position from endstop.c to stepper.c. This localizes the stepper code into stepper.c. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/serialhdl.py')
-rw-r--r--klippy/serialhdl.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/klippy/serialhdl.py b/klippy/serialhdl.py
index 8112d703..6ccd9636 100644
--- a/klippy/serialhdl.py
+++ b/klippy/serialhdl.py
@@ -171,8 +171,8 @@ class SerialReader:
def encode_and_send(self, data, minclock, reqclock, cq):
self.ffi_lib.serialqueue_encode_and_send(
self.serialqueue, cq, data, len(data), minclock, reqclock)
- def send_with_response(self, cmd, name):
- src = SerialRetryCommand(self, cmd, name)
+ def send_with_response(self, cmd, name, oid=None):
+ src = SerialRetryCommand(self, cmd, name, oid)
return src.get_response()
def alloc_command_queue(self):
return self.ffi_main.gc(self.ffi_lib.serialqueue_alloc_commandqueue(),
@@ -235,17 +235,18 @@ class SerialReader:
class SerialRetryCommand:
TIMEOUT_TIME = 5.0
RETRY_TIME = 0.500
- def __init__(self, serial, cmd, name):
+ def __init__(self, serial, cmd, name, oid=None):
self.serial = serial
self.cmd = cmd
self.name = name
+ self.oid = oid
self.response = None
self.min_query_time = self.serial.reactor.monotonic()
- self.serial.register_callback(self.handle_callback, self.name)
+ self.serial.register_callback(self.handle_callback, self.name, self.oid)
self.send_timer = self.serial.reactor.register_timer(
self.send_event, self.serial.reactor.NOW)
def unregister(self):
- self.serial.unregister_callback(self.name)
+ self.serial.unregister_callback(self.name, self.oid)
self.serial.reactor.unregister_timer(self.send_timer)
def send_event(self, eventtime):
if self.response is not None: