Skip to content

Commit 3db54b5

Browse files
thinkyheadthinkyhead
committed
🔧 Unified RESONANCE_TEST
MarlinFirmware/Marlin#28282
1 parent 174ecae commit 3db54b5

411 files changed

Lines changed: 1644 additions & 822 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config/default/Configuration_adv.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,8 +1204,6 @@
12041204
#define FTM_SHAPING_ZETA_E 0.03f // Zeta used by input shapers for E axis
12051205
#define FTM_SHAPING_V_TOL_E 0.05f // Vibration tolerance used by EI input shapers for E axis
12061206

1207-
//#define FTM_RESONANCE_TEST // Sine sweep motion for resonance study
1208-
12091207
//#define FTM_SMOOTHING // Smoothing can reduce artifacts and make steppers quieter
12101208
// on sharp corners, but too much will round corners.
12111209
#if ENABLED(FTM_SMOOTHING)
@@ -1295,6 +1293,10 @@
12951293
//#define SHAPING_MENU // Add a menu to the LCD to set shaping parameters.
12961294
#endif
12971295

1296+
#if ANY(INPUT_SHAPING_X, INPUT_SHAPING_Y, INPUT_SHAPING_Z, FTM_SHAPER_ZV, FTM_SHAPER_ZVD, FTM_SHAPER_ZVDD, FTM_SHAPER_ZVDDD, FTM_SHAPER_EI, FTM_SHAPER_2HEI, FTM_SHAPER_3HEI, FTM_SHAPER_MZV)
1297+
//#define RESONANCE_TEST // Sine sweep motion for resonance study
1298+
#endif
1299+
12981300
// @section motion
12991301

13001302
#define AXIS_RELATIVE_MODES { false, false, false, false }

‎config/examples/3DFabXYZ/Migbot/Configuration_adv.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,8 +1199,6 @@
11991199
#define FTM_SHAPING_ZETA_E 0.03f // Zeta used by input shapers for E axis
12001200
#define FTM_SHAPING_V_TOL_E 0.05f // Vibration tolerance used by EI input shapers for E axis
12011201

1202-
//#define FTM_RESONANCE_TEST // Sine sweep motion for resonance study
1203-
12041202
//#define FTM_SMOOTHING // Smoothing can reduce artifacts and make steppers quieter
12051203
// on sharp corners, but too much will round corners.
12061204
#if ENABLED(FTM_SMOOTHING)
@@ -1290,6 +1288,10 @@
12901288
//#define SHAPING_MENU // Add a menu to the LCD to set shaping parameters.
12911289
#endif
12921290

1291+
#if ANY(INPUT_SHAPING_X, INPUT_SHAPING_Y, INPUT_SHAPING_Z, FTM_SHAPER_ZV, FTM_SHAPER_ZVD, FTM_SHAPER_ZVDD, FTM_SHAPER_ZVDDD, FTM_SHAPER_EI, FTM_SHAPER_2HEI, FTM_SHAPER_3HEI, FTM_SHAPER_MZV)
1292+
//#define RESONANCE_TEST // Sine sweep motion for resonance study
1293+
#endif
1294+
12931295
// @section motion
12941296

12951297
#define AXIS_RELATIVE_MODES { false, false, false, false }

‎config/examples/3DMatik/XL/Configuration_adv.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,8 +1199,6 @@
11991199
#define FTM_SHAPING_ZETA_E 0.03f // Zeta used by input shapers for E axis
12001200
#define FTM_SHAPING_V_TOL_E 0.05f // Vibration tolerance used by EI input shapers for E axis
12011201

1202-
//#define FTM_RESONANCE_TEST // Sine sweep motion for resonance study
1203-
12041202
//#define FTM_SMOOTHING // Smoothing can reduce artifacts and make steppers quieter
12051203
// on sharp corners, but too much will round corners.
12061204
#if ENABLED(FTM_SMOOTHING)
@@ -1290,6 +1288,10 @@
12901288
//#define SHAPING_MENU // Add a menu to the LCD to set shaping parameters.
12911289
#endif
12921290

1291+
#if ANY(INPUT_SHAPING_X, INPUT_SHAPING_Y, INPUT_SHAPING_Z, FTM_SHAPER_ZV, FTM_SHAPER_ZVD, FTM_SHAPER_ZVDD, FTM_SHAPER_ZVDDD, FTM_SHAPER_EI, FTM_SHAPER_2HEI, FTM_SHAPER_3HEI, FTM_SHAPER_MZV)
1292+
//#define RESONANCE_TEST // Sine sweep motion for resonance study
1293+
#endif
1294+
12931295
// @section motion
12941296

12951297
#define AXIS_RELATIVE_MODES { false, false, false, false }

‎config/examples/ADIMLab/Gantry v1/Configuration_adv.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,8 +1199,6 @@
11991199
#define FTM_SHAPING_ZETA_E 0.03f // Zeta used by input shapers for E axis
12001200
#define FTM_SHAPING_V_TOL_E 0.05f // Vibration tolerance used by EI input shapers for E axis
12011201

1202-
//#define FTM_RESONANCE_TEST // Sine sweep motion for resonance study
1203-
12041202
//#define FTM_SMOOTHING // Smoothing can reduce artifacts and make steppers quieter
12051203
// on sharp corners, but too much will round corners.
12061204
#if ENABLED(FTM_SMOOTHING)
@@ -1290,6 +1288,10 @@
12901288
//#define SHAPING_MENU // Add a menu to the LCD to set shaping parameters.
12911289
#endif
12921290

1291+
#if ANY(INPUT_SHAPING_X, INPUT_SHAPING_Y, INPUT_SHAPING_Z, FTM_SHAPER_ZV, FTM_SHAPER_ZVD, FTM_SHAPER_ZVDD, FTM_SHAPER_ZVDDD, FTM_SHAPER_EI, FTM_SHAPER_2HEI, FTM_SHAPER_3HEI, FTM_SHAPER_MZV)
1292+
//#define RESONANCE_TEST // Sine sweep motion for resonance study
1293+
#endif
1294+
12931295
// @section motion
12941296

12951297
#define AXIS_RELATIVE_MODES { false, false, false, false }

‎config/examples/ADIMLab/Gantry v2/Configuration_adv.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,8 +1199,6 @@
11991199
#define FTM_SHAPING_ZETA_E 0.03f // Zeta used by input shapers for E axis
12001200
#define FTM_SHAPING_V_TOL_E 0.05f // Vibration tolerance used by EI input shapers for E axis
12011201

1202-
//#define FTM_RESONANCE_TEST // Sine sweep motion for resonance study
1203-
12041202
//#define FTM_SMOOTHING // Smoothing can reduce artifacts and make steppers quieter
12051203
// on sharp corners, but too much will round corners.
12061204
#if ENABLED(FTM_SMOOTHING)
@@ -1290,6 +1288,10 @@
12901288
//#define SHAPING_MENU // Add a menu to the LCD to set shaping parameters.
12911289
#endif
12921290

1291+
#if ANY(INPUT_SHAPING_X, INPUT_SHAPING_Y, INPUT_SHAPING_Z, FTM_SHAPER_ZV, FTM_SHAPER_ZVD, FTM_SHAPER_ZVDD, FTM_SHAPER_ZVDDD, FTM_SHAPER_EI, FTM_SHAPER_2HEI, FTM_SHAPER_3HEI, FTM_SHAPER_MZV)
1292+
//#define RESONANCE_TEST // Sine sweep motion for resonance study
1293+
#endif
1294+
12931295
// @section motion
12941296

12951297
#define AXIS_RELATIVE_MODES { false, false, false, false }

‎config/examples/Alfawise/U20-bltouch/Configuration_adv.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,8 +1208,6 @@
12081208
#define FTM_SHAPING_ZETA_E 0.03f // Zeta used by input shapers for E axis
12091209
#define FTM_SHAPING_V_TOL_E 0.05f // Vibration tolerance used by EI input shapers for E axis
12101210

1211-
//#define FTM_RESONANCE_TEST // Sine sweep motion for resonance study
1212-
12131211
//#define FTM_SMOOTHING // Smoothing can reduce artifacts and make steppers quieter
12141212
// on sharp corners, but too much will round corners.
12151213
#if ENABLED(FTM_SMOOTHING)
@@ -1299,6 +1297,10 @@
12991297
//#define SHAPING_MENU // Add a menu to the LCD to set shaping parameters.
13001298
#endif
13011299

1300+
#if ANY(INPUT_SHAPING_X, INPUT_SHAPING_Y, INPUT_SHAPING_Z, FTM_SHAPER_ZV, FTM_SHAPER_ZVD, FTM_SHAPER_ZVDD, FTM_SHAPER_ZVDDD, FTM_SHAPER_EI, FTM_SHAPER_2HEI, FTM_SHAPER_3HEI, FTM_SHAPER_MZV)
1301+
//#define RESONANCE_TEST // Sine sweep motion for resonance study
1302+
#endif
1303+
13021304
// @section motion
13031305

13041306
#define AXIS_RELATIVE_MODES { false, false, false, false }

‎config/examples/Alfawise/U20/Configuration_adv.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,8 +1199,6 @@
11991199
#define FTM_SHAPING_ZETA_E 0.03f // Zeta used by input shapers for E axis
12001200
#define FTM_SHAPING_V_TOL_E 0.05f // Vibration tolerance used by EI input shapers for E axis
12011201

1202-
//#define FTM_RESONANCE_TEST // Sine sweep motion for resonance study
1203-
12041202
//#define FTM_SMOOTHING // Smoothing can reduce artifacts and make steppers quieter
12051203
// on sharp corners, but too much will round corners.
12061204
#if ENABLED(FTM_SMOOTHING)
@@ -1290,6 +1288,10 @@
12901288
//#define SHAPING_MENU // Add a menu to the LCD to set shaping parameters.
12911289
#endif
12921290

1291+
#if ANY(INPUT_SHAPING_X, INPUT_SHAPING_Y, INPUT_SHAPING_Z, FTM_SHAPER_ZV, FTM_SHAPER_ZVD, FTM_SHAPER_ZVDD, FTM_SHAPER_ZVDDD, FTM_SHAPER_EI, FTM_SHAPER_2HEI, FTM_SHAPER_3HEI, FTM_SHAPER_MZV)
1292+
//#define RESONANCE_TEST // Sine sweep motion for resonance study
1293+
#endif
1294+
12931295
// @section motion
12941296

12951297
#define AXIS_RELATIVE_MODES { false, false, false, false }

‎config/examples/AliExpress/CL-260/Configuration_adv.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,8 +1199,6 @@
11991199
#define FTM_SHAPING_ZETA_E 0.03f // Zeta used by input shapers for E axis
12001200
#define FTM_SHAPING_V_TOL_E 0.05f // Vibration tolerance used by EI input shapers for E axis
12011201

1202-
//#define FTM_RESONANCE_TEST // Sine sweep motion for resonance study
1203-
12041202
//#define FTM_SMOOTHING // Smoothing can reduce artifacts and make steppers quieter
12051203
// on sharp corners, but too much will round corners.
12061204
#if ENABLED(FTM_SMOOTHING)
@@ -1290,6 +1288,10 @@
12901288
//#define SHAPING_MENU // Add a menu to the LCD to set shaping parameters.
12911289
#endif
12921290

1291+
#if ANY(INPUT_SHAPING_X, INPUT_SHAPING_Y, INPUT_SHAPING_Z, FTM_SHAPER_ZV, FTM_SHAPER_ZVD, FTM_SHAPER_ZVDD, FTM_SHAPER_ZVDDD, FTM_SHAPER_EI, FTM_SHAPER_2HEI, FTM_SHAPER_3HEI, FTM_SHAPER_MZV)
1292+
//#define RESONANCE_TEST // Sine sweep motion for resonance study
1293+
#endif
1294+
12931295
// @section motion
12941296

12951297
#define AXIS_RELATIVE_MODES { false, false, false, false }

‎config/examples/AliExpress/UM2pExt/Configuration_adv.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,8 +1199,6 @@
11991199
#define FTM_SHAPING_ZETA_E 0.03f // Zeta used by input shapers for E axis
12001200
#define FTM_SHAPING_V_TOL_E 0.05f // Vibration tolerance used by EI input shapers for E axis
12011201

1202-
//#define FTM_RESONANCE_TEST // Sine sweep motion for resonance study
1203-
12041202
//#define FTM_SMOOTHING // Smoothing can reduce artifacts and make steppers quieter
12051203
// on sharp corners, but too much will round corners.
12061204
#if ENABLED(FTM_SMOOTHING)
@@ -1290,6 +1288,10 @@
12901288
//#define SHAPING_MENU // Add a menu to the LCD to set shaping parameters.
12911289
#endif
12921290

1291+
#if ANY(INPUT_SHAPING_X, INPUT_SHAPING_Y, INPUT_SHAPING_Z, FTM_SHAPER_ZV, FTM_SHAPER_ZVD, FTM_SHAPER_ZVDD, FTM_SHAPER_ZVDDD, FTM_SHAPER_EI, FTM_SHAPER_2HEI, FTM_SHAPER_3HEI, FTM_SHAPER_MZV)
1292+
//#define RESONANCE_TEST // Sine sweep motion for resonance study
1293+
#endif
1294+
12931295
// @section motion
12941296

12951297
#define AXIS_RELATIVE_MODES { false, false, false, false }

‎config/examples/Anet/A2/Configuration_adv.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,8 +1199,6 @@
11991199
#define FTM_SHAPING_ZETA_E 0.03f // Zeta used by input shapers for E axis
12001200
#define FTM_SHAPING_V_TOL_E 0.05f // Vibration tolerance used by EI input shapers for E axis
12011201

1202-
//#define FTM_RESONANCE_TEST // Sine sweep motion for resonance study
1203-
12041202
//#define FTM_SMOOTHING // Smoothing can reduce artifacts and make steppers quieter
12051203
// on sharp corners, but too much will round corners.
12061204
#if ENABLED(FTM_SMOOTHING)
@@ -1290,6 +1288,10 @@
12901288
//#define SHAPING_MENU // Add a menu to the LCD to set shaping parameters.
12911289
#endif
12921290

1291+
#if ANY(INPUT_SHAPING_X, INPUT_SHAPING_Y, INPUT_SHAPING_Z, FTM_SHAPER_ZV, FTM_SHAPER_ZVD, FTM_SHAPER_ZVDD, FTM_SHAPER_ZVDDD, FTM_SHAPER_EI, FTM_SHAPER_2HEI, FTM_SHAPER_3HEI, FTM_SHAPER_MZV)
1292+
//#define RESONANCE_TEST // Sine sweep motion for resonance study
1293+
#endif
1294+
12931295
// @section motion
12941296

12951297
#define AXIS_RELATIVE_MODES { false, false, false, false }

0 commit comments

Comments
 (0)