Skip to content

Commit ffbf6ac

Browse files
committed
🩹 Fix M502 init of default motion
Fix regression from #25035
1 parent 8bafc1d commit ffbf6ac

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

Marlin/src/module/settings.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,8 @@ typedef struct { bool NUM_AXIS_LIST(X:1, Y:1, Z:1, I:1, J:1, K:1, U:1, V:1,
193193

194194
// Defaults for reset / fill in on load
195195
static const uint32_t _DMA[] PROGMEM = DEFAULT_MAX_ACCELERATION;
196+
static const float _DASU[] PROGMEM = DEFAULT_AXIS_STEPS_PER_UNIT;
197+
static const feedRate_t _DMF[] PROGMEM = DEFAULT_MAX_FEEDRATE;
196198

197199
/**
198200
* Current EEPROM Layout

Marlin/src/module/stepper.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -326,22 +326,21 @@ constexpr ena_mask_t enable_overlap[] = {
326326
#endif
327327
};
328328

329-
constexpr float _DASU[] = DEFAULT_AXIS_STEPS_PER_UNIT;
330-
constexpr feedRate_t _DMF[] = DEFAULT_MAX_FEEDRATE;
331-
332329
//static_assert(!any_enable_overlap(), "There is some overlap.");
333330

334331
#if HAS_SHAPING
335332

336333
#ifdef SHAPING_MAX_STEPRATE
337334
constexpr float max_step_rate = SHAPING_MAX_STEPRATE;
338335
#else
339-
constexpr float max_shaped_rate = TERN0(INPUT_SHAPING_X, _DMF[X_AXIS] * _DASU[X_AXIS]) +
340-
TERN0(INPUT_SHAPING_Y, _DMF[Y_AXIS] * _DASU[Y_AXIS]);
336+
constexpr float _ISDASU[] = DEFAULT_AXIS_STEPS_PER_UNIT;
337+
constexpr feedRate_t _ISDMF[] = DEFAULT_MAX_FEEDRATE;
338+
constexpr float max_shaped_rate = TERN0(INPUT_SHAPING_X, _ISDMF[X_AXIS] * _ISDASU[X_AXIS]) +
339+
TERN0(INPUT_SHAPING_Y, _ISDMF[Y_AXIS] * _ISDASU[Y_AXIS]);
341340
#if defined(__AVR__) || !defined(ADAPTIVE_STEP_SMOOTHING)
342341
// MIN_STEP_ISR_FREQUENCY is known at compile time on AVRs and any reduction in SRAM is welcome
343342
template<int INDEX=DISTINCT_AXES> constexpr float max_isr_rate() {
344-
return _MAX(_DMF[INDEX - 1] * _DASU[INDEX - 1], max_isr_rate<INDEX - 1>());
343+
return _MAX(_ISDMF[INDEX - 1] * _ISDASU[INDEX - 1], max_isr_rate<INDEX - 1>());
345344
}
346345
template<> constexpr float max_isr_rate<0>() {
347346
return TERN0(ADAPTIVE_STEP_SMOOTHING, MIN_STEP_ISR_FREQUENCY);

0 commit comments

Comments
 (0)