From ed3de53587e2d1a4a231ca1504cc0c73f807b41c Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Wed, 22 Jul 2020 17:07:44 -0400 Subject: [PATCH] Add New G34 mode for current adjustable drivers TODO : Sanity checks, Finish DAC mode, Test on Rambo --- Marlin/Configuration_adv.h | 19 +++++++++++++++++++ Marlin/src/lcd/language/language_en.h | 6 ++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 512582e630..a71242bd2f 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -3511,6 +3511,25 @@ //#define GANTRY_CALIBRATION_COMMANDS_POST "G28" #endif +/** + * Modern replacement for the Prusa TMC_Z_CALIBRATION + * Adds capability to work with any adjustable current drivers + * Implements as G34 as M915 is deprecated + */ + +//#define MECHANICAL_GANTRY_CALIBRATION +#if ENABLED(MECHANICAL_GANTRY_CALIBRATION) + #define GANTRY_CALIBRATION_CURRENT 600 // Default calibration current in ma + #define GANTRY_CALIBRATION_EXTRA_HEIGHT 15 // Extra distance in mm past Z_###_POS to move + #define GANTRY_CALIBRATION_DIRECTION 1 // Set to 1 for Max or 0 for min + #define GANTRY_CALIBRATION_FEEDRATE 500 // Feedrate for correction move + + //#define GANTRY_CALIBRATION_SAFE_POSITION {X_CENTER, Y_CENTER} // Safe position for nozzle + //#define GANTRY_CALIBRATION_XY_PARK_FEEDRATE 3000 // XY Park Feedrate - MMM + //#define GANTRY_CALIBRATION_COMMANDS_PRE "" + //#define GANTRY_CALIBRATION_COMMANDS_POST "G28" +#endif + /** * MAX7219 Debug Matrix * diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index e8b4769cc2..13ab0eb443 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -26,6 +26,7 @@ * * LCD Menu Messages * See also https://marlinfw.org/docs/development/lcd_language.html + * */ #define en 1234 @@ -67,9 +68,7 @@ namespace Language_en { PROGMEM Language_Str MSG_AUTO_HOME_Z = _UxGT("Home Z"); PROGMEM Language_Str MSG_AUTO_Z_ALIGN = _UxGT("Auto Z-Align"); PROGMEM Language_Str MSG_ASSISTED_TRAMMING = _UxGT("Assisted Tramming"); - PROGMEM Language_Str MSG_ITERATION = _UxGT("G34 Iteration: %i"); - PROGMEM Language_Str MSG_DECREASING_ACCURACY = _UxGT("Accuracy Decreasing!"); - PROGMEM Language_Str MSG_ACCURACY_ACHIEVED = _UxGT("Accuracy Achieved"); + PROGMEM Language_Str DECREASING_ACCURACY = _UxGT("Decreasing accuracy detected."); PROGMEM Language_Str MSG_LEVEL_BED_HOMING = _UxGT("Homing XYZ"); PROGMEM Language_Str MSG_LEVEL_BED_WAITING = _UxGT("Click to Begin"); PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT = _UxGT("Next Point"); @@ -368,7 +367,6 @@ namespace Language_en { PROGMEM Language_Str MSG_PAUSING = _UxGT("Pausing..."); PROGMEM Language_Str MSG_PAUSE_PRINT = _UxGT("Pause Print"); PROGMEM Language_Str MSG_RESUME_PRINT = _UxGT("Resume Print"); - PROGMEM Language_Str MSG_HOST_START_PRINT = _UxGT("Host Start"); PROGMEM Language_Str MSG_STOP_PRINT = _UxGT("Stop Print"); PROGMEM Language_Str MSG_PRINTING_OBJECT = _UxGT("Printing Object"); PROGMEM Language_Str MSG_CANCEL_OBJECT = _UxGT("Cancel Object");