bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Touch-MI Menu and Manual Deploy option (#14290)

Browse Source
This commit is contained in:
Tanguy Pruvot
2019-07-01 06:55:27 +02:00
committed by Scott Lahteine
parent dab2f0c89c
commit 24655a6bf3
111 changed files with 269 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/src/lcd/language/language_en.h
View File

@ -948,6 +948,21 @@
#ifndef MSG_BLTOUCH_MODE_CHANGE
#define MSG_BLTOUCH_MODE_CHANGE _UxGT("DANGER: Bad settings can cause damage! Proceed anyway?")
#endif
#ifndef MSG_TOUCHMI_PROBE
#define MSG_TOUCHMI_PROBE _UxGT("TouchMI")
#endif
#ifndef MSG_TOUCHMI_INIT
#define MSG_TOUCHMI_INIT _UxGT("Init TouchMI")
#endif
#ifndef MSG_TOUCHMI_ZTEST
#define MSG_TOUCHMI_ZTEST _UxGT("Z offset Test")
#endif
#ifndef MSG_TOUCHMI_SAVE
#define MSG_TOUCHMI_SAVE _UxGT("Save")
#endif
#ifndef MSG_MANUAL_DEPLOY_TOUCHMI
#define MSG_MANUAL_DEPLOY_TOUCHMI _UxGT("Deploy TouchMI")
#endif
#ifndef MSG_MANUAL_DEPLOY
#define MSG_MANUAL_DEPLOY _UxGT("Deploy Z-Probe")
#endif

5
Marlin/src/lcd/language/language_fr.h
View File

@ -334,6 +334,11 @@
#define MSG_BLTOUCH_MODE_STORE_5V _UxGT("Mise en 5V")
#define MSG_BLTOUCH_MODE_STORE_OD _UxGT("Mise en OD")
#define MSG_BLTOUCH_MODE_ECHO _UxGT("Afficher Mode")
#define MSG_TOUCHMI_PROBE _UxGT("TouchMI")
#define MSG_TOUCHMI_INIT _UxGT("Init. TouchMI")
#define MSG_TOUCHMI_ZTEST _UxGT("Test décalage Z")
#define MSG_TOUCHMI_SAVE _UxGT("Sauvegarde")
#define MSG_MANUAL_DEPLOY_TOUCHMI _UxGT("Déployer TouchMI")
#define MSG_MANUAL_DEPLOY _UxGT("Déployer Sonde Z")
#define MSG_MANUAL_STOW _UxGT("Ranger Sonde Z")
#define MSG_HOME _UxGT("Origine") // Used as MSG_HOME " " MSG_X MSG_Y MSG_Z " " MSG_FIRST

17
Marlin/src/lcd/menu/menu_configuration.cpp
View File

@ -219,6 +219,19 @@ static void lcd_factory_settings() {
#endif
#if ENABLED(TOUCH_MI_PROBE)
void menu_touchmi() {
START_MENU();
ui.defer_status_screen();
MENU_BACK(MSG_CONFIGURATION);
MENU_ITEM(gcode, MSG_TOUCHMI_INIT, PSTR("M851 Z0\nG28\nG1 F200 Z0"));
MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
MENU_ITEM(gcode, MSG_TOUCHMI_SAVE, PSTR("M500\nG1 F200 Z10"));
MENU_ITEM(gcode, MSG_TOUCHMI_ZTEST, PSTR("G28\nG1 F200 Z0"));
END_MENU();
}
#endif
#if ENABLED(CASE_LIGHT_MENU)
#include "../../feature/caselight.h"
@ -347,6 +360,10 @@ void menu_configuration() {
#if ENABLED(BLTOUCH)
MENU_ITEM(submenu, MSG_BLTOUCH, menu_bltouch);
#endif
#if ENABLED(TOUCH_MI_PROBE)
MENU_ITEM(submenu, MSG_TOUCHMI_PROBE, menu_touchmi);
#endif
}
//