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

BLTouch V3.1 changes (#14104)

Browse Source
This commit is contained in:
InsanityAutomation
2019-05-25 22:56:47 -04:00
committed by Scott Lahteine
parent 14fe41f6b2
commit 49e83dd7c8
103 changed files with 6059 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Marlin/src/lcd/menu/menu_advanced.cpp
View File

@ -39,11 +39,6 @@
#include "../../module/probe.h"
#endif
#if ENABLED(BLTOUCH)
#include "../../module/endstops.h"
#include "../../feature/bltouch.h"
#endif
#if ENABLED(PIDTEMP)
#include "../../module/temperature.h"
#endif
@ -683,15 +678,6 @@ void menu_advanced_settings() {
MENU_ITEM_EDIT(bool, MSG_ENDSTOP_ABORT, &planner.abort_on_endstop_hit);
#endif
//
// BLTouch Self-Test and Reset
//
#if ENABLED(BLTOUCH)
MENU_ITEM(function, MSG_BLTOUCH_SELFTEST, []{ bltouch._selftest(); ui.refresh(); });
if (!endstops.z_probe_enabled && bltouch.triggered())
MENU_ITEM(function, MSG_BLTOUCH_RESET, []{ bltouch._reset(); ui.refresh(); });
#endif
#if ENABLED(SD_FIRMWARE_UPDATE)
bool sd_update_state = settings.sd_update_status();
MENU_ITEM_EDIT_CALLBACK(bool, MSG_SD_UPDATE, &sd_update_state, []{

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

@ -172,6 +172,24 @@ static void lcd_factory_settings() {
#if ENABLED(BLTOUCH)
#if ENABLED(BLTOUCH_LCD_VOLTAGE_MENU)
void bltouch_report() {
SERIAL_ECHOLNPAIR("EEPROM Last BLTouch Mode - ", (int)bltouch.last_written_mode);
SERIAL_ECHOLNPGM("Configuration BLTouch Mode - "
#if ENABLED(BLTOUCH_SET_5V_MODE)
"5V"
#else
"OD"
#endif
);
char mess[21];
strcpy_P(mess, PSTR("BLTouch Mode - "));
sprintf_P(&mess[15], bltouch.last_written_mode ? PSTR("5V") : PSTR("OD"));
ui.set_status(mess);
ui.return_to_status();
}
#endif
void menu_bltouch() {
START_MENU();
MENU_BACK(MSG_CONFIGURATION);
@ -180,9 +198,14 @@ static void lcd_factory_settings() {
MENU_ITEM(function, MSG_BLTOUCH_DEPLOY, bltouch._deploy);
MENU_ITEM(function, MSG_BLTOUCH_STOW, bltouch._stow);
MENU_ITEM(function, MSG_BLTOUCH_SW_MODE, bltouch._set_SW_mode);
MENU_ITEM(function, MSG_BLTOUCH_5V_MODE, bltouch._set_5V_mode);
MENU_ITEM(function, MSG_BLTOUCH_OD_MODE, bltouch._set_OD_mode);
MENU_ITEM(function, MSG_BLTOUCH_MODE_STORE, bltouch._mode_store);
#if ENABLED(BLTOUCH_LCD_VOLTAGE_MENU)
MENU_ITEM(function, MSG_BLTOUCH_5V_MODE, bltouch._set_5V_mode);
MENU_ITEM(function, MSG_BLTOUCH_OD_MODE, bltouch._set_OD_mode);
MENU_ITEM(function, MSG_BLTOUCH_MODE_STORE, bltouch._mode_store);
MENU_ITEM(function, MSG_BLTOUCH_MODE_STORE_5V, bltouch.mode_conv_5V);
MENU_ITEM(function, MSG_BLTOUCH_MODE_STORE_OD, bltouch.mode_conv_OD);
MENU_ITEM(function, MSG_BLTOUCH_MODE_ECHO, bltouch_report);
#endif
END_MENU();
}