Skip to content

Commit

Permalink
Faster XY home/probe, MPC tuning, 20% slower Z accel, longer status d…
Browse files Browse the repository at this point in the history
…elay
  • Loading branch information
Sophist-UK committed Mar 1, 2024
1 parent f0d10fc commit 7ca7e7f
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_multiple.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ jobs:
secrets: inherit

nolcd:
name: "Build: NoLcd"
name: "Build: NoLcd ${{ inputs.null }}"
strategy:
fail-fast: false
matrix:
Expand Down
26 changes: 14 additions & 12 deletions Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -972,11 +972,11 @@
#define MPC_INCLUDE_FAN // Model the fan speed?

// Measured physical constants from M306
#define MPC_BLOCK_HEAT_CAPACITY { 16.7f } // (J/K) Heat block heat capacities.
#define MPC_SENSOR_RESPONSIVENESS { 0.22f } // (K/s per ∆K) Rate of change of sensor temperature from heat block.
#define MPC_AMBIENT_XFER_COEFF { 0.068f } // (W/K) Heat transfer coefficients from heat block to room air with fan off.
#define MPC_BLOCK_HEAT_CAPACITY { 11.7f } // (J/K) Heat block heat capacities.
#define MPC_SENSOR_RESPONSIVENESS { 0.215f } // (K/s per ∆K) Rate of change of sensor temperature from heat block.
#define MPC_AMBIENT_XFER_COEFF { 0.092f } // (W/K) Heat transfer coefficients from heat block to room air with fan off.
#if ENABLED(MPC_INCLUDE_FAN)
#define MPC_AMBIENT_XFER_COEFF_FAN255 { 0.097f } // (W/K) Heat transfer coefficients from heat block to room air with fan on full.
#define MPC_AMBIENT_XFER_COEFF_FAN255 { 0.106f } // (W/K) Heat transfer coefficients from heat block to room air with fan on full.
#endif

// For one fan and multiple hotends MPC needs to know how to apply the fan cooling effect.
Expand All @@ -994,11 +994,11 @@

// Advanced options
#define MPC_SMOOTHING_FACTOR 0.5f // (0.0...1.0) Noisy temperature sensors may need a lower value for stabilization.
#define MPC_MIN_AMBIENT_CHANGE 1.0f // (K/s) Modeled ambient temperature rate of change, when correcting model inaccuracies.
#define MPC_MIN_AMBIENT_CHANGE 1.0f // (K/s) Modelled ambient temperature rate of change, when correcting model inaccuracies.
#define MPC_STEADYSTATE 0.5f // (K/s) Temperature change rate for steady state logic to be enforced.

#define MPC_TUNING_POS { X_CENTER, Y_CENTER, 1.0f } // (mm) M306 Autotuning position, ideally bed center at first layer height.
#define MPC_TUNING_END_Z 10.0f // (mm) M306 Autotuning final Z position.
#define MPC_TUNING_END_Z 5.0f // (mm) M306 Autotuning final Z position.
#endif

//===========================================================================
Expand Down Expand Up @@ -1497,7 +1497,8 @@
* Override with M201
* X, Y, Z [, I [, J [, K...]]], E0 [, E1[, E2...]]
*/
#define DEFAULT_MAX_ACCELERATION { 3000, 1000, 20, 10000 }
//#define DEFAULT_MAX_ACCELERATION { 3000, 1000, 20, 10000 }
#define DEFAULT_MAX_ACCELERATION { 3000, 1000, 16, 10000 }

//#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
#if ENABLED(LIMITED_MAX_ACCEL_EDITING)
Expand Down Expand Up @@ -1820,7 +1821,7 @@
#define PROBING_MARGIN 20

// X and Y axis travel speed (mm/min) between probes
#define XY_PROBE_FEEDRATE (133*60)
#define XY_PROBE_FEEDRATE (250*60)

// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
#define Z_PROBE_FEEDRATE_FAST (5*60) // Dagoma value (4*60)
Expand Down Expand Up @@ -1892,7 +1893,7 @@
*/
#define Z_CLEARANCE_DEPLOY_PROBE 10 // (mm) Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // (mm) Z Clearance between probe points
#define Z_CLEARANCE_MULTI_PROBE 5 // (mm) Z Clearance between multiple probes
#define Z_CLEARANCE_MULTI_PROBE 2 // (mm) Z Clearance between multiple probes
//#define Z_AFTER_PROBING 5 // (mm) Z position after probing is done

#define Z_PROBE_LOW_POINT -2 // (mm) Farthest distance below the trigger-point to go before stopping
Expand Down Expand Up @@ -2292,7 +2293,7 @@
*/
#define ENABLE_LEVELING_FADE_HEIGHT
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
#define DEFAULT_LEVELING_FADE_HEIGHT 10.0 // (mm) Default fade height.
#define DEFAULT_LEVELING_FADE_HEIGHT 5.0 // (mm) Default fade height.
#endif

/**
Expand Down Expand Up @@ -2335,7 +2336,7 @@

// Beyond the probed grid, continue the implied tilt?
// Default is to maintain the height of the nearest edge.
//#define EXTRAPOLATE_BEYOND_GRID
#define EXTRAPOLATE_BEYOND_GRID

//
// Subdivision of the grid by Catmull-Rom method.
Expand Down Expand Up @@ -2466,7 +2467,8 @@
#endif

// Homing speeds (linear=mm/min, rotational=°/min)
#define HOMING_FEEDRATE_MM_M { (50*60), (50*60), (5*60) } // Dagoma value (4*60)
//#define HOMING_FEEDRATE_MM_M { (50*60), (50*60), (5*60) } // Dagoma value (4*60)
#define HOMING_FEEDRATE_MM_M { (100*60), (100*60), (5*60) } // Dagoma value (4*60)

// Validate that endstops are triggered on homing moves
#define VALIDATE_HOMING_ENDSTOPS
Expand Down
2 changes: 1 addition & 1 deletion Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -1441,7 +1441,7 @@

#if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
// The timeout to return to the status screen from sub-menus
#define LCD_TIMEOUT_TO_STATUS 20000 // (ms) - Dagoma default 10s, Marlin default 15s
#define LCD_TIMEOUT_TO_STATUS 30000 // (ms) - Dagoma default 10s, Marlin default 15s

#if ENABLED(SHOW_BOOTSCREEN)
#define BOOTSCREEN_TIMEOUT 1000 // (ms) Total Duration to display the boot screen(s)
Expand Down

0 comments on commit 7ca7e7f

Please sign in to comment.