From ceb60ffcc62e6338077b7496682bde68cd475337 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 23 Nov 2016 16:18:08 -0500 Subject: [PATCH] mcu: Rename output_file_mode variable to is_fileoutput Signed-off-by: Kevin O'Connor --- klippy/heater.py | 2 +- klippy/mcu.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/klippy/heater.py b/klippy/heater.py index b7987936..827ba324 100644 --- a/klippy/heater.py +++ b/klippy/heater.py @@ -51,7 +51,7 @@ class PrinterHeater: control_algo = self.config.get('control', 'watermark') algos = {'watermark': ControlBangBang, 'pid': ControlPID} self.control = algos[control_algo](self, self.config) - if self.printer.mcu.output_file_mode: + if self.printer.mcu.is_fileoutput(): self.can_extrude = True def set_pwm(self, read_time, value): if value: diff --git a/klippy/mcu.py b/klippy/mcu.py index 1c309f6c..ba95d92c 100644 --- a/klippy/mcu.py +++ b/klippy/mcu.py @@ -149,7 +149,7 @@ class MCU_endstop: self._last_state = params def check_busy(self, eventtime): # Check if need to send an end_stop_query command - if self._mcu.output_file_mode: + if self._mcu.is_fileoutput(): return False last_sent_time = self._last_state.get('#sent_time', -1.) if last_sent_time >= self._min_query_time: @@ -302,7 +302,7 @@ class MCU: serialport = config.get('serial', '/dev/ttyS0') self.serial = serialhdl.SerialReader(printer.reactor, serialport, baud) self.is_shutdown = False - self.output_file_mode = False + self._is_fileoutput = False # Config building self._emergency_stop_cmd = None self._num_oids = 0 @@ -355,7 +355,7 @@ class MCU: self.register_msg(self.handle_shutdown, 'is_shutdown') self.register_msg(self.handle_mcu_stats, 'stats') def connect_file(self, debugoutput, dictionary, pace=False): - self.output_file_mode = True + self._is_fileoutput = True self.serial.connect_file(debugoutput, dictionary) self._mcu_freq = float(self.serial.msgparser.config['CLOCK_FREQ']) def dummy_send_config(): @@ -386,6 +386,8 @@ class MCU: return stats def force_shutdown(self): self.send(self._emergency_stop_cmd.encode()) + def is_fileoutput(self): + return self._is_fileoutput # Configuration phase def _add_custom(self): data = self._config.get('custom', '')