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

Track the status of calibration and inform the user more (#402)

Browse Source
This commit is contained in:
Alfredo Monclus 2022-01-12 22:03:57 -03:00 committed by GitHub
parent 0aab9ff4c4
commit 2982eb9645
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
panels/zcalibrate.py
View File

@ -36,9 +36,15 @@ class ZCalibratePanel(ScreenPanel):
self.widgets['zpos'].connect("clicked", self.move, "+")
self.widgets['zneg'] = self._gtk.ButtonImage('z-closer', _("Lower Nozzle"), 'color1')
self.widgets['zneg'].connect("clicked", self.move, "-")
self.widgets['start'] = self._gtk.ButtonImage('resume', _("Start"), 'color3')
if (self._printer.config_section_exists("probe") or self._printer.config_section_exists("bltouch")):
self.widgets['start'] = self._gtk.ButtonImage('resume', _("Start") + "\n(Probe)", 'color3')
self.widgets['start'].connect("clicked", self.start_calibration)
elif "Mesh" in self.title:
self.widgets['start'] = self._gtk.ButtonImage('resume', _("Start") + "\n(Mesh)", 'color3')
self.widgets['start'].connect("clicked", self.start_mesh)
else:
self.widgets['start'] = self._gtk.ButtonImage('resume', _("Start") + "\n(Endstop)", 'color3')
self.widgets['start'].connect("clicked", self.start_calibration)
self.widgets['complete'] = self._gtk.ButtonImage('complete', _('Accept'), 'color3')
self.widgets['complete'].connect("clicked", self.accept)
self.widgets['cancel'] = self._gtk.ButtonImage('cancel', _('Abort'), 'color2')
@ -77,9 +83,15 @@ class ZCalibratePanel(ScreenPanel):
grid.attach(self.widgets['complete'], 2, 0, 1, 1)
grid.attach(distances, 0, 2, 3, 1)
grid.attach(self.widgets['cancel'], 2, 1, 1, 1)
self.buttons_not_calibrating()
self.content.add(grid)
def start_mesh(self, widget):
if self._screen.printer.get_stat("toolhead", "homed_axes") != "xyz":
self._screen._ws.klippy.gcode_script(KlippyGcodes.HOME)
self._screen._ws.klippy.gcode_script("BED_MESH_CALIBRATE")
def start_calibration(self, widget):
if self._screen.printer.get_stat("toolhead", "homed_axes") != "xyz":
self._screen._ws.klippy.gcode_script(KlippyGcodes.HOME)
@ -96,11 +108,26 @@ class ZCalibratePanel(ScreenPanel):
self._screen._ws.klippy.gcode_script(KlippyGcodes.Z_ENDSTOP_CALIBRATE)
def process_update(self, action, data):
if action != "notify_status_update":
return
_ = self.lang.gettext
if action == "notify_status_update":
if "toolhead" in data and "position" in data['toolhead']:
self.updatePosition(data['toolhead']['position'])
elif action == "notify_gcode_response":
if "unknown" in data.lower():
self.buttons_not_calibrating()
elif "save_config" in data.lower():
self.buttons_not_calibrating()
self._screen.show_popup_message(_("Calibrated, save configuration to make it permanent"), level=1)
elif "out of range" in data.lower():
self._screen.show_popup_message("%s" % data)
self.buttons_not_calibrating()
elif "fail" in data.lower() and "use testz" in data.lower():
self._screen.show_popup_message(_("Failed, adjust position first"))
self.buttons_not_calibrating()
elif "use testz" in data.lower() or "use abort" in data.lower() or "z position" in data.lower():
self.buttons_calibrating()
return
def updatePosition(self, position):
self.widgets['zposition'].set_text(str(round(position[2], 2)))
@ -128,13 +155,13 @@ class ZCalibratePanel(ScreenPanel):
def abort(self, widget):
logging.info("Aborting calibration")
self._screen._ws.klippy.gcode_script(KlippyGcodes.ABORT)
self.buttons_not_calibrating()
self.menu_return(widget)
def accept(self, widget):
logging.info("Accepting Z position")
self._screen._ws.klippy.gcode_script(KlippyGcodes.ACCEPT)
# We need to track if the machine is calibrating or not to activate the appropriate buttons
def buttons_calibrating(self):
self.widgets['start'].get_style_context().remove_class('color3')
self.widgets['start'].set_sensitive(False)