diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2020-08-04 15:47:25 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2020-08-06 14:21:08 -0400 |
| commit | 0d930bf8718c316ec0f40440d102ffd4fa66b91e (patch) | |
| tree | 4272dd0ca5b2a3bd18ea2227afa2322e1dc05241 /klippy/klippy.py | |
| parent | b66dd1a60f4e30a4e8636812cf9fb46b8f34f658 (diff) | |
| download | kutter-0d930bf8718c316ec0f40440d102ffd4fa66b91e.tar.gz kutter-0d930bf8718c316ec0f40440d102ffd4fa66b91e.tar.xz kutter-0d930bf8718c316ec0f40440d102ffd4fa66b91e.zip | |
gcode: Pass the pseudo-tty fd via the start_args system
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/klippy.py')
| -rw-r--r-- | klippy/klippy.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/klippy/klippy.py b/klippy/klippy.py index cd22ace9..5fc013fa 100644 --- a/klippy/klippy.py +++ b/klippy/klippy.py @@ -48,7 +48,7 @@ Printer is shutdown class Printer: config_error = configfile.error command_error = homing.CommandError - def __init__(self, input_fd, bglogger, start_args): + def __init__(self, bglogger, start_args): self.bglogger = bglogger self.start_args = start_args self.reactor = reactor.Reactor() @@ -59,7 +59,7 @@ class Printer: self.event_handlers = {} self.objects = collections.OrderedDict() self.objects['webhooks'] = webhooks.WebHooks(self) - self.objects['gcode'] = gcode.GCodeParser(self, input_fd) + self.objects['gcode'] = gcode.GCodeParser(self) def get_start_args(self): return self.start_args def get_reactor(self): @@ -260,20 +260,19 @@ def main(): opts.error("Incorrect number of arguments") start_args = {'config_file': args[0], 'start_reason': 'startup'} - input_fd = bglogger = None - debuglevel = logging.INFO if options.verbose: debuglevel = logging.DEBUG if options.debuginput: start_args['debuginput'] = options.debuginput debuginput = open(options.debuginput, 'rb') - input_fd = debuginput.fileno() + start_args['gcode_fd'] = debuginput.fileno() else: - input_fd = util.create_pty(options.inputtty) + start_args['gcode_fd'] = util.create_pty(options.inputtty) if options.debugoutput: start_args['debugoutput'] = options.debugoutput start_args.update(options.dictionary) + bglogger = None if options.logfile: start_args['log_file'] = options.logfile bglogger = queuelogger.setup_bg_logging(options.logfile, debuglevel) @@ -298,7 +297,7 @@ def main(): if bglogger is not None: bglogger.clear_rollover_info() bglogger.set_rollover_info('versions', versions) - printer = Printer(input_fd, bglogger, start_args) + printer = Printer(bglogger, start_args) res = printer.run() if res in ['exit', 'error_exit']: break |