0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

G425/G35 menu items; G425 pre- and post- scripts (#18737)

Browse source
This commit is contained in:
InsanityAutomation 2020-07-25 00:31:15 -04:00 committed by GitHub
parent 60500c0c49
commit c5ec80d6c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Marlin/Configuration_adv.h
View file

@ -898,6 +898,9 @@
//#define CALIBRATION_GCODE //#define CALIBRATION_GCODE
#if ENABLED(CALIBRATION_GCODE) #if ENABLED(CALIBRATION_GCODE)
//#define CALIBRATION_SCRIPT_PRE "M117 Starting Auto-Calibration\nT0\nG28\nG12\nM117 Calibrating..."
//#define CALIBRATION_SCRIPT_POST "M500\nM117 Calibration data saved"
#define CALIBRATION_MEASUREMENT_RESOLUTION 0.01 // mm #define CALIBRATION_MEASUREMENT_RESOLUTION 0.01 // mm
#define CALIBRATION_FEEDRATE_SLOW 60 // mm/m #define CALIBRATION_FEEDRATE_SLOW 60 // mm/m

9
Marlin/src/gcode/calibrate/G425.cpp
View file

@ -576,6 +576,11 @@ inline void calibrate_all() {
* no args - Perform entire calibration sequence (backlash + position on all toolheads) * no args - Perform entire calibration sequence (backlash + position on all toolheads)
*/ */
void GcodeSuite::G425() { void GcodeSuite::G425() {
#ifdef CALIBRATION_SCRIPT_PRE
GcodeSuite::process_subcommands_now_P(PSTR(CALIBRATION_SCRIPT_PRE));
#endif
TEMPORARY_SOFT_ENDSTOP_STATE(false); TEMPORARY_SOFT_ENDSTOP_STATE(false);
TEMPORARY_BED_LEVELING_STATE(false); TEMPORARY_BED_LEVELING_STATE(false);
@ -606,6 +611,10 @@ void GcodeSuite::G425() {
#endif #endif
else else
calibrate_all(); calibrate_all();
#ifdef CALIBRATION_SCRIPT_POST
GcodeSuite::process_subcommands_now_P(PSTR(CALIBRATION_SCRIPT_POST));
#endif
} }
#endif // CALIBRATION_GCODE #endif // CALIBRATION_GCODE

1
Marlin/src/lcd/language/language_en.h
View file

@ -66,6 +66,7 @@ namespace Language_en {
PROGMEM Language_Str MSG_AUTO_HOME_Y = _UxGT("Home Y"); PROGMEM Language_Str MSG_AUTO_HOME_Y = _UxGT("Home Y");
PROGMEM Language_Str MSG_AUTO_HOME_Z = _UxGT("Home Z"); 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_AUTO_Z_ALIGN = _UxGT("Auto Z-Align");
PROGMEM Language_Str MSG_ASSISTED_TRAMMING = _UxGT("Assisted Tramming");
PROGMEM Language_Str MSG_LEVEL_BED_HOMING = _UxGT("Homing XYZ"); 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_WAITING = _UxGT("Click to Begin");
PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT = _UxGT("Next Point"); PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT = _UxGT("Next Point");

14
Marlin/src/lcd/menu/menu_motion.cpp
View file

@ -325,6 +325,13 @@ void menu_motion() {
GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z")); GCODES_ITEM(MSG_AUTO_HOME_Z, PSTR("G28Z"));
#endif #endif
//
// Auto-calibration
//
#if ENABLED(CALIBRATION_GCODE)
GCODES_ITEM(MSG_AUTO_CALIBRATE, PSTR("G425"));
#endif
// //
// Auto Z-Align // Auto Z-Align
// //
@ -332,6 +339,13 @@ void menu_motion() {
GCODES_ITEM(MSG_AUTO_Z_ALIGN, PSTR("G34")); GCODES_ITEM(MSG_AUTO_Z_ALIGN, PSTR("G34"));
#endif #endif
//
// Assisted Bed Tramming
//
#if ENABLED(ASSISTED_TRAMMING)
GCODES_ITEM(MSG_ASSISTED_TRAMMING, PSTR("G35"));
#endif
// //
// Level Bed // Level Bed
// //