Przeglądaj źródła

Rename some movement sub-functions

Scott Lahteine 9 lat temu
rodzic
commit
c42f8fb8dd
1 zmienionych plików z 4 dodań i 4 usunięć
  1. 4
    4
      Marlin/Marlin_main.cpp

+ 4
- 4
Marlin/Marlin_main.cpp Wyświetl plik

7537
 
7537
 
7538
 #if ENABLED(DUAL_X_CARRIAGE)
7538
 #if ENABLED(DUAL_X_CARRIAGE)
7539
 
7539
 
7540
-  inline bool prepare_move_dual_x_carriage() {
7540
+  inline bool prepare_move_to_destination_dualx() {
7541
     if (active_extruder_parked) {
7541
     if (active_extruder_parked) {
7542
       if (dual_x_carriage_mode == DXC_DUPLICATION_MODE && active_extruder == 0) {
7542
       if (dual_x_carriage_mode == DXC_DUPLICATION_MODE && active_extruder == 0) {
7543
         // move duplicate extruder into correct duplication position.
7543
         // move duplicate extruder into correct duplication position.
7576
 
7576
 
7577
 #if DISABLED(DELTA) && DISABLED(SCARA)
7577
 #if DISABLED(DELTA) && DISABLED(SCARA)
7578
 
7578
 
7579
-  inline bool prepare_cartesian_move_to_destination() {
7579
+  inline bool prepare_move_to_destination_cartesian() {
7580
     // Do not use feedrate_multiplier for E or Z only moves
7580
     // Do not use feedrate_multiplier for E or Z only moves
7581
     if (current_position[X_AXIS] == destination[X_AXIS] && current_position[Y_AXIS] == destination[Y_AXIS]) {
7581
     if (current_position[X_AXIS] == destination[X_AXIS] && current_position[Y_AXIS] == destination[Y_AXIS]) {
7582
       line_to_destination();
7582
       line_to_destination();
7637
     if (!prepare_delta_move_to(destination)) return;
7637
     if (!prepare_delta_move_to(destination)) return;
7638
   #else
7638
   #else
7639
     #if ENABLED(DUAL_X_CARRIAGE)
7639
     #if ENABLED(DUAL_X_CARRIAGE)
7640
-      if (!prepare_move_dual_x_carriage()) return;
7640
+      if (!prepare_move_to_destination_dualx()) return;
7641
     #endif
7641
     #endif
7642
-    if (!prepare_cartesian_move_to_destination()) return;
7642
+    if (!prepare_move_to_destination_cartesian()) return;
7643
   #endif
7643
   #endif
7644
 
7644
 
7645
   set_current_to_destination();
7645
   set_current_to_destination();

Ładowanie…
Anuluj
Zapisz