Browse Source

Rename some feedrate-oriented functions

Scott Lahteine 5 years ago
parent
commit
5e13fe989f

+ 2
- 2
Marlin/src/gcode/bedlevel/abl/G29.cpp View File

446
       }
446
       }
447
     #endif
447
     #endif
448
 
448
 
449
-    if (!faux) setup_for_endstop_or_probe_move();
449
+    if (!faux) remember_feedrate_scaling_off();
450
 
450
 
451
     #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
451
     #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
452
 
452
 
980
   } // !isnan(measured_z)
980
   } // !isnan(measured_z)
981
 
981
 
982
   // Restore state after probing
982
   // Restore state after probing
983
-  if (!faux) clean_up_after_endstop_or_probe_move();
983
+  if (!faux) restore_feedrate_and_scaling();
984
 
984
 
985
   if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< G29");
985
   if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< G29");
986
 
986
 

+ 2
- 2
Marlin/src/gcode/calibrate/G28.cpp View File

261
     extruder_duplication_enabled = false;
261
     extruder_duplication_enabled = false;
262
   #endif
262
   #endif
263
 
263
 
264
-  setup_for_endstop_or_probe_move();
264
+  remember_feedrate_scaling_off();
265
 
265
 
266
   endstops.enable(true); // Enable endstops for next homing move
266
   endstops.enable(true); // Enable endstops for next homing move
267
 
267
 
427
     set_bed_leveling_enabled(leveling_was_active);
427
     set_bed_leveling_enabled(leveling_was_active);
428
   #endif
428
   #endif
429
 
429
 
430
-  clean_up_after_endstop_or_probe_move();
430
+  restore_feedrate_and_scaling();
431
 
431
 
432
   // Restore the active tool after homing
432
   // Restore the active tool after homing
433
   #if HOTENDS > 1 && (DISABLED(DELTA) || ENABLED(DELTA_HOME_TO_SAFE_ZONE))
433
   #if HOTENDS > 1 && (DISABLED(DELTA) || ENABLED(DELTA_HOME_TO_SAFE_ZONE))

+ 2
- 2
Marlin/src/gcode/calibrate/G33.cpp View File

84
   #endif
84
   #endif
85
 
85
 
86
   planner.synchronize();
86
   planner.synchronize();
87
-  setup_for_endstop_or_probe_move();
87
+  remember_feedrate_scaling_off();
88
 
88
 
89
   #if HAS_LEVELING
89
   #if HAS_LEVELING
90
     if (reset_bed) reset_bed_level(); // After full calibration bed-level data is no longer valid
90
     if (reset_bed) reset_bed_level(); // After full calibration bed-level data is no longer valid
102
   #if HAS_BED_PROBE
102
   #if HAS_BED_PROBE
103
     STOW_PROBE();
103
     STOW_PROBE();
104
   #endif
104
   #endif
105
-  clean_up_after_endstop_or_probe_move();
105
+  restore_feedrate_and_scaling();
106
   #if HOTENDS > 1
106
   #if HOTENDS > 1
107
     tool_change(old_tool_index, true);
107
     tool_change(old_tool_index, true);
108
   #endif
108
   #endif

+ 2
- 2
Marlin/src/gcode/calibrate/M48.cpp View File

111
     set_bed_leveling_enabled(false);
111
     set_bed_leveling_enabled(false);
112
   #endif
112
   #endif
113
 
113
 
114
-  setup_for_endstop_or_probe_move();
114
+  remember_feedrate_scaling_off();
115
 
115
 
116
   float mean = 0.0, sigma = 0.0, min = 99999.9, max = -99999.9, sample_set[n_samples];
116
   float mean = 0.0, sigma = 0.0, min = 99999.9, max = -99999.9, sample_set[n_samples];
117
 
117
 
256
     #endif
256
     #endif
257
   }
257
   }
258
 
258
 
259
-  clean_up_after_endstop_or_probe_move();
259
+  restore_feedrate_and_scaling();
260
 
260
 
261
   // Re-enable bed level correction if it had been on
261
   // Re-enable bed level correction if it had been on
262
   #if HAS_LEVELING
262
   #if HAS_LEVELING

+ 2
- 2
Marlin/src/gcode/probe/G30.cpp View File

49
     set_bed_leveling_enabled(false);
49
     set_bed_leveling_enabled(false);
50
   #endif
50
   #endif
51
 
51
 
52
-  setup_for_endstop_or_probe_move();
52
+  remember_feedrate_scaling_off();
53
 
53
 
54
   const ProbePtRaise raise_after = parser.boolval('E', true) ? PROBE_PT_STOW : PROBE_PT_NONE;
54
   const ProbePtRaise raise_after = parser.boolval('E', true) ? PROBE_PT_STOW : PROBE_PT_NONE;
55
   const float measured_z = probe_at_point(xpos, ypos, raise_after, 1);
55
   const float measured_z = probe_at_point(xpos, ypos, raise_after, 1);
57
   if (!isnan(measured_z))
57
   if (!isnan(measured_z))
58
     SERIAL_ECHOLNPAIR("Bed X: ", FIXFLOAT(xpos), " Y: ", FIXFLOAT(ypos), " Z: ", FIXFLOAT(measured_z));
58
     SERIAL_ECHOLNPAIR("Bed X: ", FIXFLOAT(xpos), " Y: ", FIXFLOAT(ypos), " Z: ", FIXFLOAT(measured_z));
59
 
59
 
60
-  clean_up_after_endstop_or_probe_move();
60
+  restore_feedrate_and_scaling();
61
 
61
 
62
   #ifdef Z_AFTER_PROBING
62
   #ifdef Z_AFTER_PROBING
63
     if (raise_after == PROBE_PT_STOW) move_z_after_probing();
63
     if (raise_after == PROBE_PT_STOW) move_z_after_probing();

+ 2
- 2
Marlin/src/gcode/probe/G38.cpp View File

109
   // Get X Y Z E F
109
   // Get X Y Z E F
110
   get_destination_from_command();
110
   get_destination_from_command();
111
 
111
 
112
-  setup_for_endstop_or_probe_move();
112
+  remember_feedrate_scaling_off();
113
 
113
 
114
   const bool error_on_fail =
114
   const bool error_on_fail =
115
     #if ENABLED(G38_PROBE_AWAY)
115
     #if ENABLED(G38_PROBE_AWAY)
128
       break;
128
       break;
129
     }
129
     }
130
 
130
 
131
-  clean_up_after_endstop_or_probe_move();
131
+  restore_feedrate_and_scaling();
132
 }
132
 }
133
 
133
 
134
 #endif // G38_PROBE_TARGET
134
 #endif // G38_PROBE_TARGET

+ 5
- 2
Marlin/src/module/motion.cpp View File

439
 //
439
 //
440
 static float saved_feedrate_mm_s;
440
 static float saved_feedrate_mm_s;
441
 static int16_t saved_feedrate_percentage;
441
 static int16_t saved_feedrate_percentage;
442
-void setup_for_endstop_or_probe_move() {
442
+void remember_feedrate_and_scaling() {
443
   saved_feedrate_mm_s = feedrate_mm_s;
443
   saved_feedrate_mm_s = feedrate_mm_s;
444
   saved_feedrate_percentage = feedrate_percentage;
444
   saved_feedrate_percentage = feedrate_percentage;
445
+}
446
+void remember_feedrate_scaling_off() {
447
+  remember_feedrate_and_scaling();
445
   feedrate_percentage = 100;
448
   feedrate_percentage = 100;
446
 }
449
 }
447
-void clean_up_after_endstop_or_probe_move() {
450
+void restore_feedrate_and_scaling() {
448
   feedrate_mm_s = saved_feedrate_mm_s;
451
   feedrate_mm_s = saved_feedrate_mm_s;
449
   feedrate_percentage = saved_feedrate_percentage;
452
   feedrate_percentage = saved_feedrate_percentage;
450
 }
453
 }

+ 3
- 2
Marlin/src/module/motion.h View File

203
   do_blocking_move_to(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS], fr_mm_s);
203
   do_blocking_move_to(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS], fr_mm_s);
204
 }
204
 }
205
 
205
 
206
-void setup_for_endstop_or_probe_move();
207
-void clean_up_after_endstop_or_probe_move();
206
+void remember_feedrate_and_scaling();
207
+void remember_feedrate_scaling_off();
208
+void restore_feedrate_and_scaling();
208
 
209
 
209
 //
210
 //
210
 // Homing
211
 // Homing

Loading…
Cancel
Save