Browse Source

Add a function to home all axes (i.e., gcode_G28)

Scott Lahteine 7 years ago
parent
commit
2887c20788
4 changed files with 6 additions and 4 deletions
  1. 1
    2
      Marlin/G26_Mesh_Validation_Tool.cpp
  2. 2
    0
      Marlin/Marlin_main.cpp
  3. 2
    1
      Marlin/ubl.h
  4. 1
    1
      Marlin/ubl_G29.cpp

+ 1
- 2
Marlin/G26_Mesh_Validation_Tool.cpp View File

@@ -131,8 +131,7 @@
131 131
   #define PLANNER_XY_FEEDRATE() (min(planner.max_feedrate_mm_s[X_AXIS], planner.max_feedrate_mm_s[Y_AXIS])) //bob
132 132
   bool prepare_move_to_destination_cartesian();
133 133
   void line_to_destination();
134
-  void line_to_destination(float );
135
-  void gcode_G28();
134
+  void line_to_destination(float);
136 135
   void sync_plan_position_e();
137 136
   void un_retract_filament(float where[XYZE]);
138 137
   void retract_filament(float where[XYZE]);

+ 2
- 0
Marlin/Marlin_main.cpp View File

@@ -3928,6 +3928,8 @@ inline void gcode_G28() {
3928 3928
   #endif
3929 3929
 }
3930 3930
 
3931
+void home_all_axes() { gcode_G28(); }
3932
+
3931 3933
 #if HAS_PROBING_PROCEDURE
3932 3934
 
3933 3935
   void out_of_range_error(const char* p_edge) {

+ 2
- 1
Marlin/ubl.h View File

@@ -61,8 +61,9 @@
61 61
   bool is_bit_set(uint16_t bits[16], uint8_t x, uint8_t y);
62 62
   char *ftostr43sign(const float&, char);
63 63
 
64
+  void home_all_axes();
65
+
64 66
   void gcode_G26();
65
-  void gcode_G28();
66 67
   void gcode_G29();
67 68
 
68 69
   extern int ubl_cnt;

+ 1
- 1
Marlin/ubl_G29.cpp View File

@@ -324,7 +324,7 @@
324 324
     }
325 325
 
326 326
     if (!code_seen('N') && axis_unhomed_error(true, true, true))  // Don't allow auto-leveling without homing first
327
-      gcode_G28();
327
+      home_all_axes();
328 328
 
329 329
     if (g29_parameter_parsing()) return; // abort if parsing the simple parameters causes a problem,
330 330
 

Loading…
Cancel
Save