Преглед изворни кода

Make clean_up function available for probes

Scott Lahteine пре 9 година
родитељ
комит
ed75b0ea11
1 измењених фајлова са 14 додато и 11 уклоњено
  1. 14
    11
      Marlin/Marlin_main.cpp

+ 14
- 11
Marlin/Marlin_main.cpp Прегледај датотеку

@@ -1583,6 +1583,16 @@ static void setup_for_endstop_move() {
1583 1583
 
1584 1584
 #if HAS_BED_PROBE
1585 1585
 
1586
+  static void clean_up_after_endstop_move() {
1587
+    #if ENABLED(DEBUG_LEVELING_FEATURE)
1588
+      if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("clean_up_after_endstop_move > endstops.not_homing()");
1589
+    #endif
1590
+    endstops.not_homing();
1591
+    feedrate = saved_feedrate;
1592
+    feedrate_multiplier = saved_feedrate_multiplier;
1593
+    refresh_cmd_timeout();
1594
+  }
1595
+
1586 1596
   #if ENABLED(DELTA)
1587 1597
     /**
1588 1598
      * Calculate delta, start a line, and set current_position to destination
@@ -2067,7 +2077,10 @@ static void setup_for_endstop_move() {
2067 2077
 
2068 2078
     #else // !DELTA
2069 2079
 
2070
-      planner.bed_level_matrix.set_to_identity();
2080
+      #if ENABLED(AUTO_BED_LEVELING_FEATURE)
2081
+        planner.bed_level_matrix.set_to_identity();
2082
+      #endif
2083
+
2071 2084
       feedrate = homing_feedrate[Z_AXIS];
2072 2085
 
2073 2086
       // Move down until the Z probe (or endstop?) is triggered
@@ -2117,16 +2130,6 @@ static void setup_for_endstop_move() {
2117 2130
     do_blocking_move_to(x, y, current_position[Z_AXIS]);
2118 2131
   }
2119 2132
 
2120
-  static void clean_up_after_endstop_move() {
2121
-    #if ENABLED(DEBUG_LEVELING_FEATURE)
2122
-      if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("clean_up_after_endstop_move > ENDSTOPS_ONLY_FOR_HOMING > endstops.not_homing()");
2123
-    #endif
2124
-    endstops.not_homing();
2125
-    feedrate = saved_feedrate;
2126
-    feedrate_multiplier = saved_feedrate_multiplier;
2127
-    refresh_cmd_timeout();
2128
-  }
2129
-
2130 2133
   enum ProbeAction {
2131 2134
     ProbeStay          = 0,
2132 2135
     ProbeDeploy        = _BV(0),

Loading…
Откажи
Сачувај