diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2020-04-25 00:17:34 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2020-05-05 11:08:12 -0400 |
| commit | e9e0c374d63cbd873557ba5e3bb22d4e6d6afdd1 (patch) | |
| tree | b495394fad1086db620b46720b7a74eb5a1171d3 | |
| parent | a11535fc868a63ba31903bad73f126958877ac80 (diff) | |
| download | kutter-e9e0c374d63cbd873557ba5e3bb22d4e6d6afdd1.tar.gz kutter-e9e0c374d63cbd873557ba5e3bb22d4e6d6afdd1.tar.xz kutter-e9e0c374d63cbd873557ba5e3bb22d4e6d6afdd1.zip | |
temperature_fan: Use new GCodeCommand wrappers
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rw-r--r-- | klippy/extras/temperature_fan.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/klippy/extras/temperature_fan.py b/klippy/extras/temperature_fan.py index cebeee1f..fe3ac75a 100644 --- a/klippy/extras/temperature_fan.py +++ b/klippy/extras/temperature_fan.py @@ -15,7 +15,6 @@ class TemperatureFan: self.name = config.get_name().split()[1] self.printer = config.get_printer() self.fan = fan.PrinterFan(config, default_shutdown_speed=1.) - self.gcode = self.printer.lookup_object('gcode') self.min_temp = config.getfloat('min_temp', minval=KELVIN_TO_CELSIUS) self.max_temp = config.getfloat('max_temp', above=self.min_temp) pheaters = self.printer.try_load_module(config, 'heaters') @@ -37,7 +36,8 @@ class TemperatureFan: self.control = algo(self, config) self.next_speed_time = 0. self.last_speed_value = 0. - self.gcode.register_mux_command( + gcode = self.printer.lookup_object('gcode') + gcode.register_mux_command( "SET_TEMPERATURE_FAN_TARGET", "TEMPERATURE_FAN", self.name, self.cmd_SET_TEMPERATURE_FAN_TARGET_TEMP, desc=self.cmd_SET_TEMPERATURE_FAN_TARGET_TEMP_help) @@ -72,12 +72,12 @@ class TemperatureFan: status["target"] = self.target_temp return status cmd_SET_TEMPERATURE_FAN_TARGET_TEMP_help = "Sets a temperature fan target" - def cmd_SET_TEMPERATURE_FAN_TARGET_TEMP(self, params): - temp = self.gcode.get_float('TARGET', params, self.target_temp_conf) + def cmd_SET_TEMPERATURE_FAN_TARGET_TEMP(self, gcmd): + temp = gcmd.get_float('TARGET', self.target_temp_conf) self.set_temp(temp) def set_temp(self, degrees): if degrees and (degrees < self.min_temp or degrees > self.max_temp): - raise self.gcode.error( + raise self.printer.command_error( "Requested temperature (%.1f) out of range (%.1f:%.1f)" % (degrees, self.min_temp, self.max_temp)) self.target_temp = degrees |