3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

klippy: Use reactor register_callback() mechanism 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-09-02 12:43:40 -04:00
parent ab4060e145
commit 50196c7141
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
klippy/klippy.py
View File

@ -136,11 +136,9 @@ class Printer:
gc = gcode.GCodeParser(self, input_fd) gc = gcode.GCodeParser(self, input_fd)
self.objects = collections.OrderedDict({'gcode': gc}) self.objects = collections.OrderedDict({'gcode': gc})
self.stats_timer = self.reactor.register_timer(self._stats) self.stats_timer = self.reactor.register_timer(self._stats)
self.connect_timer = self.reactor.register_timer( self.reactor.register_callback(self._connect)
self._connect, self.reactor.NOW)
self.state_message = message_startup self.state_message = message_startup
self.is_shutdown = False self.is_shutdown = False
self.async_shutdown_msg = ""
self.run_result = None self.run_result = None
self.stats_cb = [] self.stats_cb = []
self.state_cb = [] self.state_cb = []
@ -238,7 +236,6 @@ class Printer:
self.state_cb = [o.printer_state for o in self.objects.values() self.state_cb = [o.printer_state for o in self.objects.values()
if hasattr(o, 'printer_state')] if hasattr(o, 'printer_state')]
def _connect(self, eventtime): def _connect(self, eventtime):
self.reactor.unregister_timer(self.connect_timer)
try: try:
self._read_config() self._read_config()
for cb in self.state_cb: for cb in self.state_cb:
@ -281,9 +278,6 @@ class Printer:
# Check restart flags # Check restart flags
run_result = self.run_result run_result = self.run_result
try: try:
if run_result == 'shutdown':
self.invoke_shutdown(self.async_shutdown_msg)
continue
self._stats(self.reactor.monotonic(), force_output=True) self._stats(self.reactor.monotonic(), force_output=True)
if run_result == 'firmware_restart': if run_result == 'firmware_restart':
for m in self.lookup_module_objects('mcu'): for m in self.lookup_module_objects('mcu'):
@ -301,8 +295,8 @@ class Printer:
for cb in self.state_cb: for cb in self.state_cb:
cb('shutdown') cb('shutdown')
def invoke_async_shutdown(self, msg): def invoke_async_shutdown(self, msg):
self.async_shutdown_msg = msg self.reactor.register_async_callback(
self.request_exit("shutdown") (lambda e: self.invoke_shutdown(msg)))
def request_exit(self, result): def request_exit(self, result):
self.run_result = result self.run_result = result
self.reactor.end() self.reactor.end()