Skip to content

Commit ae42e0d

Browse files
committed
Max feedrate values changed to account for speed changes
1 parent 4dd82c2 commit ae42e0d

File tree

5 files changed

+29
-5
lines changed

5 files changed

+29
-5
lines changed

Marlin/config/hephestos/Configuration.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,9 +475,14 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
475475
// default settings
476476

477477
#define DEFAULT_AXIS_STEPS_PER_UNIT {80, 80, 4000,100.47095761381482} // default steps per unit for Ultimaker
478-
#define DEFAULT_MAX_FEEDRATE {200, 200, 3.3, 25} // (mm/sec)
479478
#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.
480479

480+
#ifndef PREFER_MAX_SPEED
481+
#define DEFAULT_MAX_FEEDRATE {167, 167, 3.3, 25} // (mm/sec)
482+
#else
483+
#define DEFAULT_MAX_FEEDRATE {200, 200, 3.3, 25} // (mm/sec)
484+
#endif // PREFER_MAX_SPEED
485+
481486
#define DEFAULT_ACCELERATION 1000 // X, Y, Z and E acceleration in mm/s^2 for printing moves
482487
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration in mm/s^2 for retracts
483488
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves

Marlin/config/hephestos_2/Configuration.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,9 +408,14 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
408408
// default settings
409409

410410
#define DEFAULT_AXIS_STEPS_PER_UNIT {160, 160, 8000, 210.02} // default steps per unit for Ultimaker
411-
#define DEFAULT_MAX_FEEDRATE {200, 200, 3.3, 200} // (mm/sec)
412411
#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.
413412

413+
#ifndef PREFER_MAX_SPEED
414+
#define DEFAULT_MAX_FEEDRATE {167, 167, 3.3, 167} // (mm/sec)
415+
#else
416+
#define DEFAULT_MAX_FEEDRATE {200, 200, 3.3, 200} // (mm/sec)
417+
#endif // PREFER_MAX_SPEED
418+
414419
#define DEFAULT_ACCELERATION 1000 // X, Y, Z and E max acceleration in mm/s^2 for printing moves
415420
#define DEFAULT_RETRACT_ACCELERATION 3000 // X, Y, Z and E max acceleration in mm/s^2 for retracts
416421
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y max acceleration in mm/s^2 for non extrusion movements

Marlin/config/hephestos_xl/Configuration.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,9 +481,14 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
481481
// default settings
482482

483483
#define DEFAULT_AXIS_STEPS_PER_UNIT {80, 80, 4000,100.47095761381482} // default steps per unit for Ultimaker
484-
#define DEFAULT_MAX_FEEDRATE {250, 250, 3.3, 25} // (mm/sec)
485484
#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.
486485

486+
#ifndef PREFER_MAX_SPEED
487+
#define DEFAULT_MAX_FEEDRATE {167, 167, 3.3, 25} // (mm/sec)
488+
#else
489+
#define DEFAULT_MAX_FEEDRATE {200, 200, 3.3, 25} // (mm/sec)
490+
#endif // PREFER_MAX_SPEED
491+
487492
#define DEFAULT_ACCELERATION 1000 // X, Y, Z and E acceleration in mm/s^2 for printing moves
488493
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration in mm/s^2 for retracts
489494
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves

Marlin/config/witbox/Configuration.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,9 +469,14 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
469469
// default settings
470470

471471
#define DEFAULT_AXIS_STEPS_PER_UNIT {80, 80, 1600, 102.073} // default steps per unit for Ultimaker
472-
#define DEFAULT_MAX_FEEDRATE {200, 200, 7.2, 80} // (mm/sec)
473472
#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.
474473

474+
#ifndef PREFER_MAX_SPEED
475+
#define DEFAULT_MAX_FEEDRATE {167, 167, 7.2, 80} // (mm/sec)
476+
#else
477+
#define DEFAULT_MAX_FEEDRATE {200, 200, 7.2, 80} // (mm/sec)
478+
#endif // PREFER_MAX_SPEED
479+
475480
#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration in mm/s^2 for printing moves
476481
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration in mm/s^2 for retracts
477482
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration in mm/s^2 for travel (non printing) moves

Marlin/config/witbox_2/Configuration.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,13 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
409409
// default settings
410410

411411
#define DEFAULT_AXIS_STEPS_PER_UNIT {160, 160, 800, 210.02} // default steps per unit for Ultimaker
412-
#define DEFAULT_MAX_FEEDRATE {200, 200, 40, 200} // (mm/sec)
413412
#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.
414413

414+
#ifndef PREFER_MAX_SPEED
415+
#define DEFAULT_MAX_FEEDRATE {167, 167, 40, 167} // (mm/sec)
416+
#else
417+
#define DEFAULT_MAX_FEEDRATE {200, 200, 40, 200} // (mm/sec)
418+
#endif // PREFER_MAX_SPEED
415419

416420
#define DEFAULT_ACCELERATION 1000 // X, Y, Z and E max acceleration in mm/s^2 for printing moves
417421
#define DEFAULT_RETRACT_ACCELERATION 3000 // X, Y, Z and E max acceleration in mm/s^2 for retracts

0 commit comments

Comments
 (0)