CreatBot/GeneralKlipperScreen
6
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

updates to several panels to account for a lack of heater_bed

Browse Source
This commit is contained in:
Jordan 2020-12-28 17:08:17 -05:00
parent 63764ee32e
commit 9d89311bcc
5 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ks_includes/printer.py
View File

@ -234,6 +234,10 @@ class Printer:
def get_tool_number(self, tool): def get_tool_number(self, tool):
return self.tools.index(tool) return self.tools.index(tool)
def has_heated_bed(self):
if "heater_bed" in self.devices:
return True
def section_exists(self, section): def section_exists(self, section):
if section in self.get_config_section_list(): if section in self.get_config_section_list():
return True return True

24
panels/job_status.py
View File

@ -104,16 +104,17 @@ class JobStatusPanel(ScreenPanel):
self.labels[extruder + '_box'].add(self.labels[extruder]) self.labels[extruder + '_box'].add(self.labels[extruder])
i += 1 i += 1
heater_bed = self._gtk.Image("bed.svg", None, .6, .6)
self.labels['heater_bed'] = Gtk.Label(label="")
self.labels['heater_bed'].get_style_context().add_class("printing-info")
heater_bed_box = Gtk.Box(spacing=0)
heater_bed_box.add(heater_bed)
heater_bed_box.add(self.labels['heater_bed'])
temp_grid = self._gtk.HomogeneousGrid() temp_grid = self._gtk.HomogeneousGrid()
self.current_extruder = self._printer.get_stat("toolhead","extruder") self.current_extruder = self._printer.get_stat("toolhead","extruder")
temp_grid.attach(self.labels[self.current_extruder + '_box'], 0, 0, 1, 1) temp_grid.attach(self.labels[self.current_extruder + '_box'], 0, 0, 1, 1)
temp_grid.attach(heater_bed_box, 1, 0, 1, 1) if self._printer.has_heated_bed():
heater_bed = self._gtk.Image("bed.svg", None, .6, .6)
self.labels['heater_bed'] = Gtk.Label(label="")
self.labels['heater_bed'].get_style_context().add_class("printing-info")
heater_bed_box = Gtk.Box(spacing=0)
heater_bed_box.add(heater_bed)
heater_bed_box.add(self.labels['heater_bed'])
temp_grid.attach(heater_bed_box, 1, 0, 1, 1)
self.labels['temp_grid'] = temp_grid self.labels['temp_grid'] = temp_grid
# Create time remaining items # Create time remaining items
@ -347,10 +348,11 @@ class JobStatusPanel(ScreenPanel):
return return
_ = self.lang.gettext _ = self.lang.gettext
self.update_temp("heater_bed", if self._printer.has_heated_bed():
self._printer.get_dev_stat("heater_bed","temperature"), self.update_temp("heater_bed",
self._printer.get_dev_stat("heater_bed","target") 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"),

7
panels/main_menu.py
View File

@ -32,10 +32,11 @@ class MainPanel(MenuPanel):
eq_grid.attach(self.labels[x], i%2, i/2, 1, 1) eq_grid.attach(self.labels[x], i%2, i/2, 1, 1)
i += 1 i += 1
self.labels['heater_bed'] = self._gtk.ButtonImage("bed", self._gtk.formatTemperatureString(0, 0)) if self._printer.has_heated_bed():
self.labels['heater_bed'] = self._gtk.ButtonImage("bed", self._gtk.formatTemperatureString(0, 0))
width = 2 if i > 1 else 1 width = 2 if i > 1 else 1
eq_grid.attach(self.labels['heater_bed'], 0, i/2+1, width, 1) eq_grid.attach(self.labels['heater_bed'], 0, i/2+1, width, 1)
grid.attach(eq_grid, 0, 0, 1, 1) grid.attach(eq_grid, 0, 0, 1, 1)

20
panels/preheat.py
View File

@ -33,10 +33,11 @@ class PreheatPanel(ScreenPanel):
eq_grid.attach(self.labels[x], i%2, i/2, 1, 1) eq_grid.attach(self.labels[x], i%2, i/2, 1, 1)
i += 1 i += 1
self.labels["heater_bed"] = self._gtk.ToggleButtonImage("bed", self._gtk.formatTemperatureString(0, 0)) if self._printer.has_heated_bed():
self.labels["heater_bed"].connect('clicked', self.select_heater, "heater_bed") self.labels["heater_bed"] = self._gtk.ToggleButtonImage("bed", self._gtk.formatTemperatureString(0, 0))
width = 2 if i > 1 else 1 self.labels["heater_bed"].connect('clicked', self.select_heater, "heater_bed")
eq_grid.attach(self.labels["heater_bed"], 0, i/2+1, width, 1) width = 2 if i > 1 else 1
eq_grid.attach(self.labels["heater_bed"], 0, i/2+1, width, 1)
self.labels["control_grid"] = self._gtk.HomogeneousGrid() self.labels["control_grid"] = self._gtk.HomogeneousGrid()
@ -69,7 +70,7 @@ class PreheatPanel(ScreenPanel):
if x not in self.active_heaters: if x not in self.active_heaters:
self.select_heater(None, x) self.select_heater(None, x)
if "heater_bed" not in self.active_heaters: if self._printer.has_heated_bed() and "heater_bed" not in self.active_heaters:
self.select_heater(None, "heater_bed") self.select_heater(None, "heater_bed")
def select_heater(self, widget, heater): def select_heater(self, widget, heater):
@ -108,10 +109,11 @@ class PreheatPanel(ScreenPanel):
if action != "notify_status_update": if action != "notify_status_update":
return return
self.update_temp("heater_bed", if self._printer.has_heated_bed():
self._printer.get_dev_stat("heater_bed","temperature"), self.update_temp("heater_bed",
self._printer.get_dev_stat("heater_bed","target") 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"),

18
panels/temperature.py
View File

@ -39,10 +39,11 @@ class TemperaturePanel(ScreenPanel):
print ("Primary tool: " + primary_tool) 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')
self.labels["heater_bed"] = self._gtk.ToggleButtonImage("bed", self._gtk.formatTemperatureString(0, 0)) if self._printer.has_heated_bed():
self.labels["heater_bed"].connect('clicked', self.select_heater, "heater_bed") self.labels["heater_bed"] = self._gtk.ToggleButtonImage("bed", self._gtk.formatTemperatureString(0, 0))
width = 2 if i > 1 else 1 self.labels["heater_bed"].connect('clicked', self.select_heater, "heater_bed")
eq_grid.attach(self.labels["heater_bed"], 0, i/2+1, width, 1) width = 2 if i > 1 else 1
eq_grid.attach(self.labels["heater_bed"], 0, i/2+1, width, 1)
self.labels["control_grid"] = self._gtk.HomogeneousGrid() self.labels["control_grid"] = self._gtk.HomogeneousGrid()
@ -181,10 +182,11 @@ class TemperaturePanel(ScreenPanel):
if action != "notify_status_update": if action != "notify_status_update":
return return
self.update_temp("heater_bed", if self._printer.has_heated_bed():
self._printer.get_dev_stat("heater_bed","temperature"), self.update_temp("heater_bed",
self._printer.get_dev_stat("heater_bed","target") 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"),