From 2cc9774f34e39802be01542dc2d6c9a8dc650a0e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 28 Apr 2017 18:41:18 -0500
Subject: [PATCH] Apply bltouch_menu
As proffered in #6252
---
Marlin/language_en.h | 3 +++
Marlin/ultralcd.cpp | 29 +++++++++++++++++++++++------
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/Marlin/language_en.h b/Marlin/language_en.h
index cbc54d9544..35a0cbb891 100644
--- a/Marlin/language_en.h
+++ b/Marlin/language_en.h
@@ -408,6 +408,9 @@
#ifndef MSG_ZPROBE_OUT
#define MSG_ZPROBE_OUT _UxGT("Z probe out. bed")
#endif
+#ifndef MSG_BLTOUCH
+ #define MSG_BLTOUCH _UxGT("BLTouch")
+#endif
#ifndef MSG_BLTOUCH_SELFTEST
#define MSG_BLTOUCH_SELFTEST _UxGT("BLTouch Self-Test")
#endif
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index 608dab5c63..39536abf0c 100755
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -34,10 +34,6 @@
#include "buzzer.h"
#endif
-#if ENABLED(BLTOUCH)
- #include "endstops.h"
-#endif
-
#if ENABLED(PRINTCOUNTER)
#include "printcounter.h"
#include "duration_t.h"
@@ -723,6 +719,28 @@ void kill_screen(const char* lcd_msg) {
#endif // MENU_ITEM_CASE_LIGHT
+ #if ENABLED(BLTOUCH)
+
+ /**
+ *
+ * "BLTouch" submenu
+ *
+ */
+ static void bltouch_menu() {
+ START_MENU();
+ //
+ // ^ Main
+ //
+ MENU_BACK(MSG_MAIN);
+ MENU_ITEM(gcode, MSG_BLTOUCH_RESET, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_RESET)));
+ MENU_ITEM(gcode, MSG_BLTOUCH_SELFTEST, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_SELFTEST)));
+ MENU_ITEM(gcode, MSG_BLTOUCH_DEPLOY, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_DEPLOY)));
+ MENU_ITEM(gcode, MSG_BLTOUCH_STOW, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_STOW)));
+ END_MENU();
+ }
+
+ #endif // BLTOUCH
+
#if ENABLED(LCD_PROGRESS_BAR_TEST)
static void progress_bar_test() {
@@ -792,8 +810,7 @@ void kill_screen(const char* lcd_msg) {
#endif
#if ENABLED(BLTOUCH)
- if (!endstops.z_probe_enabled && TEST_BLTOUCH())
- MENU_ITEM(gcode, MSG_BLTOUCH_RESET, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_RESET)));
+ MENU_ITEM(submenu, MSG_BLTOUCH, bltouch_menu);
#endif
if (planner.movesplanned() || IS_SD_PRINTING) {
--
GitLab