Browse Source

Use the slower feedrate for XY axes

Scott Lahteine 9 years ago
parent
commit
2558c10c6c
2 changed files with 8 additions and 8 deletions
  1. 6
    6
      Marlin/Marlin_main.cpp
  2. 2
    2
      Marlin/ultralcd.cpp

+ 6
- 6
Marlin/Marlin_main.cpp View File

@@ -3806,23 +3806,23 @@ inline void gcode_M206() {
3806 3806
    * M666: Set delta endstop adjustment
3807 3807
    */
3808 3808
   inline void gcode_M666() {
3809
-    for (int8_t i = 0; i < 3; i++) {
3809
+    for (int8_t i = X_AXIS; i <= Z_AXIS; i++) {
3810 3810
       if (code_seen(axis_codes[i])) {
3811 3811
         endstop_adj[i] = code_value();
3812 3812
       }
3813 3813
     }
3814 3814
   }
3815
-#elif defined(Z_DUAL_ENDSTOPS)
3815
+#elif defined(Z_DUAL_ENDSTOPS) // !DELTA && defined(Z_DUAL_ENDSTOPS)
3816 3816
   /**
3817 3817
    * M666: For Z Dual Endstop setup, set z axis offset to the z2 axis.
3818 3818
    */
3819 3819
   inline void gcode_M666() {
3820
-   if (code_seen('Z')) z_endstop_adj = code_value();
3821
-   SERIAL_ECHOPAIR("Z Endstop Adjustment set to (mm):", z_endstop_adj );
3822
-   SERIAL_EOL;
3820
+    if (code_seen('Z')) z_endstop_adj = code_value();
3821
+    SERIAL_ECHOPAIR("Z Endstop Adjustment set to (mm):", z_endstop_adj);
3822
+    SERIAL_EOL;
3823 3823
   }
3824 3824
   
3825
-#endif // DELTA
3825
+#endif // !DELTA && defined(Z_DUAL_ENDSTOPS)
3826 3826
 
3827 3827
 #ifdef FWRETRACT
3828 3828
 

+ 2
- 2
Marlin/ultralcd.cpp View File

@@ -1831,7 +1831,7 @@ char *ftostr52(const float &x) {
1831 1831
           if (iy & 1) ix = (MESH_NUM_X_POINTS - 1) - ix; // Zig zag
1832 1832
           current_position[X_AXIS] = mbl.get_x(ix);
1833 1833
           current_position[Y_AXIS] = mbl.get_y(iy);
1834
-          line_to_current(X_AXIS);
1834
+          line_to_current(manual_feedrate[X_AXIS] <= manual_feedrate[Y_AXIS] ? X_AXIS : Y_AXIS);
1835 1835
           lcdDrawUpdate = 2;
1836 1836
         }
1837 1837
       }
@@ -1848,7 +1848,7 @@ char *ftostr52(const float &x) {
1848 1848
       plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
1849 1849
       current_position[X_AXIS] = MESH_MIN_X;
1850 1850
       current_position[Y_AXIS] = MESH_MIN_Y;
1851
-      line_to_current(X_AXIS);
1851
+      line_to_current(manual_feedrate[X_AXIS] <= manual_feedrate[Y_AXIS] ? X_AXIS : Y_AXIS);
1852 1852
       _lcd_level_bed_position = 0;
1853 1853
       lcd_goto_menu(_lcd_level_bed);
1854 1854
     }

Loading…
Cancel
Save