Skip to content

Commit 60f2837

Browse files
🔧 Minor INPUT_SHAPING config fixes (MarlinFirmware#26882)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
1 parent ef5fb39 commit 60f2837

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Marlin/Configuration_adv.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -1204,14 +1204,14 @@
12041204
//#define INPUT_SHAPING_Y
12051205
#if ANY(INPUT_SHAPING_X, INPUT_SHAPING_Y)
12061206
#if ENABLED(INPUT_SHAPING_X)
1207-
#define SHAPING_FREQ_X 40 // (Hz) The default dominant resonant frequency on the X axis.
1208-
#define SHAPING_ZETA_X 0.15f // Damping ratio of the X axis (range: 0.0 = no damping to 1.0 = critical damping).
1207+
#define SHAPING_FREQ_X 40.0 // (Hz) The default dominant resonant frequency on the X axis.
1208+
#define SHAPING_ZETA_X 0.15 // Damping ratio of the X axis (range: 0.0 = no damping to 1.0 = critical damping).
12091209
#endif
12101210
#if ENABLED(INPUT_SHAPING_Y)
1211-
#define SHAPING_FREQ_Y 40 // (Hz) The default dominant resonant frequency on the Y axis.
1212-
#define SHAPING_ZETA_Y 0.15f // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping).
1211+
#define SHAPING_FREQ_Y 40.0 // (Hz) The default dominant resonant frequency on the Y axis.
1212+
#define SHAPING_ZETA_Y 0.15 // Damping ratio of the Y axis (range: 0.0 = no damping to 1.0 = critical damping).
12131213
#endif
1214-
//#define SHAPING_MIN_FREQ 20 // By default the minimum of the shaping frequencies. Override to affect SRAM usage.
1214+
//#define SHAPING_MIN_FREQ 20.0 // (Hz) By default the minimum of the shaping frequencies. Override to affect SRAM usage.
12151215
//#define SHAPING_MAX_STEPRATE 10000 // By default the maximum total step rate of the shaped axes. Override to affect SRAM usage.
12161216
//#define SHAPING_MENU // Add a menu to the LCD to set shaping parameters.
12171217
#endif

Marlin/src/module/stepper.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@ constexpr ena_mask_t enable_overlap[] = {
159159
#endif
160160

161161
#ifndef SHAPING_MIN_FREQ
162-
#define SHAPING_MIN_FREQ _MIN(0x7FFFFFFFL OPTARG(INPUT_SHAPING_X, SHAPING_FREQ_X) OPTARG(INPUT_SHAPING_Y, SHAPING_FREQ_Y))
162+
#define SHAPING_MIN_FREQ _MIN(__FLT_MAX__ OPTARG(INPUT_SHAPING_X, SHAPING_FREQ_X) OPTARG(INPUT_SHAPING_Y, SHAPING_FREQ_Y))
163163
#endif
164-
constexpr uint16_t shaping_min_freq = SHAPING_MIN_FREQ,
165-
shaping_echoes = max_step_rate / shaping_min_freq / 2 + 3;
164+
constexpr float shaping_min_freq = SHAPING_MIN_FREQ;
165+
constexpr uint16_t shaping_echoes = FLOOR(max_step_rate / shaping_min_freq / 2) + 3;
166166

167167
typedef hal_timer_t shaping_time_t;
168168
enum shaping_echo_t { ECHO_NONE = 0, ECHO_FWD = 1, ECHO_BWD = 2 };

0 commit comments

Comments
 (0)