Browse Source

Reverse bools on prepare_move sub-functions

Scott Lahteine 7 years ago
parent
commit
037c964d26
1 changed files with 12 additions and 12 deletions
  1. 12
    12
      Marlin/Marlin_main.cpp

+ 12
- 12
Marlin/Marlin_main.cpp View File

10877
     // If the move is only in Z/E don't split up the move
10877
     // If the move is only in Z/E don't split up the move
10878
     if (ltarget[X_AXIS] == current_position[X_AXIS] && ltarget[Y_AXIS] == current_position[Y_AXIS]) {
10878
     if (ltarget[X_AXIS] == current_position[X_AXIS] && ltarget[Y_AXIS] == current_position[Y_AXIS]) {
10879
       planner.buffer_line_kinematic(ltarget, _feedrate_mm_s, active_extruder);
10879
       planner.buffer_line_kinematic(ltarget, _feedrate_mm_s, active_extruder);
10880
-      return true;
10880
+      return false;
10881
     }
10881
     }
10882
 
10882
 
10883
     // Get the cartesian distances moved in XYZE
10883
     // Get the cartesian distances moved in XYZE
10891
     if (UNEAR_ZERO(cartesian_mm)) cartesian_mm = abs(difference[E_AXIS]);
10891
     if (UNEAR_ZERO(cartesian_mm)) cartesian_mm = abs(difference[E_AXIS]);
10892
 
10892
 
10893
     // No E move either? Game over.
10893
     // No E move either? Game over.
10894
-    if (UNEAR_ZERO(cartesian_mm)) return false;
10894
+    if (UNEAR_ZERO(cartesian_mm)) return true;
10895
 
10895
 
10896
     // Minimum number of seconds to move the given distance
10896
     // Minimum number of seconds to move the given distance
10897
     float seconds = cartesian_mm / _feedrate_mm_s;
10897
     float seconds = cartesian_mm / _feedrate_mm_s;
10976
       planner.buffer_line_kinematic(ltarget, _feedrate_mm_s, active_extruder);
10976
       planner.buffer_line_kinematic(ltarget, _feedrate_mm_s, active_extruder);
10977
     #endif
10977
     #endif
10978
 
10978
 
10979
-    return true;
10979
+    return false;
10980
   }
10980
   }
10981
 
10981
 
10982
 #else // !IS_KINEMATIC
10982
 #else // !IS_KINEMATIC
10996
       #if ENABLED(MESH_BED_LEVELING)
10996
       #if ENABLED(MESH_BED_LEVELING)
10997
         if (mbl.active()) {
10997
         if (mbl.active()) {
10998
           mesh_line_to_destination(MMS_SCALED(feedrate_mm_s));
10998
           mesh_line_to_destination(MMS_SCALED(feedrate_mm_s));
10999
-          return false;
10999
+          return true;
11000
         }
11000
         }
11001
         else
11001
         else
11002
       #elif ENABLED(AUTO_BED_LEVELING_UBL)
11002
       #elif ENABLED(AUTO_BED_LEVELING_UBL)
11003
         if (ubl.state.active) {
11003
         if (ubl.state.active) {
11004
           ubl_line_to_destination(MMS_SCALED(feedrate_mm_s), active_extruder);
11004
           ubl_line_to_destination(MMS_SCALED(feedrate_mm_s), active_extruder);
11005
-          return false;
11005
+          return true;
11006
         }
11006
         }
11007
         else
11007
         else
11008
       #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
11008
       #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
11009
         if (planner.abl_enabled) {
11009
         if (planner.abl_enabled) {
11010
           bilinear_line_to_destination(MMS_SCALED(feedrate_mm_s));
11010
           bilinear_line_to_destination(MMS_SCALED(feedrate_mm_s));
11011
-          return false;
11011
+          return true;
11012
         }
11012
         }
11013
         else
11013
         else
11014
       #endif
11014
       #endif
11015
           line_to_destination(MMS_SCALED(feedrate_mm_s));
11015
           line_to_destination(MMS_SCALED(feedrate_mm_s));
11016
     }
11016
     }
11017
-    return true;
11017
+    return false;
11018
   }
11018
   }
11019
 
11019
 
11020
 #endif // !IS_KINEMATIC
11020
 #endif // !IS_KINEMATIC
11038
               set_current_to_destination();
11038
               set_current_to_destination();
11039
               NOLESS(raised_parked_position[Z_AXIS], destination[Z_AXIS]);
11039
               NOLESS(raised_parked_position[Z_AXIS], destination[Z_AXIS]);
11040
               delayed_move_time = millis();
11040
               delayed_move_time = millis();
11041
-              return false;
11041
+              return true;
11042
             }
11042
             }
11043
           }
11043
           }
11044
           // unpark extruder: 1) raise, 2) move into starting XY position, 3) lower
11044
           // unpark extruder: 1) raise, 2) move into starting XY position, 3) lower
11093
           break;
11093
           break;
11094
       }
11094
       }
11095
     }
11095
     }
11096
-    return true;
11096
+    return false;
11097
   }
11097
   }
11098
 
11098
 
11099
 #endif // DUAL_X_CARRIAGE
11099
 #endif // DUAL_X_CARRIAGE
11130
   #endif
11130
   #endif
11131
 
11131
 
11132
   #if IS_KINEMATIC
11132
   #if IS_KINEMATIC
11133
-    if (!prepare_kinematic_move_to(destination)) return;
11133
+    if (prepare_kinematic_move_to(destination)) return;
11134
   #else
11134
   #else
11135
     #if ENABLED(DUAL_X_CARRIAGE)
11135
     #if ENABLED(DUAL_X_CARRIAGE)
11136
-      if (!prepare_move_to_destination_dualx()) return;
11136
+      if (prepare_move_to_destination_dualx()) return;
11137
     #endif
11137
     #endif
11138
-    if (!prepare_move_to_destination_cartesian()) return;
11138
+    if (prepare_move_to_destination_cartesian()) return;
11139
   #endif
11139
   #endif
11140
 
11140
 
11141
   set_current_to_destination();
11141
   set_current_to_destination();

Loading…
Cancel
Save