瀏覽代碼

🔧 LEVEL_BED_CORNERS => LCD_BED_TRAMMING

Scott Lahteine 2 年之前
父節點
當前提交
2b3ba02f09

+ 13
- 13
Marlin/Configuration.h 查看文件

1806
 #endif
1806
 #endif
1807
 
1807
 
1808
 // Add a menu item to move between bed corners for manual bed adjustment
1808
 // Add a menu item to move between bed corners for manual bed adjustment
1809
-//#define LEVEL_BED_CORNERS
1810
-
1811
-#if ENABLED(LEVEL_BED_CORNERS)
1812
-  #define LEVEL_CORNERS_INSET_LFRB { 30, 30, 30, 30 } // (mm) Left, Front, Right, Back insets
1813
-  #define LEVEL_CORNERS_HEIGHT      0.0   // (mm) Z height of nozzle at leveling points
1814
-  #define LEVEL_CORNERS_Z_HOP       4.0   // (mm) Z height of nozzle between leveling points
1815
-  //#define LEVEL_CENTER_TOO              // Move to the center after the last corner
1816
-  //#define LEVEL_CORNERS_USE_PROBE
1817
-  #if ENABLED(LEVEL_CORNERS_USE_PROBE)
1818
-    #define LEVEL_CORNERS_PROBE_TOLERANCE 0.1
1819
-    #define LEVEL_CORNERS_VERIFY_RAISED   // After adjustment triggers the probe, re-probe to verify
1820
-    //#define LEVEL_CORNERS_AUDIO_FEEDBACK
1809
+//#define LCD_BED_TRAMMING
1810
+
1811
+#if ENABLED(LCD_BED_TRAMMING)
1812
+  #define BED_TRAMMING_INSET_LFRB { 30, 30, 30, 30 }  // (mm) Left, Front, Right, Back insets
1813
+  #define BED_TRAMMING_HEIGHT      0.0        // (mm) Z height of nozzle at leveling points
1814
+  #define BED_TRAMMING_Z_HOP       4.0        // (mm) Z height of nozzle between leveling points
1815
+  //#define BED_TRAMMING_INCLUDE_CENTER       // Move to the center after the last corner
1816
+  //#define BED_TRAMMING_USE_PROBE
1817
+  #if ENABLED(BED_TRAMMING_USE_PROBE)
1818
+    #define BED_TRAMMING_PROBE_TOLERANCE 0.1  // (mm)
1819
+    #define BED_TRAMMING_VERIFY_RAISED        // After adjustment triggers the probe, re-probe to verify
1820
+    //#define BED_TRAMMING_AUDIO_FEEDBACK
1821
   #endif
1821
   #endif
1822
 
1822
 
1823
   /**
1823
   /**
1837
    *  |  1       2  |   | 1         4 |    | 1         2 |   | 2           |
1837
    *  |  1       2  |   | 1         4 |    | 1         2 |   | 2           |
1838
    *  LF --------- RF   LF --------- RF    LF --------- RF   LF --------- RF
1838
    *  LF --------- RF   LF --------- RF    LF --------- RF   LF --------- RF
1839
    */
1839
    */
1840
-  #define LEVEL_CORNERS_LEVELING_ORDER { LF, RF, RB, LB }
1840
+  #define BED_TRAMMING_LEVELING_ORDER { LF, RF, RB, LB }
1841
 #endif
1841
 #endif
1842
 
1842
 
1843
 /**
1843
 /**

+ 1
- 1
Marlin/src/inc/Conditionals_post.h 查看文件

266
  * No adjustable bed on non-cartesians
266
  * No adjustable bed on non-cartesians
267
  */
267
  */
268
 #if IS_KINEMATIC
268
 #if IS_KINEMATIC
269
-  #undef LEVEL_BED_CORNERS
269
+  #undef LCD_BED_TRAMMING
270
 #endif
270
 #endif
271
 
271
 
272
 /**
272
 /**

+ 19
- 13
Marlin/src/inc/SanityCheck.h 查看文件

371
 #elif defined(FILAMENT_CHANGE_LOAD_LENGTH)
371
 #elif defined(FILAMENT_CHANGE_LOAD_LENGTH)
372
   #error "FILAMENT_CHANGE_LOAD_LENGTH is now FILAMENT_CHANGE_FAST_LOAD_LENGTH."
372
   #error "FILAMENT_CHANGE_LOAD_LENGTH is now FILAMENT_CHANGE_FAST_LOAD_LENGTH."
373
 #elif defined(LEVEL_CORNERS_INSET)
373
 #elif defined(LEVEL_CORNERS_INSET)
374
-  #error "LEVEL_CORNERS_INSET is now LEVEL_CORNERS_INSET_LFRB."
374
+  #error "LEVEL_CORNERS_INSET is now BED_TRAMMING_INSET_LFRB."
375
 #elif defined(BEZIER_JERK_CONTROL)
375
 #elif defined(BEZIER_JERK_CONTROL)
376
   #error "BEZIER_JERK_CONTROL is now S_CURVE_ACCELERATION."
376
   #error "BEZIER_JERK_CONTROL is now S_CURVE_ACCELERATION."
377
 #elif HAS_JUNCTION_DEVIATION && defined(JUNCTION_DEVIATION_FACTOR)
377
 #elif HAS_JUNCTION_DEVIATION && defined(JUNCTION_DEVIATION_FACTOR)
627
   #error "Y_DUAL_STEPPER_DRIVERS is no longer needed and should be removed."
627
   #error "Y_DUAL_STEPPER_DRIVERS is no longer needed and should be removed."
628
 #elif defined(NUM_Z_STEPPER_DRIVERS)
628
 #elif defined(NUM_Z_STEPPER_DRIVERS)
629
   #error "NUM_Z_STEPPER_DRIVERS is no longer needed and should be removed."
629
   #error "NUM_Z_STEPPER_DRIVERS is no longer needed and should be removed."
630
+#elif defined(LEVEL_BED_CORNERS)
631
+  #error "LEVEL_BED_CORNERS is now LCD_BED_TRAMMING."
632
+#elif defined(LEVEL_CORNERS_INSET_LFRB) || defined(LEVEL_CORNERS_HEIGHT) || defined(LEVEL_CORNERS_Z_HOP) || defined(LEVEL_CORNERS_USE_PROBE) || defined(LEVEL_CORNERS_PROBE_TOLERANCE) || defined(LEVEL_CORNERS_VERIFY_RAISED) || defined(LEVEL_CORNERS_AUDIO_FEEDBACK)
633
+  #error "LEVEL_CORNERS_* settings have been renamed BED_TRAMMING_*."
634
+#elif defined(LEVEL_CENTER_TOO)
635
+  #error "LEVEL_CENTER_TOO is now BED_TRAMMING_INCLUDE_CENTER."
630
 #endif
636
 #endif
631
 
637
 
632
 constexpr float arm[] = AXIS_RELATIVE_MODES;
638
 constexpr float arm[] = AXIS_RELATIVE_MODES;
1824
 
1830
 
1825
 #endif
1831
 #endif
1826
 
1832
 
1827
-#if ENABLED(LEVEL_BED_CORNERS)
1828
-  #ifndef LEVEL_CORNERS_INSET_LFRB
1829
-    #error "LEVEL_BED_CORNERS requires LEVEL_CORNERS_INSET_LFRB values."
1830
-  #elif ENABLED(LEVEL_CORNERS_USE_PROBE)
1833
+#if ENABLED(LCD_BED_TRAMMING)
1834
+  #ifndef BED_TRAMMING_INSET_LFRB
1835
+    #error "LCD_BED_TRAMMING requires BED_TRAMMING_INSET_LFRB values."
1836
+  #elif ENABLED(BED_TRAMMING_USE_PROBE)
1831
     #if !HAS_BED_PROBE
1837
     #if !HAS_BED_PROBE
1832
-      #error "LEVEL_CORNERS_USE_PROBE requires a real probe."
1838
+      #error "BED_TRAMMING_USE_PROBE requires a real probe."
1833
     #elif ENABLED(SENSORLESS_PROBING)
1839
     #elif ENABLED(SENSORLESS_PROBING)
1834
-      #error "LEVEL_CORNERS_USE_PROBE is incompatible with SENSORLESS_PROBING."
1840
+      #error "BED_TRAMMING_USE_PROBE is incompatible with SENSORLESS_PROBING."
1835
     #endif
1841
     #endif
1836
   #endif
1842
   #endif
1837
 #endif
1843
 #endif
2952
     #error "DWIN_CREALITY_LCD does not support PID_EDIT_MENU or PID_AUTOTUNE_MENU."
2958
     #error "DWIN_CREALITY_LCD does not support PID_EDIT_MENU or PID_AUTOTUNE_MENU."
2953
   #elif EITHER(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU)
2959
   #elif EITHER(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU)
2954
     #error "DWIN_CREALITY_LCD does not support MPC_EDIT_MENU or MPC_AUTOTUNE_MENU."
2960
     #error "DWIN_CREALITY_LCD does not support MPC_EDIT_MENU or MPC_AUTOTUNE_MENU."
2955
-  #elif ENABLED(LEVEL_BED_CORNERS)
2956
-    #error "DWIN_CREALITY_LCD does not support LEVEL_BED_CORNERS."
2961
+  #elif ENABLED(LCD_BED_TRAMMING)
2962
+    #error "DWIN_CREALITY_LCD does not support LCD_BED_TRAMMING."
2957
   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
2963
   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
2958
     #error "DWIN_CREALITY_LCD does not support LCD_BED_LEVELING with PROBE_MANUALLY."
2964
     #error "DWIN_CREALITY_LCD does not support LCD_BED_LEVELING with PROBE_MANUALLY."
2959
   #endif
2965
   #endif
2964
     #error "DWIN_LCD_PROUI does not support PID_EDIT_MENU or PID_AUTOTUNE_MENU."
2970
     #error "DWIN_LCD_PROUI does not support PID_EDIT_MENU or PID_AUTOTUNE_MENU."
2965
   #elif EITHER(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU)
2971
   #elif EITHER(MPC_EDIT_MENU, MPC_AUTOTUNE_MENU)
2966
     #error "DWIN_LCD_PROUI does not support MPC_EDIT_MENU or MPC_AUTOTUNE_MENU."
2972
     #error "DWIN_LCD_PROUI does not support MPC_EDIT_MENU or MPC_AUTOTUNE_MENU."
2967
-  #elif ENABLED(LEVEL_BED_CORNERS)
2968
-    #error "DWIN_LCD_PROUI does not support LEVEL_BED_CORNERS."
2973
+  #elif ENABLED(LCD_BED_TRAMMING)
2974
+    #error "DWIN_LCD_PROUI does not support LCD_BED_TRAMMING."
2969
   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
2975
   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
2970
     #error "DWIN_LCD_PROUI does not support LCD_BED_LEVELING with PROBE_MANUALLY."
2976
     #error "DWIN_LCD_PROUI does not support LCD_BED_LEVELING with PROBE_MANUALLY."
2971
   #endif
2977
   #endif
4121
     #error "DGUS_LCD_UI_RELOADED requires a bed probe."
4127
     #error "DGUS_LCD_UI_RELOADED requires a bed probe."
4122
   #elif !HAS_MESH
4128
   #elif !HAS_MESH
4123
     #error "DGUS_LCD_UI_RELOADED requires mesh leveling."
4129
     #error "DGUS_LCD_UI_RELOADED requires mesh leveling."
4124
-  #elif DISABLED(LEVEL_BED_CORNERS)
4125
-    #error "DGUS_LCD_UI_RELOADED requires LEVEL_BED_CORNERS."
4130
+  #elif DISABLED(LCD_BED_TRAMMING)
4131
+    #error "DGUS_LCD_UI_RELOADED requires LCD_BED_TRAMMING."
4126
   #elif DISABLED(BABYSTEP_ALWAYS_AVAILABLE)
4132
   #elif DISABLED(BABYSTEP_ALWAYS_AVAILABLE)
4127
     #error "DGUS_LCD_UI_RELOADED requires BABYSTEP_ALWAYS_AVAILABLE."
4133
     #error "DGUS_LCD_UI_RELOADED requires BABYSTEP_ALWAYS_AVAILABLE."
4128
   #elif DISABLED(BABYSTEP_ZPROBE_OFFSET)
4134
   #elif DISABLED(BABYSTEP_ZPROBE_OFFSET)

+ 4
- 4
Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp 查看文件

466
   }
466
   }
467
 
467
 
468
   const uint8_t point = ((uint8_t*)data_ptr)[1];
468
   const uint8_t point = ((uint8_t*)data_ptr)[1];
469
-  constexpr float lfrb[4] = LEVEL_CORNERS_INSET_LFRB;
469
+  constexpr float lfrb[4] = BED_TRAMMING_INSET_LFRB;
470
   float x, y;
470
   float x, y;
471
 
471
 
472
   switch (point) {
472
   switch (point) {
493
       break;
493
       break;
494
   }
494
   }
495
 
495
 
496
-  if (ExtUI::getAxisPosition_mm(ExtUI::Z) < Z_MIN_POS + LEVEL_CORNERS_Z_HOP) {
497
-    ExtUI::setAxisPosition_mm(Z_MIN_POS + LEVEL_CORNERS_Z_HOP, ExtUI::Z);
496
+  if (ExtUI::getAxisPosition_mm(ExtUI::Z) < Z_MIN_POS + BED_TRAMMING_Z_HOP) {
497
+    ExtUI::setAxisPosition_mm(Z_MIN_POS + BED_TRAMMING_Z_HOP, ExtUI::Z);
498
   }
498
   }
499
   ExtUI::setAxisPosition_mm(x, ExtUI::X);
499
   ExtUI::setAxisPosition_mm(x, ExtUI::X);
500
   ExtUI::setAxisPosition_mm(y, ExtUI::Y);
500
   ExtUI::setAxisPosition_mm(y, ExtUI::Y);
501
-  ExtUI::setAxisPosition_mm(Z_MIN_POS + LEVEL_CORNERS_HEIGHT, ExtUI::Z);
501
+  ExtUI::setAxisPosition_mm(Z_MIN_POS + BED_TRAMMING_HEIGHT, ExtUI::Z);
502
 }
502
 }
503
 
503
 
504
 void DGUSRxHandler::Probe(DGUS_VP &vp, void *data_ptr) {
504
 void DGUSRxHandler::Probe(DGUS_VP &vp, void *data_ptr) {

+ 5
- 5
Marlin/src/lcd/extui/dgus_reloaded/config/DGUS_Constants.h 查看文件

71
   #define DGUS_DEFAULT_FILAMENT_LEN 10
71
   #define DGUS_DEFAULT_FILAMENT_LEN 10
72
 #endif
72
 #endif
73
 
73
 
74
-#ifndef LEVEL_CORNERS_Z_HOP
75
-  #define LEVEL_CORNERS_Z_HOP 4.0
74
+#ifndef BED_TRAMMING_Z_HOP
75
+  #define BED_TRAMMING_Z_HOP 4.0
76
 #endif
76
 #endif
77
 
77
 
78
-#ifndef LEVEL_CORNERS_HEIGHT
79
-  #define LEVEL_CORNERS_HEIGHT 0.0
78
+#ifndef BED_TRAMMING_HEIGHT
79
+  #define BED_TRAMMING_HEIGHT 0.0
80
 #endif
80
 #endif
81
 
81
 
82
-static_assert(LEVEL_CORNERS_Z_HOP >= 0, "LEVEL_CORNERS_Z_HOP must be >= 0. Please update your configuration.");
82
+static_assert(BED_TRAMMING_Z_HOP >= 0, "BED_TRAMMING_Z_HOP must be >= 0. Please update your configuration.");
83
 
83
 
84
 #ifndef DGUS_LEVEL_CENTER_X
84
 #ifndef DGUS_LEVEL_CENTER_X
85
   #define DGUS_LEVEL_CENTER_X ((X_BED_SIZE) / 2)
85
   #define DGUS_LEVEL_CENTER_X ((X_BED_SIZE) / 2)

+ 1
- 1
Marlin/src/lcd/menu/menu.cpp 查看文件

47
 ///////////// Global Variables /////////////
47
 ///////////// Global Variables /////////////
48
 ////////////////////////////////////////////
48
 ////////////////////////////////////////////
49
 
49
 
50
-#if HAS_LEVELING && ANY(LEVEL_BED_CORNERS, PROBE_OFFSET_WIZARD, X_AXIS_TWIST_COMPENSATION)
50
+#if HAS_LEVELING && ANY(LCD_BED_TRAMMING, PROBE_OFFSET_WIZARD, X_AXIS_TWIST_COMPENSATION)
51
   bool leveling_was_active; // = false
51
   bool leveling_was_active; // = false
52
 #endif
52
 #endif
53
 #if ANY(PROBE_MANUALLY, MESH_BED_LEVELING, X_AXIS_TWIST_COMPENSATION)
53
 #if ANY(PROBE_MANUALLY, MESH_BED_LEVELING, X_AXIS_TWIST_COMPENSATION)

+ 2
- 2
Marlin/src/lcd/menu/menu.h 查看文件

211
 void lcd_move_z();
211
 void lcd_move_z();
212
 void _lcd_draw_homing();
212
 void _lcd_draw_homing();
213
 
213
 
214
-#define HAS_LINE_TO_Z ANY(DELTA, PROBE_MANUALLY, MESH_BED_LEVELING, LEVEL_BED_CORNERS)
214
+#define HAS_LINE_TO_Z ANY(DELTA, PROBE_MANUALLY, MESH_BED_LEVELING, LCD_BED_TRAMMING)
215
 
215
 
216
 #if HAS_LINE_TO_Z
216
 #if HAS_LINE_TO_Z
217
   void line_to_z(const_float_t z);
217
   void line_to_z(const_float_t z);
258
 
258
 
259
 #define STICKY_SCREEN(S) []{ ui.defer_status_screen(); ui.goto_screen(S); }
259
 #define STICKY_SCREEN(S) []{ ui.defer_status_screen(); ui.goto_screen(S); }
260
 
260
 
261
-#if HAS_LEVELING && ANY(LEVEL_BED_CORNERS, PROBE_OFFSET_WIZARD, X_AXIS_TWIST_COMPENSATION)
261
+#if HAS_LEVELING && ANY(LCD_BED_TRAMMING, PROBE_OFFSET_WIZARD, X_AXIS_TWIST_COMPENSATION)
262
   extern bool leveling_was_active;
262
   extern bool leveling_was_active;
263
 #endif
263
 #endif
264
 
264
 

+ 45
- 45
Marlin/src/lcd/menu/menu_bed_corners.cpp 查看文件

26
 
26
 
27
 #include "../../inc/MarlinConfigPre.h"
27
 #include "../../inc/MarlinConfigPre.h"
28
 
28
 
29
-#if BOTH(HAS_MARLINUI_MENU, LEVEL_BED_CORNERS)
29
+#if BOTH(HAS_MARLINUI_MENU, LCD_BED_TRAMMING)
30
 
30
 
31
 #include "menu_item.h"
31
 #include "menu_item.h"
32
 #include "../../module/motion.h"
32
 #include "../../module/motion.h"
36
   #include "../../feature/bedlevel/bedlevel.h"
36
   #include "../../feature/bedlevel/bedlevel.h"
37
 #endif
37
 #endif
38
 
38
 
39
-#ifndef LEVEL_CORNERS_Z_HOP
40
-  #define LEVEL_CORNERS_Z_HOP 4.0
39
+#ifndef BED_TRAMMING_Z_HOP
40
+  #define BED_TRAMMING_Z_HOP 4.0
41
 #endif
41
 #endif
42
-#ifndef LEVEL_CORNERS_HEIGHT
43
-  #define LEVEL_CORNERS_HEIGHT 0.0
42
+#ifndef BED_TRAMMING_HEIGHT
43
+  #define BED_TRAMMING_HEIGHT 0.0
44
 #endif
44
 #endif
45
 
45
 
46
-#if ENABLED(LEVEL_CORNERS_USE_PROBE)
46
+#if ENABLED(BED_TRAMMING_USE_PROBE)
47
   #include "../../module/probe.h"
47
   #include "../../module/probe.h"
48
   #include "../../module/endstops.h"
48
   #include "../../module/endstops.h"
49
   #if ENABLED(BLTOUCH)
49
   #if ENABLED(BLTOUCH)
50
     #include "../../feature/bltouch.h"
50
     #include "../../feature/bltouch.h"
51
   #endif
51
   #endif
52
-  #ifndef LEVEL_CORNERS_PROBE_TOLERANCE
53
-    #define LEVEL_CORNERS_PROBE_TOLERANCE 0.2
52
+  #ifndef BED_TRAMMING_PROBE_TOLERANCE
53
+    #define BED_TRAMMING_PROBE_TOLERANCE 0.2
54
   #endif
54
   #endif
55
   float last_z;
55
   float last_z;
56
   int good_points;
56
   int good_points;
64
 
64
 
65
 #endif
65
 #endif
66
 
66
 
67
-static_assert(LEVEL_CORNERS_Z_HOP >= 0, "LEVEL_CORNERS_Z_HOP must be >= 0. Please update your configuration.");
67
+static_assert(BED_TRAMMING_Z_HOP >= 0, "BED_TRAMMING_Z_HOP must be >= 0. Please update your configuration.");
68
 
68
 
69
-#ifndef LEVEL_CORNERS_LEVELING_ORDER
70
-  #define LEVEL_CORNERS_LEVELING_ORDER { LF, RF, LB, RB } // Default
71
-  //#define LEVEL_CORNERS_LEVELING_ORDER { LF, LB, RF  }  // 3 hard-coded points
72
-  //#define LEVEL_CORNERS_LEVELING_ORDER { LF, RF }       // 3-Point tramming - Rear
73
-  //#define LEVEL_CORNERS_LEVELING_ORDER { LF, LB }       // 3-Point tramming - Right
74
-  //#define LEVEL_CORNERS_LEVELING_ORDER { RF, RB }       // 3-Point tramming - Left
75
-  //#define LEVEL_CORNERS_LEVELING_ORDER { LB, RB }       // 3-Point tramming - Front
69
+#ifndef BED_TRAMMING_LEVELING_ORDER
70
+  #define BED_TRAMMING_LEVELING_ORDER { LF, RF, LB, RB } // Default
71
+  //#define BED_TRAMMING_LEVELING_ORDER { LF, LB, RF  }  // 3 hard-coded points
72
+  //#define BED_TRAMMING_LEVELING_ORDER { LF, RF }       // 3-Point tramming - Rear
73
+  //#define BED_TRAMMING_LEVELING_ORDER { LF, LB }       // 3-Point tramming - Right
74
+  //#define BED_TRAMMING_LEVELING_ORDER { RF, RB }       // 3-Point tramming - Left
75
+  //#define BED_TRAMMING_LEVELING_ORDER { LB, RB }       // 3-Point tramming - Front
76
 #endif
76
 #endif
77
 
77
 
78
 #define LF 1
78
 #define LF 1
79
 #define RF 2
79
 #define RF 2
80
 #define RB 3
80
 #define RB 3
81
 #define LB 4
81
 #define LB 4
82
-constexpr int lco[] = LEVEL_CORNERS_LEVELING_ORDER;
82
+constexpr int lco[] = BED_TRAMMING_LEVELING_ORDER;
83
 constexpr bool level_corners_3_points = COUNT(lco) == 2;
83
 constexpr bool level_corners_3_points = COUNT(lco) == 2;
84
-static_assert(level_corners_3_points || COUNT(lco) == 4, "LEVEL_CORNERS_LEVELING_ORDER must have exactly 2 or 4 corners.");
84
+static_assert(level_corners_3_points || COUNT(lco) == 4, "BED_TRAMMING_LEVELING_ORDER must have exactly 2 or 4 corners.");
85
 
85
 
86
 constexpr int lcodiff = ABS(lco[0] - lco[1]);
86
 constexpr int lcodiff = ABS(lco[0] - lco[1]);
87
-static_assert(COUNT(lco) == 4 || lcodiff == 1 || lcodiff == 3, "The first two LEVEL_CORNERS_LEVELING_ORDER corners must be on the same edge.");
87
+static_assert(COUNT(lco) == 4 || lcodiff == 1 || lcodiff == 3, "The first two BED_TRAMMING_LEVELING_ORDER corners must be on the same edge.");
88
 
88
 
89
 constexpr int nr_edge_points = level_corners_3_points ? 3 : 4;
89
 constexpr int nr_edge_points = level_corners_3_points ? 3 : 4;
90
-constexpr int available_points = nr_edge_points + ENABLED(LEVEL_CENTER_TOO);
91
-constexpr int center_index = TERN(LEVEL_CENTER_TOO, available_points - 1, -1);
92
-constexpr float inset_lfrb[4] = LEVEL_CORNERS_INSET_LFRB;
90
+constexpr int available_points = nr_edge_points + ENABLED(BED_TRAMMING_INCLUDE_CENTER);
91
+constexpr int center_index = TERN(BED_TRAMMING_INCLUDE_CENTER, available_points - 1, -1);
92
+constexpr float inset_lfrb[4] = BED_TRAMMING_INSET_LFRB;
93
 constexpr xy_pos_t lf { (X_MIN_BED) + inset_lfrb[0], (Y_MIN_BED) + inset_lfrb[1] },
93
 constexpr xy_pos_t lf { (X_MIN_BED) + inset_lfrb[0], (Y_MIN_BED) + inset_lfrb[1] },
94
                    rb { (X_MAX_BED) - inset_lfrb[2], (Y_MAX_BED) - inset_lfrb[3] };
94
                    rb { (X_MAX_BED) - inset_lfrb[2], (Y_MAX_BED) - inset_lfrb[3] };
95
 
95
 
120
         if ((lco[0] == LF && lco[1] == LB) || (lco[0] == LB && lco[1] == LF)) current_position.x = rb.x; // Center Right
120
         if ((lco[0] == LF && lco[1] == LB) || (lco[0] == LB && lco[1] == LF)) current_position.x = rb.x; // Center Right
121
         if ((lco[0] == RF && lco[1] == RB) || (lco[0] == RB && lco[1] == RF)) current_position.x = lf.x; // Left Center
121
         if ((lco[0] == RF && lco[1] == RB) || (lco[0] == RB && lco[1] == RF)) current_position.x = lf.x; // Left Center
122
         if ((lco[0] == LF && lco[1] == RF) || (lco[0] == RF && lco[1] == LF)) current_position.y = rb.y; // Center Back
122
         if ((lco[0] == LF && lco[1] == RF) || (lco[0] == RF && lco[1] == LF)) current_position.y = rb.y; // Center Back
123
-        #if DISABLED(LEVEL_CENTER_TOO) && ENABLED(LEVEL_CORNERS_USE_PROBE)
123
+        #if DISABLED(BED_TRAMMING_INCLUDE_CENTER) && ENABLED(BED_TRAMMING_USE_PROBE)
124
           bed_corner++;  // Must increment the count to ensure it resets the loop if the 3rd point is out of tolerance
124
           bed_corner++;  // Must increment the count to ensure it resets the loop if the 3rd point is out of tolerance
125
         #endif
125
         #endif
126
         break;
126
         break;
127
 
127
 
128
-      #if ENABLED(LEVEL_CENTER_TOO)
128
+      #if ENABLED(BED_TRAMMING_INCLUDE_CENTER)
129
         case 3:
129
         case 3:
130
           current_position.set(X_CENTER, Y_CENTER);
130
           current_position.set(X_CENTER, Y_CENTER);
131
           break;
131
           break;
134
   }
134
   }
135
   else {
135
   else {
136
     // Four-Corner Bed Tramming with optional center
136
     // Four-Corner Bed Tramming with optional center
137
-    if (TERN0(LEVEL_CENTER_TOO, bed_corner == center_index)) {
137
+    if (TERN0(BED_TRAMMING_INCLUDE_CENTER, bed_corner == center_index)) {
138
       current_position.set(X_CENTER, Y_CENTER);
138
       current_position.set(X_CENTER, Y_CENTER);
139
-      TERN_(LEVEL_CORNERS_USE_PROBE, good_points--); // Decrement to allow one additional probe point
139
+      TERN_(BED_TRAMMING_USE_PROBE, good_points--); // Decrement to allow one additional probe point
140
     }
140
     }
141
     else {
141
     else {
142
       current_position = lf;                       // Left front
142
       current_position = lf;                       // Left front
152
 /**
152
 /**
153
  * Level corners, starting in the front-left corner.
153
  * Level corners, starting in the front-left corner.
154
  */
154
  */
155
-#if ENABLED(LEVEL_CORNERS_USE_PROBE)
155
+#if ENABLED(BED_TRAMMING_USE_PROBE)
156
 
156
 
157
   #define VALIDATE_POINT(X, Y, STR) static_assert(Probe::build_time::can_reach((X), (Y)), \
157
   #define VALIDATE_POINT(X, Y, STR) static_assert(Probe::build_time::can_reach((X), (Y)), \
158
-    "LEVEL_CORNERS_INSET_LFRB " STR " inset is not reachable with the default NOZZLE_TO_PROBE offset and PROBING_MARGIN.")
158
+    "BED_TRAMMING_INSET_LFRB " STR " inset is not reachable with the default NOZZLE_TO_PROBE offset and PROBING_MARGIN.")
159
   VALIDATE_POINT(lf.x, Y_CENTER, "left"); VALIDATE_POINT(X_CENTER, lf.y, "front");
159
   VALIDATE_POINT(lf.x, Y_CENTER, "left"); VALIDATE_POINT(X_CENTER, lf.y, "front");
160
   VALIDATE_POINT(rb.x, Y_CENTER, "right"); VALIDATE_POINT(X_CENTER, rb.y, "back");
160
   VALIDATE_POINT(rb.x, Y_CENTER, "right"); VALIDATE_POINT(X_CENTER, rb.y, "back");
161
 
161
 
216
   }
216
   }
217
 
217
 
218
   bool _lcd_level_bed_corners_probe(bool verify=false) {
218
   bool _lcd_level_bed_corners_probe(bool verify=false) {
219
-    if (verify) do_blocking_move_to_z(current_position.z + LEVEL_CORNERS_Z_HOP); // do clearance if needed
219
+    if (verify) do_blocking_move_to_z(current_position.z + BED_TRAMMING_Z_HOP); // do clearance if needed
220
     TERN_(BLTOUCH, if (!bltouch.high_speed_mode) bltouch.deploy()); // Deploy in LOW SPEED MODE on every probe action
220
     TERN_(BLTOUCH, if (!bltouch.high_speed_mode) bltouch.deploy()); // Deploy in LOW SPEED MODE on every probe action
221
-    do_blocking_move_to_z(last_z - LEVEL_CORNERS_PROBE_TOLERANCE, MMM_TO_MMS(Z_PROBE_FEEDRATE_SLOW)); // Move down to lower tolerance
221
+    do_blocking_move_to_z(last_z - BED_TRAMMING_PROBE_TOLERANCE, MMM_TO_MMS(Z_PROBE_FEEDRATE_SLOW)); // Move down to lower tolerance
222
     if (TEST(endstops.trigger_state(), Z_MIN_PROBE)) { // check if probe triggered
222
     if (TEST(endstops.trigger_state(), Z_MIN_PROBE)) { // check if probe triggered
223
       endstops.hit_on_purpose();
223
       endstops.hit_on_purpose();
224
       set_current_from_steppers_for_axis(Z_AXIS);
224
       set_current_from_steppers_for_axis(Z_AXIS);
225
       sync_plan_position();
225
       sync_plan_position();
226
       TERN_(BLTOUCH, if (!bltouch.high_speed_mode) bltouch.stow()); // Stow in LOW SPEED MODE on every trigger
226
       TERN_(BLTOUCH, if (!bltouch.high_speed_mode) bltouch.stow()); // Stow in LOW SPEED MODE on every trigger
227
       // Triggered outside tolerance range?
227
       // Triggered outside tolerance range?
228
-      if (ABS(current_position.z - last_z) > LEVEL_CORNERS_PROBE_TOLERANCE) {
228
+      if (ABS(current_position.z - last_z) > BED_TRAMMING_PROBE_TOLERANCE) {
229
         last_z = current_position.z; // Above tolerance. Set a new Z for subsequent corners.
229
         last_z = current_position.z; // Above tolerance. Set a new Z for subsequent corners.
230
         good_points = 0;             // ...and start over
230
         good_points = 0;             // ...and start over
231
       }
231
       }
245
       probe_triggered = PROBE_TRIGGERED();
245
       probe_triggered = PROBE_TRIGGERED();
246
       if (probe_triggered) {
246
       if (probe_triggered) {
247
         endstops.hit_on_purpose();
247
         endstops.hit_on_purpose();
248
-        TERN_(LEVEL_CORNERS_AUDIO_FEEDBACK, BUZZ(200, 600));
248
+        TERN_(BED_TRAMMING_AUDIO_FEEDBACK, BUZZ(200, 600));
249
       }
249
       }
250
       idle();
250
       idle();
251
     }
251
     }
255
   }
255
   }
256
 
256
 
257
   void _lcd_test_corners() {
257
   void _lcd_test_corners() {
258
-    bed_corner = TERN(LEVEL_CENTER_TOO, center_index, 0);
259
-    last_z = LEVEL_CORNERS_HEIGHT;
258
+    bed_corner = TERN(BED_TRAMMING_INCLUDE_CENTER, center_index, 0);
259
+    last_z = BED_TRAMMING_HEIGHT;
260
     endstops.enable_z_probe(true);
260
     endstops.enable_z_probe(true);
261
     good_points = 0;
261
     good_points = 0;
262
     ui.goto_screen(_lcd_draw_probing);
262
     ui.goto_screen(_lcd_draw_probing);
264
       ui.refresh(LCDVIEW_REDRAW_NOW);
264
       ui.refresh(LCDVIEW_REDRAW_NOW);
265
       _lcd_draw_probing();                                // update screen with # of good points
265
       _lcd_draw_probing();                                // update screen with # of good points
266
 
266
 
267
-      do_blocking_move_to_z(current_position.z + LEVEL_CORNERS_Z_HOP + TERN0(BLTOUCH, bltouch.z_extra_clearance())); // clearance
267
+      do_blocking_move_to_z(current_position.z + BED_TRAMMING_Z_HOP + TERN0(BLTOUCH, bltouch.z_extra_clearance())); // clearance
268
 
268
 
269
       _lcd_level_bed_corners_get_next_position();         // Select next corner coordinates
269
       _lcd_level_bed_corners_get_next_position();         // Select next corner coordinates
270
       current_position -= probe.offset_xy;                // Account for probe offsets
270
       current_position -= probe.offset_xy;                // Account for probe offsets
273
       TERN_(BLTOUCH, if (bltouch.high_speed_mode) bltouch.deploy()); // Deploy in HIGH SPEED MODE
273
       TERN_(BLTOUCH, if (bltouch.high_speed_mode) bltouch.deploy()); // Deploy in HIGH SPEED MODE
274
       if (!_lcd_level_bed_corners_probe()) {              // Probe down to tolerance
274
       if (!_lcd_level_bed_corners_probe()) {              // Probe down to tolerance
275
         if (_lcd_level_bed_corners_raise()) {             // Prompt user to raise bed if needed
275
         if (_lcd_level_bed_corners_raise()) {             // Prompt user to raise bed if needed
276
-          #if ENABLED(LEVEL_CORNERS_VERIFY_RAISED)        // Verify
276
+          #if ENABLED(BED_TRAMMING_VERIFY_RAISED)        // Verify
277
             while (!_lcd_level_bed_corners_probe(true)) { // Loop while corner verified
277
             while (!_lcd_level_bed_corners_probe(true)) { // Loop while corner verified
278
               if (!_lcd_level_bed_corners_raise()) {      // Prompt user to raise bed if needed
278
               if (!_lcd_level_bed_corners_raise()) {      // Prompt user to raise bed if needed
279
                 if (corner_probing_done) return;          // Done was selected
279
                 if (corner_probing_done) return;          // Done was selected
294
     #if ENABLED(BLTOUCH)
294
     #if ENABLED(BLTOUCH)
295
       if (bltouch.high_speed_mode) {
295
       if (bltouch.high_speed_mode) {
296
         // In HIGH SPEED MODE do clearance and stow at the very end
296
         // In HIGH SPEED MODE do clearance and stow at the very end
297
-        do_blocking_move_to_z(current_position.z + LEVEL_CORNERS_Z_HOP);
297
+        do_blocking_move_to_z(current_position.z + BED_TRAMMING_Z_HOP);
298
         bltouch.stow();
298
         bltouch.stow();
299
       }
299
       }
300
     #endif
300
     #endif
303
     ui.set_selection(true);
303
     ui.set_selection(true);
304
   }
304
   }
305
 
305
 
306
-#else // !LEVEL_CORNERS_USE_PROBE
306
+#else // !BED_TRAMMING_USE_PROBE
307
 
307
 
308
   static void _lcd_goto_next_corner() {
308
   static void _lcd_goto_next_corner() {
309
-    line_to_z(LEVEL_CORNERS_Z_HOP);
309
+    line_to_z(BED_TRAMMING_Z_HOP);
310
 
310
 
311
     // Select next corner coordinates
311
     // Select next corner coordinates
312
     _lcd_level_bed_corners_get_next_position();
312
     _lcd_level_bed_corners_get_next_position();
313
 
313
 
314
     line_to_current_position(manual_feedrate_mm_s.x);
314
     line_to_current_position(manual_feedrate_mm_s.x);
315
-    line_to_z(LEVEL_CORNERS_HEIGHT);
315
+    line_to_z(BED_TRAMMING_HEIGHT);
316
     if (++bed_corner >= available_points) bed_corner = 0;
316
     if (++bed_corner >= available_points) bed_corner = 0;
317
   }
317
   }
318
 
318
 
319
-#endif // !LEVEL_CORNERS_USE_PROBE
319
+#endif // !BED_TRAMMING_USE_PROBE
320
 
320
 
321
 static void _lcd_level_bed_corners_homing() {
321
 static void _lcd_level_bed_corners_homing() {
322
   _lcd_draw_homing();
322
   _lcd_draw_homing();
323
   if (!all_axes_homed()) return;
323
   if (!all_axes_homed()) return;
324
-  #if ENABLED(LEVEL_CORNERS_USE_PROBE)
324
+  #if ENABLED(BED_TRAMMING_USE_PROBE)
325
     _lcd_test_corners();
325
     _lcd_test_corners();
326
     if (corner_probing_done) ui.goto_previous_screen_no_defer();
326
     if (corner_probing_done) ui.goto_previous_screen_no_defer();
327
     TERN_(HAS_LEVELING, set_bed_leveling_enabled(leveling_was_active));
327
     TERN_(HAS_LEVELING, set_bed_leveling_enabled(leveling_was_active));
333
           GET_TEXT_F(MSG_BUTTON_NEXT), GET_TEXT_F(MSG_BUTTON_DONE)
333
           GET_TEXT_F(MSG_BUTTON_NEXT), GET_TEXT_F(MSG_BUTTON_DONE)
334
         , _lcd_goto_next_corner
334
         , _lcd_goto_next_corner
335
         , []{
335
         , []{
336
-            line_to_z(LEVEL_CORNERS_Z_HOP); // Raise Z off the bed when done
336
+            line_to_z(BED_TRAMMING_Z_HOP); // Raise Z off the bed when done
337
             TERN_(HAS_LEVELING, set_bed_leveling_enabled(leveling_was_active));
337
             TERN_(HAS_LEVELING, set_bed_leveling_enabled(leveling_was_active));
338
             ui.goto_previous_screen_no_defer();
338
             ui.goto_previous_screen_no_defer();
339
           }
339
           }
340
-        , GET_TEXT_F(TERN(LEVEL_CENTER_TOO, MSG_LEVEL_BED_NEXT_POINT, MSG_NEXT_CORNER))
340
+        , GET_TEXT_F(TERN(BED_TRAMMING_INCLUDE_CENTER, MSG_LEVEL_BED_NEXT_POINT, MSG_NEXT_CORNER))
341
         , (const char*)nullptr, F("?")
341
         , (const char*)nullptr, F("?")
342
       );
342
       );
343
     });
343
     });
362
   ui.goto_screen(_lcd_level_bed_corners_homing);
362
   ui.goto_screen(_lcd_level_bed_corners_homing);
363
 }
363
 }
364
 
364
 
365
-#endif // HAS_MARLINUI_MENU && LEVEL_BED_CORNERS
365
+#endif // HAS_MARLINUI_MENU && LCD_BED_TRAMMING

+ 1
- 1
Marlin/src/lcd/menu/menu_bed_leveling.cpp 查看文件

290
     EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe.offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
290
     EDIT_ITEM(LCD_Z_OFFSET_TYPE, MSG_ZPROBE_ZOFFSET, &probe.offset.z, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
291
   #endif
291
   #endif
292
 
292
 
293
-  #if ENABLED(LEVEL_BED_CORNERS)
293
+  #if ENABLED(LCD_BED_TRAMMING)
294
     SUBMENU(MSG_BED_TRAMMING, _lcd_level_bed_corners);
294
     SUBMENU(MSG_BED_TRAMMING, _lcd_level_bed_corners);
295
   #endif
295
   #endif
296
 
296
 

+ 1
- 1
Marlin/src/lcd/menu/menu_item.h 查看文件

466
 #define YESNO_ITEM_N_F(N,FLABEL, V...)             CONFIRM_ITEM_N_F(N, FLABEL, MSG_YES, MSG_NO, ##V)
466
 #define YESNO_ITEM_N_F(N,FLABEL, V...)             CONFIRM_ITEM_N_F(N, FLABEL, MSG_YES, MSG_NO, ##V)
467
 #define YESNO_ITEM_N(N,LABEL, V...)                  YESNO_ITEM_N_F(N, GET_TEXT_F(LABEL), ##V)
467
 #define YESNO_ITEM_N(N,LABEL, V...)                  YESNO_ITEM_N_F(N, GET_TEXT_F(LABEL), ##V)
468
 
468
 
469
-#if ENABLED(LEVEL_BED_CORNERS)
469
+#if ENABLED(LCD_BED_TRAMMING)
470
   void _lcd_level_bed_corners();
470
   void _lcd_level_bed_corners();
471
 #endif
471
 #endif
472
 
472
 

+ 1
- 1
Marlin/src/lcd/menu/menu_motion.cpp 查看文件

491
 
491
 
492
   #endif
492
   #endif
493
 
493
 
494
-  #if ENABLED(LEVEL_BED_CORNERS) && DISABLED(LCD_BED_LEVELING)
494
+  #if ENABLED(LCD_BED_TRAMMING) && DISABLED(LCD_BED_LEVELING)
495
     SUBMENU(MSG_BED_TRAMMING, _lcd_level_bed_corners);
495
     SUBMENU(MSG_BED_TRAMMING, _lcd_level_bed_corners);
496
   #endif
496
   #endif
497
 
497
 

+ 1
- 1
buildroot/share/PlatformIO/scripts/common-dependencies.h 查看文件

53
   #if ENABLED(BACKLASH_GCODE)
53
   #if ENABLED(BACKLASH_GCODE)
54
     #define HAS_MENU_BACKLASH
54
     #define HAS_MENU_BACKLASH
55
   #endif
55
   #endif
56
-  #if ENABLED(LEVEL_BED_CORNERS)
56
+  #if ENABLED(LCD_BED_TRAMMING)
57
     #define HAS_MENU_BED_CORNERS
57
     #define HAS_MENU_BED_CORNERS
58
   #endif
58
   #endif
59
   #if ENABLED(CANCEL_OBJECTS)
59
   #if ENABLED(CANCEL_OBJECTS)

+ 1
- 1
buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive 查看文件

10
 opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT 3 \
10
 opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT 3 \
11
         EXTRUDERS 8 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 TEMP_SENSOR_3 1 TEMP_SENSOR_4 1 TEMP_SENSOR_5 1 TEMP_SENSOR_6 1 TEMP_SENSOR_7 1
11
         EXTRUDERS 8 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 TEMP_SENSOR_3 1 TEMP_SENSOR_4 1 TEMP_SENSOR_5 1 TEMP_SENSOR_6 1 TEMP_SENSOR_7 1
12
 opt_enable SDSUPPORT USB_FLASH_DRIVE_SUPPORT USE_OTG_USB_HOST \
12
 opt_enable SDSUPPORT USB_FLASH_DRIVE_SUPPORT USE_OTG_USB_HOST \
13
-           REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER BLTOUCH LEVEL_BED_CORNERS LEVEL_CORNERS_USE_PROBE \
13
+           REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER BLTOUCH LCD_BED_TRAMMING BED_TRAMMING_USE_PROBE \
14
            NEOPIXEL_LED Z_SAFE_HOMING FILAMENT_RUNOUT_SENSOR NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE
14
            NEOPIXEL_LED Z_SAFE_HOMING FILAMENT_RUNOUT_SENSOR NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE
15
 # Not necessary to enable auto-fan for all extruders to hit problematic code paths
15
 # Not necessary to enable auto-fan for all extruders to hit problematic code paths
16
 opt_set E0_AUTO_FAN_PIN PC10 E1_AUTO_FAN_PIN PC11 E2_AUTO_FAN_PIN PC12 NEOPIXEL_PIN PF13 \
16
 opt_set E0_AUTO_FAN_PIN PC10 E1_AUTO_FAN_PIN PC11 E2_AUTO_FAN_PIN PC12 NEOPIXEL_PIN PF13 \

+ 1
- 1
buildroot/tests/LPC1769 查看文件

21
 opt_enable TFTGLCD_PANEL_SPI SDSUPPORT ADAPTIVE_FAN_SLOWING NO_FAN_SLOWING_IN_PID_TUNING \
21
 opt_enable TFTGLCD_PANEL_SPI SDSUPPORT ADAPTIVE_FAN_SLOWING NO_FAN_SLOWING_IN_PID_TUNING \
22
            MAX31865_SENSOR_OHMS_0 MAX31865_CALIBRATION_OHMS_0 \
22
            MAX31865_SENSOR_OHMS_0 MAX31865_CALIBRATION_OHMS_0 \
23
            FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR G29_RETRY_AND_RECOVER Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
23
            FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR G29_RETRY_AND_RECOVER Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
24
-           BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET LEVEL_CORNERS_USE_PROBE LEVEL_CORNERS_VERIFY_RAISED \
24
+           BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET BED_TRAMMING_USE_PROBE BED_TRAMMING_VERIFY_RAISED \
25
            PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT \
25
            PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT \
26
            Z_SAFE_HOMING ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE \
26
            Z_SAFE_HOMING ADVANCED_PAUSE_FEATURE PARK_HEAD_ON_PAUSE \
27
            LCD_INFO_MENU ARC_SUPPORT BEZIER_CURVE_SUPPORT EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES SDCARD_SORT_ALPHA EMERGENCY_PARSER
27
            LCD_INFO_MENU ARC_SUPPORT BEZIER_CURVE_SUPPORT EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES SDCARD_SORT_ALPHA EMERGENCY_PARSER

+ 3
- 3
buildroot/tests/rambo 查看文件

24
            BLINKM PCA9533 PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
24
            BLINKM PCA9533 PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
25
            NEOPIXEL_LED NEOPIXEL_PIN CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \
25
            NEOPIXEL_LED NEOPIXEL_PIN CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \
26
            PID_PARAMS_PER_HOTEND PID_AUTOTUNE_MENU PID_EDIT_MENU LCD_SHOW_E_TOTAL \
26
            PID_PARAMS_PER_HOTEND PID_AUTOTUNE_MENU PID_EDIT_MENU LCD_SHOW_E_TOTAL \
27
-           PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 LEVEL_BED_CORNERS LEVEL_CENTER_TOO \
27
+           PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 LCD_BED_TRAMMING BED_TRAMMING_INCLUDE_CENTER \
28
            NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \
28
            NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \
29
            ADVANCED_PAUSE_FEATURE FILAMENT_LOAD_UNLOAD_GCODES FILAMENT_UNLOAD_ALL_EXTRUDERS \
29
            ADVANCED_PAUSE_FEATURE FILAMENT_LOAD_UNLOAD_GCODES FILAMENT_UNLOAD_ALL_EXTRUDERS \
30
            PASSWORD_FEATURE PASSWORD_ON_STARTUP PASSWORD_ON_SD_PRINT_MENU PASSWORD_AFTER_SD_PRINT_END PASSWORD_AFTER_SD_PRINT_ABORT \
30
            PASSWORD_FEATURE PASSWORD_ON_STARTUP PASSWORD_ON_SD_PRINT_MENU PASSWORD_AFTER_SD_PRINT_END PASSWORD_AFTER_SD_PRINT_ABORT \
51
         DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
51
         DEFAULT_MAX_ACCELERATION '{ 3000, 3000, 100 }' \
52
         MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
52
         MANUAL_FEEDRATE '{ 50*60, 50*60, 4*60 }' \
53
         AXIS_RELATIVE_MODES '{ false, false, false }' \
53
         AXIS_RELATIVE_MODES '{ false, false, false }' \
54
-        LEVEL_CORNERS_LEVELING_ORDER '{ LF, RF }' \
54
+        BED_TRAMMING_LEVELING_ORDER '{ LF, RF }' \
55
         X2_DRIVER_TYPE A4988 Y2_DRIVER_TYPE A4988
55
         X2_DRIVER_TYPE A4988 Y2_DRIVER_TYPE A4988
56
 opt_enable USE_XMAX_PLUG USE_YMAX_PLUG USE_ZMAX_PLUG \
56
 opt_enable USE_XMAX_PLUG USE_YMAX_PLUG USE_ZMAX_PLUG \
57
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER REVERSE_ENCODER_DIRECTION SDSUPPORT EEPROM_SETTINGS \
57
            REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER REVERSE_ENCODER_DIRECTION SDSUPPORT EEPROM_SETTINGS \
58
            S_CURVE_ACCELERATION X_DUAL_ENDSTOPS Y_DUAL_ENDSTOPS \
58
            S_CURVE_ACCELERATION X_DUAL_ENDSTOPS Y_DUAL_ENDSTOPS \
59
            ADAPTIVE_STEP_SMOOTHING CNC_COORDINATE_SYSTEMS GCODE_MOTION_MODES \
59
            ADAPTIVE_STEP_SMOOTHING CNC_COORDINATE_SYSTEMS GCODE_MOTION_MODES \
60
-           LEVEL_BED_CORNERS LEVEL_CENTER_TOO
60
+           LCD_BED_TRAMMING BED_TRAMMING_INCLUDE_CENTER
61
 opt_disable MIN_SOFTWARE_ENDSTOP_Z MAX_SOFTWARE_ENDSTOPS
61
 opt_disable MIN_SOFTWARE_ENDSTOP_Z MAX_SOFTWARE_ENDSTOPS
62
 exec_test $1 $2 "Rambo CNC Configuration" "$3"
62
 exec_test $1 $2 "Rambo CNC Configuration" "$3"
63
 
63
 

Loading…
取消
儲存