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

temperature: add heater_generic

Browse Source
This commit is contained in:
Jordan Ruthe 2021-02-19 15:21:58 -05:00
parent 0c73b3831b
commit 316ff627ac
1 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
panels/temperature.py
View File

@ -23,28 +23,37 @@ class TemperaturePanel(ScreenPanel):
grid = self._gtk.HomogeneousGrid() grid = self._gtk.HomogeneousGrid()
eq_grid = self._gtk.HomogeneousGrid() eq_grid = Gtk.Grid()
eq_grid.set_hexpand(True)
eq_grid.set_vexpand(True)
self.heaters = []
i = 0 i = 0
for x in self._printer.get_tools(): for x in self._printer.get_tools():
if i > 3: if i == 0:
break
elif i == 0:
primary_tool = x primary_tool = x
self.labels[x] = self._gtk.ToggleButtonImage("extruder-"+str(i), self._gtk.formatTemperatureString(0, 0)) self.labels[x] = self._gtk.ToggleButtonImage("extruder-"+str(i), self._gtk.formatTemperatureString(0, 0))
self.labels[x].connect('clicked', self.select_heater, x)
if i == 0: if i == 0:
self.labels[x].set_active(True) self.labels[x].set_active(True)
eq_grid.attach(self.labels[x], i%2, i/2, 1, 1) self.heaters.append(x)
i += 1 i += 1
print ("Primary tool: " + primary_tool)
self.labels[primary_tool].get_style_context().add_class('button_active') self.labels[primary_tool].get_style_context().add_class('button_active')
if self._printer.has_heated_bed(): add_heaters = self._printer.get_heaters()
self.labels["heater_bed"] = self._gtk.ToggleButtonImage("bed", self._gtk.formatTemperatureString(0, 0)) for h in add_heaters:
self.labels["heater_bed"].connect('clicked', self.select_heater, "heater_bed") if h == "heater_bed":
width = 2 if i > 1 else 1 self.labels[h] = self._gtk.ButtonImage("bed", self._gtk.formatTemperatureString(0, 0))
eq_grid.attach(self.labels["heater_bed"], 0, i/2+1, width, 1) else:
name = " ".join(h.split(" ")[1:])
self.labels[h] = self._gtk.ButtonImage("heat-up", name)
self.heaters.append(h)
i = 0
cols = 3 if len(self.heaters) > 4 else (1 if len(self.heaters) <= 2 else 2)
for h in self.heaters:
self.labels[h].connect('clicked', self.select_heater, h)
eq_grid.attach(self.labels[h], i%cols, int(i/cols), 1, 1)
i += 1
self.labels["control_grid"] = self._gtk.HomogeneousGrid() self.labels["control_grid"] = self._gtk.HomogeneousGrid()
@ -184,19 +193,21 @@ class TemperaturePanel(ScreenPanel):
if action != "notify_status_update": if action != "notify_status_update":
return return
if self._printer.has_heated_bed():
self.update_temp("heater_bed",
self._printer.get_dev_stat("heater_bed","temperature"),
self._printer.get_dev_stat("heater_bed","target")
)
for x in self._printer.get_tools(): for x in self._printer.get_tools():
self.update_temp(x, self.update_temp(x,
self._printer.get_dev_stat(x,"temperature"), self._printer.get_dev_stat(x,"temperature"),
self._printer.get_dev_stat(x,"target") self._printer.get_dev_stat(x,"target")
) )
for h in self._printer.get_heaters():
self.update_temp(h,
self._printer.get_dev_stat(h,"temperature"),
self._printer.get_dev_stat(h,"target"),
None if h == "heater_bed" else " ".join(h.split(" ")[1:])
)
return return
def change_target_temp(self, widget, dir): def change_target_temp(self, widget, dir):
logger.debug("Dev stats %s: %s" % (self.active_heater, self._printer.get_dev_stats(self.active_heater)))
target = self._printer.get_dev_stat(self.active_heater, "target") target = self._printer.get_dev_stat(self.active_heater, "target")
if dir == "+": if dir == "+":
target += int(self.tempdelta) target += int(self.tempdelta)
@ -209,15 +220,12 @@ class TemperaturePanel(ScreenPanel):
self._printer.set_dev_stat(self.active_heater, "target", target) self._printer.set_dev_stat(self.active_heater, "target", target)
if self.active_heater == "heater_bed": if self.active_heater.startswith("heater_generic "):
self._screen._ws.klippy.gcode_script( KlippyGcodes.set_bed_temp( self._screen._ws.klippy.set_heater_temp(" ".join(self.active_heater.split(" ")[1:]), target)
target elif self.active_heater == "heater_bed":
)) self._screen._ws.klippy.set_bed_temp(target)
else: else:
self._screen._ws.klippy.gcode_script( KlippyGcodes.set_ext_temp( self._screen._ws.klippy.set_tool_temp(self._printer.get_tool_number(heater), target)
target,
self._printer.get_tool_number(self.active_heater)
))
def update_entry(self, widget, digit): def update_entry(self, widget, digit):
text = self.labels['entry'].get_text() text = self.labels['entry'].get_text()
@ -226,17 +234,17 @@ class TemperaturePanel(ScreenPanel):
return return
self.labels['entry'].set_text(text[0:-1]) self.labels['entry'].set_text(text[0:-1])
elif digit == 'E': elif digit == 'E':
if self.active_heater == "heater_bed": if self.active_heater.startswith('heater_generic '):
temp = int(text)
self._screen._ws.klippy.set_heater_temp(" ".join(self.active_heater.split(" ")[1:]), temp)
elif self.active_heater == "heater_bed":
temp = int(text) temp = int(text)
temp = 0 if temp < 0 or temp > KlippyGcodes.MAX_BED_TEMP else temp temp = 0 if temp < 0 or temp > KlippyGcodes.MAX_BED_TEMP else temp
self._screen._ws.klippy.gcode_script(KlippyGcodes.set_bed_temp(temp)) self._screen._ws.klippy.set_bed_temp(temp)
else: else:
temp = int(text) temp = int(text)
temp = 0 if temp < 0 or temp > KlippyGcodes.MAX_EXT_TEMP else temp temp = 0 if temp < 0 or temp > KlippyGcodes.MAX_EXT_TEMP else temp
self._screen._ws.klippy.gcode_script( KlippyGcodes.set_ext_temp( self._screen._ws.klippy.set_tool_temp(self._printer.get_tool_number(heater), temp)
temp,
self._printer.get_tool_number(self.active_heater)
))
self._printer.set_dev_stat(self.active_heater, "target", temp) self._printer.set_dev_stat(self.active_heater, "target", temp)
self.labels['entry'].set_text("") self.labels['entry'].set_text("")
else: else: