CreatBot/CreatBotKlipperScreen
7
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow setting 0 in preheat options (#612)

Browse Source
This commit is contained in:
Ruslan Sayfutdinov 2022-05-31 15:10:27 +01:00 committed by GitHub
parent 432b12d67e
commit 794dbea14e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ks_includes/config.py
View File

@ -443,10 +443,10 @@ class KlipperScreenConfig:
return False return False
cfg = self.config[name] cfg = self.config[name]
item = { item = {
"extruder": cfg.getint("extruder", 0), "extruder": cfg.getint("extruder", None),
"bed": cfg.getint("bed", 0), "bed": cfg.getint("bed", None),
"heater_generic": cfg.getint("heater_generic", 0), "heater_generic": cfg.getint("heater_generic", None),
"temperature_fan": cfg.getint("temperature_fan", 0), "temperature_fan": cfg.getint("temperature_fan", None),
"gcode": cfg.get("gcode", None) "gcode": cfg.get("gcode", None)
} }
return item return item

14
panels/temperature.py
View File

@ -232,26 +232,28 @@ class TemperaturePanel(ScreenPanel):
MAX_TEMP = int(float(self._printer.get_config_section(heater)['max_temp'])) MAX_TEMP = int(float(self._printer.get_config_section(heater)['max_temp']))
if heater.startswith('extruder'): if heater.startswith('extruder'):
target = self.preheat_options[setting]["extruder"] target = self.preheat_options[setting]["extruder"]
if target > 0 and target <= MAX_TEMP: if target is not None and target >= 0 and target <= MAX_TEMP:
self._screen._ws.klippy.set_tool_temp(self._printer.get_tool_number(heater), target) self._screen._ws.klippy.set_tool_temp(self._printer.get_tool_number(heater), target)
elif heater.startswith('heater_bed'): elif heater.startswith('heater_bed'):
target = self.preheat_options[setting]["bed"] target = self.preheat_options[setting]["bed"]
if target > 0 and target <= MAX_TEMP: if target is not None and target >= 0 and target <= MAX_TEMP:
self._screen._ws.klippy.set_bed_temp(target) self._screen._ws.klippy.set_bed_temp(target)
elif heater.startswith('heater_generic '): elif heater.startswith('heater_generic '):
target = self.preheat_options[setting]["heater_generic"] target = self.preheat_options[setting]["heater_generic"]
if target > 0 and target <= MAX_TEMP: if target is not None and target >= 0 and target <= MAX_TEMP:
self._screen._ws.klippy.set_heater_temp(" ".join(heater.split(" ")[1:]), target) self._screen._ws.klippy.set_heater_temp(" ".join(heater.split(" ")[1:]), target)
elif heater.startswith('temperature_fan '): elif heater.startswith('temperature_fan '):
target = self.preheat_options[setting]["temperature_fan"] target = self.preheat_options[setting]["temperature_fan"]
if target > 0 and target <= MAX_TEMP: if target is not None and target >= 0 and target <= MAX_TEMP:
self._screen._ws.klippy.set_temp_fan_temp(" ".join(heater.split(" ")[1:]), target) self._screen._ws.klippy.set_temp_fan_temp(" ".join(heater.split(" ")[1:]), target)
else: else:
logging.info("Unknown heater: %s" % heater) logging.info("Unknown heater: %s" % heater)
self._screen.show_popup_message(_("Unknown Heater") + " " + heater) self._screen.show_popup_message(_("Unknown Heater") + " " + heater)
if target is None:
continue
if target <= MAX_TEMP: if target <= MAX_TEMP:
if target > 0: if target >= 0:
self._printer.set_dev_stat(heater, "target", int(target)) self._printer.set_dev_stat(heater, "target", target)
logging.info("Setting %s to %d" % (heater, target)) logging.info("Setting %s to %d" % (heater, target))
else: else:
self._screen.show_popup_message(_("Can't set above the maximum:") + (" %s" % MAX_TEMP)) self._screen.show_popup_message(_("Can't set above the maximum:") + (" %s" % MAX_TEMP))