From 145d9005d149cc8668539a7774092876739f1ea7 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 21 Sep 2016 01:33:30 -0500 Subject: [PATCH] Fix BLTOUCH string and SERVO_DELAY --- Marlin/Conditionals_LCD.h | 6 ++++-- Marlin/ultralcd.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Marlin/Conditionals_LCD.h b/Marlin/Conditionals_LCD.h index a5c5dc4b7a..13dbf8a006 100644 --- a/Marlin/Conditionals_LCD.h +++ b/Marlin/Conditionals_LCD.h @@ -328,13 +328,15 @@ #define NUM_SERVOS (Z_ENDSTOP_SERVO_NR + 1) #endif #undef DEACTIVATE_SERVOS_AFTER_MOVE + #undef SERVO_DELAY + #define SERVO_DELAY 50 #undef Z_SERVO_ANGLES #define Z_SERVO_ANGLES { BLTOUCH_DEPLOY, BLTOUCH_STOW } #define BLTOUCH_DEPLOY 10 - #define BLTOUCH_STOW 90 + #define BLTOUCH_STOW 90 #define BLTOUCH_SELFTEST 120 - #define BLTOUCH_RELEASE 160 + #define BLTOUCH_RESET 160 #define _TEST_BLTOUCH(P) (READ(P##_PIN) != P##_ENDSTOP_INVERTING) #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index b4214de26f..d327103c9e 100755 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1253,7 +1253,7 @@ void kill_screen(const char* lcd_msg) { // BLTouch Self-Test and Reset // #if ENABLED(BLTOUCH) - MENU_ITEM(gcode, MSG_BLTOUCH_TEST, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_SELFTEST))); + MENU_ITEM(gcode, MSG_BLTOUCH_SELFTEST, PSTR("M280 P" STRINGIFY(Z_ENDSTOP_SERVO_NR) " S" STRINGIFY(BLTOUCH_SELFTEST))); 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))); #endif