Max feedrate values changed to account for speed changes

bq · Jun 13, 2016 · ae42e0d · ae42e0d
1 parent 4dd82c2
commit ae42e0d
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 5 deletions.
diff --git a/Marlin/config/hephestos/Configuration.h b/Marlin/config/hephestos/Configuration.h
@@ -475,9 +475,14 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
 // default settings
 
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {80, 80, 4000,100.47095761381482}  // default steps per unit for Ultimaker
-#define DEFAULT_MAX_FEEDRATE          {200, 200, 3.3, 25}    // (mm/sec)
 #define DEFAULT_MAX_ACCELERATION      {3000,3000,100,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
 
+#ifndef PREFER_MAX_SPEED
+	#define DEFAULT_MAX_FEEDRATE          {167, 167, 3.3, 25}    // (mm/sec)
+#else
+	#define DEFAULT_MAX_FEEDRATE          {200, 200, 3.3, 25}    // (mm/sec)
+#endif // PREFER_MAX_SPEED
+
 #define DEFAULT_ACCELERATION          1000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
 #define DEFAULT_RETRACT_ACCELERATION  1000   // E acceleration in mm/s^2 for retracts
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves

diff --git a/Marlin/config/hephestos_2/Configuration.h b/Marlin/config/hephestos_2/Configuration.h
@@ -408,9 +408,14 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
 // default settings
 
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {160, 160, 8000, 210.02} // default steps per unit for Ultimaker
-#define DEFAULT_MAX_FEEDRATE          {200, 200, 3.3, 200}      // (mm/sec)
 #define DEFAULT_MAX_ACCELERATION      {1000, 1000, 100, 3000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
 
+#ifndef PREFER_MAX_SPEED
+	#define DEFAULT_MAX_FEEDRATE          {167, 167, 3.3, 167}      // (mm/sec)
+#else
+	#define DEFAULT_MAX_FEEDRATE          {200, 200, 3.3, 200}      // (mm/sec)
+#endif // PREFER_MAX_SPEED
+
 #define DEFAULT_ACCELERATION          1000   // X, Y, Z and E max acceleration in mm/s^2 for printing moves
 #define DEFAULT_RETRACT_ACCELERATION  3000   // X, Y, Z and E max acceleration in mm/s^2 for retracts
 #define DEFAULT_TRAVEL_ACCELERATION   1000   // X, Y max acceleration in mm/s^2 for non extrusion movements

diff --git a/Marlin/config/hephestos_xl/Configuration.h b/Marlin/config/hephestos_xl/Configuration.h
@@ -481,9 +481,14 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
 // default settings
 
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {80, 80, 4000,100.47095761381482}  // default steps per unit for Ultimaker
-#define DEFAULT_MAX_FEEDRATE          {250, 250, 3.3, 25}    // (mm/sec)
 #define DEFAULT_MAX_ACCELERATION      {3000,3000,100,10000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
 
+#ifndef PREFER_MAX_SPEED
+	#define DEFAULT_MAX_FEEDRATE          {167, 167, 3.3, 25}    // (mm/sec)
+#else
+	#define DEFAULT_MAX_FEEDRATE          {200, 200, 3.3, 25}    // (mm/sec)
+#endif // PREFER_MAX_SPEED
+
 #define DEFAULT_ACCELERATION          1000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
 #define DEFAULT_RETRACT_ACCELERATION  1000   // E acceleration in mm/s^2 for retracts
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves

diff --git a/Marlin/config/witbox/Configuration.h b/Marlin/config/witbox/Configuration.h
@@ -469,9 +469,14 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
 // default settings
 
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {80, 80, 1600, 102.073}  // default steps per unit for Ultimaker
-#define DEFAULT_MAX_FEEDRATE          {200, 200, 7.2, 80}    // (mm/sec)
 #define DEFAULT_MAX_ACCELERATION      {1000, 1000, 10, 1000}    // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
 
+#ifndef PREFER_MAX_SPEED
+	#define DEFAULT_MAX_FEEDRATE          {167, 167, 7.2, 80}    // (mm/sec)
+#else
+	#define DEFAULT_MAX_FEEDRATE          {200, 200, 7.2, 80}    // (mm/sec)
+#endif // PREFER_MAX_SPEED
+
 #define DEFAULT_ACCELERATION          3000    // X, Y, Z and E acceleration in mm/s^2 for printing moves
 #define DEFAULT_RETRACT_ACCELERATION  3000   // E acceleration in mm/s^2 for retracts
 #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves

diff --git a/Marlin/config/witbox_2/Configuration.h b/Marlin/config/witbox_2/Configuration.h
@@ -409,9 +409,13 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
 // default settings
 
 #define DEFAULT_AXIS_STEPS_PER_UNIT   {160, 160, 800, 210.02}   // default steps per unit for Ultimaker
-#define DEFAULT_MAX_FEEDRATE          {200, 200, 40, 200}        // (mm/sec)
 #define DEFAULT_MAX_ACCELERATION      {1000, 1000, 1000, 3000}   // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for Skeinforge 40+, for older versions raise them a lot.
 
+#ifndef PREFER_MAX_SPEED
+	#define DEFAULT_MAX_FEEDRATE          {167, 167, 40, 167}        // (mm/sec)
+#else
+	#define DEFAULT_MAX_FEEDRATE          {200, 200, 40, 200}        // (mm/sec)
+#endif // PREFER_MAX_SPEED
 
 #define DEFAULT_ACCELERATION          1000    // X, Y, Z and E max acceleration in mm/s^2 for printing moves
 #define DEFAULT_RETRACT_ACCELERATION  3000   // X, Y, Z and E max acceleration in mm/s^2 for retracts