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

fine_tune: Remove fan from fine tune panel. Add fan to print menu

Browse Source
This commit is contained in:
Jordan Ruthe 2020-12-04 14:20:31 -05:00
parent c7496973ee
commit 46410f797a
3 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changelog.md
View File

@ -1,9 +1,11 @@
## Changelog ## Changelog
#### 2020 12 04 #### 2020 12 04
* Removed fan options from fine tuning
* Add bed mesh panel * Add bed mesh panel
* Added more variables to the menu enable option * Added more variables to the menu enable option
* Hide extrude panel during printing if the printer is not paused * Hide extrude panel during printing if the printer is not paused
* Add fan panel to print control menu
#### 2020 12 02 #### 2020 12 02
* Change panel layout: Added Title, Back, Emergency Stop, and Home to panels. * Change panel layout: Added Title, Back, Emergency Stop, and Home to panels.

17
ks_includes/KlipperScreen.conf
View File

@ -143,6 +143,17 @@ name: Fine Tuning
icon: fan icon: fan
panel: fine_tune panel: fine_tune
[menu __print fan]
name: Fan
icon: fan
panel: fan
[menu __print extrude]
name: Extrude
icon: filament
panel: extrude
enable: {{ printer.pause_resume.is_paused == True }}
[menu __print network] [menu __print network]
name: Network name: Network
icon: network icon: network
@ -152,9 +163,3 @@ panel: network
name: System name: System
icon: info icon: info
panel: system panel: system
[menu __print extrude]
name: Extrude
icon: filament
panel: extrude
enable: {{ printer.pause_resume.is_paused == True }}

28
panels/fine_tune.py
View File

@ -45,25 +45,15 @@ class FineTunePanel(ScreenPanel):
grid.attach(self.labels['zoffset'], 0, 1, 1, 1) grid.attach(self.labels['zoffset'], 0, 1, 1, 1)
grid.attach(self.labels['z-'], 0, 2, 1, 1) grid.attach(self.labels['z-'], 0, 2, 1, 1)
self.labels['fan+'] = KlippyGtk.ButtonImage("fan-on", _("Fan +"), "color2")
self.labels['fan+'].connect("clicked", self.change_fan, "+")
self.labels['fanspeed'] = Gtk.Label("100%")
self.labels['fanspeed'].get_style_context().add_class('temperature_entry')
self.labels['fan-'] = KlippyGtk.ButtonImage("fan-off", _("Fan -"), "color2")
self.labels['fan-'].connect("clicked", self.change_fan, "-")
grid.attach(self.labels['fan+'], 1, 0, 1, 1)
grid.attach(self.labels['fanspeed'], 1, 1, 1, 1)
grid.attach(self.labels['fan-'], 1, 2, 1, 1)
self.labels['speed+'] = KlippyGtk.ButtonImage("speed-step", _("Speed +"), "color3") self.labels['speed+'] = KlippyGtk.ButtonImage("speed-step", _("Speed +"), "color3")
self.labels['speed+'].connect("clicked", self.change_speed, "+") self.labels['speed+'].connect("clicked", self.change_speed, "+")
self.labels['speedfactor'] = Gtk.Label("100%") self.labels['speedfactor'] = Gtk.Label("100%")
self.labels['speedfactor'].get_style_context().add_class('temperature_entry') self.labels['speedfactor'].get_style_context().add_class('temperature_entry')
self.labels['speed-'] = KlippyGtk.ButtonImage("speed-step", _("Speed -"), "color3") self.labels['speed-'] = KlippyGtk.ButtonImage("speed-step", _("Speed -"), "color3")
self.labels['speed-'].connect("clicked", self.change_speed, "-") self.labels['speed-'].connect("clicked", self.change_speed, "-")
grid.attach(self.labels['speed+'], 2, 0, 1, 1) grid.attach(self.labels['speed+'], 1, 0, 1, 1)
grid.attach(self.labels['speedfactor'], 2, 1, 1, 1) grid.attach(self.labels['speedfactor'], 1, 1, 1, 1)
grid.attach(self.labels['speed-'], 2, 2, 1, 1) grid.attach(self.labels['speed-'], 1, 2, 1, 1)
self.labels['extrude+'] = KlippyGtk.ButtonImage("extrude", _("Extrusion +"), "color4") self.labels['extrude+'] = KlippyGtk.ButtonImage("extrude", _("Extrusion +"), "color4")
self.labels['extrude+'].connect("clicked", self.change_extrusion, "+") self.labels['extrude+'].connect("clicked", self.change_extrusion, "+")
@ -71,9 +61,9 @@ class FineTunePanel(ScreenPanel):
self.labels['extrudefactor'].get_style_context().add_class('temperature_entry') self.labels['extrudefactor'].get_style_context().add_class('temperature_entry')
self.labels['extrude-'] = KlippyGtk.ButtonImage("retract", _("Extrusion -"), "color4") self.labels['extrude-'] = KlippyGtk.ButtonImage("retract", _("Extrusion -"), "color4")
self.labels['extrude-'].connect("clicked", self.change_extrusion, "-") self.labels['extrude-'].connect("clicked", self.change_extrusion, "-")
grid.attach(self.labels['extrude+'], 3, 0, 1, 1) grid.attach(self.labels['extrude+'], 2, 0, 1, 1)
grid.attach(self.labels['extrudefactor'], 3, 1, 1, 1) grid.attach(self.labels['extrudefactor'], 2, 1, 1, 1)
grid.attach(self.labels['extrude-'], 3, 2, 1, 1) grid.attach(self.labels['extrude-'], 2, 2, 1, 1)
# babystepping grid # babystepping grid
@ -115,7 +105,7 @@ class FineTunePanel(ScreenPanel):
self.labels["1"].set_active(True) self.labels["1"].set_active(True)
grid.attach(deltgrid, 1, 3, 3, 1) grid.attach(deltgrid, 1, 3, 2, 1)
#self.panel = grid #self.panel = grid
self.content.add(grid) self.content.add(grid)
@ -137,10 +127,6 @@ class FineTunePanel(ScreenPanel):
self.speed = int(data["gcode_move"]["speed_factor"]*100) self.speed = int(data["gcode_move"]["speed_factor"]*100)
self.labels['speedfactor'].set_text("%3d%%" % self.speed) self.labels['speedfactor'].set_text("%3d%%" % self.speed)
if "fan" in data and "speed" in data['fan']:
self.fan = int(round(data['fan']['speed'],2)*100)
self.labels['fanspeed'].set_text("%3d%%" % self.fan)
def change_babystepping(self, widget, dir): def change_babystepping(self, widget, dir):
if dir == "+": if dir == "+":
gcode = "SET_GCODE_OFFSET Z_ADJUST=%s MOVE=1" % self.bs_delta gcode = "SET_GCODE_OFFSET Z_ADJUST=%s MOVE=1" % self.bs_delta