Browse Source

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

InsanityAutomation 4 years ago
parent
commit
c5ec80d6c7
No account linked to committer's email address

+ 3
- 0
Marlin/Configuration_adv.h View File

898
 //#define CALIBRATION_GCODE
898
 //#define CALIBRATION_GCODE
899
 #if ENABLED(CALIBRATION_GCODE)
899
 #if ENABLED(CALIBRATION_GCODE)
900
 
900
 
901
+  //#define CALIBRATION_SCRIPT_PRE  "M117 Starting Auto-Calibration\nT0\nG28\nG12\nM117 Calibrating..."
902
+  //#define CALIBRATION_SCRIPT_POST "M500\nM117 Calibration data saved"
903
+
901
   #define CALIBRATION_MEASUREMENT_RESOLUTION     0.01 // mm
904
   #define CALIBRATION_MEASUREMENT_RESOLUTION     0.01 // mm
902
 
905
 
903
   #define CALIBRATION_FEEDRATE_SLOW             60    // mm/m
906
   #define CALIBRATION_FEEDRATE_SLOW             60    // mm/m

+ 9
- 0
Marlin/src/gcode/calibrate/G425.cpp View File

576
  *   no args     - Perform entire calibration sequence (backlash + position on all toolheads)
576
  *   no args     - Perform entire calibration sequence (backlash + position on all toolheads)
577
  */
577
  */
578
 void GcodeSuite::G425() {
578
 void GcodeSuite::G425() {
579
+
580
+  #ifdef CALIBRATION_SCRIPT_PRE
581
+    GcodeSuite::process_subcommands_now_P(PSTR(CALIBRATION_SCRIPT_PRE));
582
+  #endif
583
+
579
   TEMPORARY_SOFT_ENDSTOP_STATE(false);
584
   TEMPORARY_SOFT_ENDSTOP_STATE(false);
580
   TEMPORARY_BED_LEVELING_STATE(false);
585
   TEMPORARY_BED_LEVELING_STATE(false);
581
 
586
 
606
   #endif
611
   #endif
607
   else
612
   else
608
     calibrate_all();
613
     calibrate_all();
614
+
615
+  #ifdef CALIBRATION_SCRIPT_POST
616
+    GcodeSuite::process_subcommands_now_P(PSTR(CALIBRATION_SCRIPT_POST));
617
+  #endif
609
 }
618
 }
610
 
619
 
611
 #endif // CALIBRATION_GCODE
620
 #endif // CALIBRATION_GCODE

+ 1
- 0
Marlin/src/lcd/language/language_en.h View File

66
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Home Y");
66
   PROGMEM Language_Str MSG_AUTO_HOME_Y                     = _UxGT("Home Y");
67
   PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Home Z");
67
   PROGMEM Language_Str MSG_AUTO_HOME_Z                     = _UxGT("Home Z");
68
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto Z-Align");
68
   PROGMEM Language_Str MSG_AUTO_Z_ALIGN                    = _UxGT("Auto Z-Align");
69
+  PROGMEM Language_Str MSG_ASSISTED_TRAMMING               = _UxGT("Assisted Tramming");
69
   PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Homing XYZ");
70
   PROGMEM Language_Str MSG_LEVEL_BED_HOMING                = _UxGT("Homing XYZ");
70
   PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Click to Begin");
71
   PROGMEM Language_Str MSG_LEVEL_BED_WAITING               = _UxGT("Click to Begin");
71
   PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Next Point");
72
   PROGMEM Language_Str MSG_LEVEL_BED_NEXT_POINT            = _UxGT("Next Point");

+ 14
- 0
Marlin/src/lcd/menu/menu_motion.cpp View File

326
   #endif
326
   #endif
327
 
327
 
328
   //
328
   //
329
+  // Auto-calibration
330
+  //
331
+  #if ENABLED(CALIBRATION_GCODE)
332
+    GCODES_ITEM(MSG_AUTO_CALIBRATE, PSTR("G425"));
333
+  #endif
334
+
335
+  //
329
   // Auto Z-Align
336
   // Auto Z-Align
330
   //
337
   //
331
   #if ENABLED(Z_STEPPER_AUTO_ALIGN)
338
   #if ENABLED(Z_STEPPER_AUTO_ALIGN)
333
   #endif
340
   #endif
334
 
341
 
335
   //
342
   //
343
+  // Assisted Bed Tramming
344
+  //
345
+  #if ENABLED(ASSISTED_TRAMMING)
346
+    GCODES_ITEM(MSG_ASSISTED_TRAMMING, PSTR("G35"));
347
+  #endif
348
+  
349
+  //
336
   // Level Bed
350
   // Level Bed
337
   //
351
   //
338
   #if ENABLED(AUTO_BED_LEVELING_UBL)
352
   #if ENABLED(AUTO_BED_LEVELING_UBL)

Loading…
Cancel
Save