From 3db4452d281958e87a7f3ba65091ff3358e17fe4 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 14 Oct 2021 18:56:32 -0500 Subject: [PATCH] settings tweak --- Marlin/src/gcode/bedlevel/G35.cpp | 1 - Marlin/src/module/settings.cpp | 17 +++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Marlin/src/gcode/bedlevel/G35.cpp b/Marlin/src/gcode/bedlevel/G35.cpp index 1013e080bb..8cabb92382 100644 --- a/Marlin/src/gcode/bedlevel/G35.cpp +++ b/Marlin/src/gcode/bedlevel/G35.cpp @@ -37,7 +37,6 @@ #include "../../feature/bltouch.h" #endif - #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE) #include "../../core/debug_out.h" diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp index f33fe3e7dd..bde8c2f3bd 100644 --- a/Marlin/src/module/settings.cpp +++ b/Marlin/src/module/settings.cpp @@ -277,7 +277,7 @@ typedef struct SettingsDataStruct { // BLTOUCH // bool bltouch_last_written_mode; - bool high_speed_mode; + bool bltouch_high_speed_mode; // // Kinematic Settings @@ -863,9 +863,9 @@ void MarlinSettings::postprocess() { const bool bltouch_last_written_mode = TERN(BLTOUCH, bltouch.last_written_mode, false); EEPROM_WRITE(bltouch_last_written_mode); - _FIELD_TEST(high_speed_mode); - const bool high_speed_mode = TERN(BLTOUCH, bltouch.high_speed_mode, false); - EEPROM_WRITE(high_speed_mode); + _FIELD_TEST(bltouch_high_speed_mode); + const bool bltouch_high_speed_mode = TERN(BLTOUCH, bltouch.high_speed_mode, false); + EEPROM_WRITE(bltouch_high_speed_mode); } // @@ -1738,13 +1738,13 @@ void MarlinSettings::postprocess() { #endif EEPROM_READ(bltouch_last_written_mode); - _FIELD_TEST(high_speed_mode); + _FIELD_TEST(bltouch_high_speed_mode); #if ENABLED(BLTOUCH) - const bool &high_speed_mode = bltouch.high_speed_mode; + const bool &bltouch_high_speed_mode = bltouch.high_speed_mode; #else - bool high_speed_mode; + bool bltouch_high_speed_mode; #endif - EEPROM_READ(high_speed_mode); + EEPROM_READ(bltouch_high_speed_mode); } // @@ -2745,6 +2745,7 @@ void MarlinSettings::reset() { // BLTouch // TERN_(BLTOUCH_HS_MODE, bltouch.high_speed_mode = true); + // // Kinematic settings //