diff --git a/K-ShakeTune/K-SnT_belts.cfg b/K-ShakeTune/K-SnT_belts.cfg
index 47bdedc..0322382 100644
--- a/K-ShakeTune/K-SnT_belts.cfg
+++ b/K-ShakeTune/K-SnT_belts.cfg
@@ -3,7 +3,7 @@
################################################
# Written by Frix_x#0161 #
-[gcode_macro BELTS_SHAPER_CALIBRATION]
+[gcode_macro COMPARE_BELTS_RESPONSES]
description: Perform a custom half-axis test to analyze and compare the frequency profiles of individual belts on CoreXY printers
gcode:
{% set min_freq = params.FREQ_START|default(5)|float %}
diff --git a/K-ShakeTune/K-SnT_vibrations.cfg b/K-ShakeTune/K-SnT_vibrations.cfg
index f3e78c0..dc69990 100644
--- a/K-ShakeTune/K-SnT_vibrations.cfg
+++ b/K-ShakeTune/K-SnT_vibrations.cfg
@@ -3,7 +3,7 @@
################################################
# Written by Frix_x#0161 #
-[gcode_macro VIBRATIONS_CALIBRATION]
+[gcode_macro SPEED_VIBRATIONS_PROFILE]
gcode:
{% set size = params.SIZE|default(60)|int %} # size of the area where the movements are done
{% set direction = params.DIRECTION|default('XY') %} # can be set to either XY, AB, ABXY, A, B, X, Y, Z
@@ -124,7 +124,7 @@ gcode:
{action_respond_info("This operation can not be interrupted by normal means. Hit the \"emergency stop\" button to stop it if needed")}
{action_respond_info("")}
- SAVE_GCODE_STATE NAME=STATE_VIBRATIONS_CALIBRATION
+ SAVE_GCODE_STATE NAME=STATE_SPEED_VIBRATIONS_PROFILE
G90
@@ -163,4 +163,4 @@ gcode:
# Restore the previous acceleration values
SET_VELOCITY_LIMIT ACCEL={old_accel} ACCEL_TO_DECEL={old_accel_to_decel} SQUARE_CORNER_VELOCITY={old_sqv}
- RESTORE_GCODE_STATE NAME=STATE_VIBRATIONS_CALIBRATION
+ RESTORE_GCODE_STATE NAME=STATE_SPEED_VIBRATIONS_PROFILE
diff --git a/K-ShakeTune/scripts/common_func.py b/K-ShakeTune/scripts/common_func.py
old mode 100644
new mode 100755
diff --git a/K-ShakeTune/scripts/graph_vibrations.py b/K-ShakeTune/scripts/graph_speed_vibrations.py
similarity index 98%
rename from K-ShakeTune/scripts/graph_vibrations.py
rename to K-ShakeTune/scripts/graph_speed_vibrations.py
index 4a7515d..ca0365f 100755
--- a/K-ShakeTune/scripts/graph_vibrations.py
+++ b/K-ShakeTune/scripts/graph_speed_vibrations.py
@@ -343,7 +343,7 @@ def sort_and_slice(raw_speeds, raw_datas, remove):
return raw_speeds, sliced_datas
-def vibrations_calibration(lognames, klipperdir="~/klipper", axisname=None, accel=None, max_freq=1000., remove=0):
+def speed_vibrations_profile(lognames, klipperdir="~/klipper", axisname=None, accel=None, max_freq=1000., remove=0):
set_locale()
global shaper_calibrate
shaper_calibrate = setup_klipper_import(klipperdir)
@@ -458,7 +458,7 @@ def main():
if options.remove > 50 or options.remove < 0:
opts.error("You must specify a correct percentage (option -r) in the 0-50 range")
- fig = vibrations_calibration(args, options.klipperdir, options.axisname, options.accel, options.max_freq, options.remove)
+ fig = speed_vibrations_profile(args, options.klipperdir, options.axisname, options.accel, options.max_freq, options.remove)
fig.savefig(options.output, dpi=150)
diff --git a/K-ShakeTune/scripts/is_workflow.py b/K-ShakeTune/scripts/is_workflow.py
index f072c63..3003574 100755
--- a/K-ShakeTune/scripts/is_workflow.py
+++ b/K-ShakeTune/scripts/is_workflow.py
@@ -25,7 +25,7 @@ KLIPPER_FOLDER = os.path.expanduser('~/klipper')
from graph_belts import belts_calibration
from graph_shaper import shaper_calibration
-from graph_vibrations import vibrations_calibration
+from graph_speed_vibrations import speed_vibrations_profile
from analyze_axesmap import axesmap_calibration
RESULTS_SUBFOLDERS = ['belts', 'inputshaper', 'vibrations']
@@ -162,7 +162,7 @@ def create_vibrations_graph(axis_name, accel, chip_name, keep_csv):
time.sleep(5)
# Generate the vibration graph and its name
- fig = vibrations_calibration(lognames, KLIPPER_FOLDER, axis_name, accel)
+ fig = speed_vibrations_profile(lognames, KLIPPER_FOLDER, axis_name, accel)
png_filename = os.path.join(RESULTS_FOLDER, RESULTS_SUBFOLDERS[2], f'vibrations_{current_date}_{axis_name}.png')
fig.savefig(png_filename, dpi=150)
diff --git a/K-ShakeTune/scripts/locale_utils.py b/K-ShakeTune/scripts/locale_utils.py
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
index cb55751..0df9d2d 100644
--- a/README.md
+++ b/README.md
@@ -13,9 +13,9 @@ It operates in two steps:
Check out the **[detailed documentation of the Shake&Tune module here](./docs/README.md)**. You can also look at the documentation for each type of graph by directly clicking on them below to better understand your results and tune your machine!
-| [Belts graph](./docs/macros/belts_tuning.md) | [Axis input shaper graphs](./docs/macros/axis_tuning.md) | [Vibrations graph](./docs/macros/vibrations_tuning.md) |
+| [Belts graph](./docs/macros/belts_tuning.md) | [Axis input shaper graphs](./docs/macros/axis_tuning.md) | [Vibrations graph](./docs/macros/vibrations_profile.md) |
|:----------------:|:------------:|:---------------------:|
-| [
](./docs/macros/belts_tuning.md) | [
](./docs/macros/axis_tuning.md) | [
](./docs/macros/vibrations_tuning.md) |
+| [
](./docs/macros/belts_tuning.md) | [
](./docs/macros/axis_tuning.md) | [
](./docs/macros/vibrations_profile.md) |
> **Note**:
>
@@ -41,10 +41,10 @@ Follow these steps to install the Shake&Tune module in your printer:
## Usage
Ensure your machine is homed, then invoke one of the following macros as needed:
- - `AXES_MAP_CALIBRATION` to automatically find Klipper's `axes_map` parameter for your accelerometer orientation (be careful, this is experimental for now).
- - `BELTS_SHAPER_CALIBRATION` for belt resonance graphs, useful for verifying belt tension and differential belt paths behavior.
- - `AXES_SHAPER_CALIBRATION` for input shaper graphs to mitigate ringing/ghosting by tuning Klipper's input shaper system.
- - `VIBRATIONS_CALIBRATION` for machine and motors vibration graphs, used to optimize your slicer speed profiles and TMC drivers parameters.
- - `EXCITATE_AXIS_AT_FREQ` to sustain a specific excitation frequency, useful to let you inspect and find out what is resonating.
+ - `AXES_MAP_CALIBRATION` to automatically find Klipper's `axes_map` parameter for your accelerometer orientation (be careful, this is experimental for now and known to give bad results).
+ - `COMPARE_BELTS_RESPONSES` for a differential belt resonance graph, useful for checking relative belt tensions and belt path behaviors on a CoreXY printer.
+ - `AXES_SHAPER_CALIBRATION` for standard input shaper graphs, used to mitigate ringing/ghosting by tuning Klipper's input shaper filters.
+ - `SPEED_VIBRATIONS_PROFILE` for vibration graphs as a function of toolhead speeds, used to optimize your slicer speed profiles and TMC driver parameters.
+ - `EXCITATE_AXIS_AT_FREQ` to maintain a specific excitation frequency, useful to inspect and find out what is resonating.
For further insights on the usage of these macros and the generated graphs, refer to the [K-Shake&Tune module documentation](./docs/README.md).
diff --git a/docs/README.md b/docs/README.md
index cb55236..3c520ca 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -8,9 +8,9 @@ First, check out the **[input shaping and tuning generalities](./is_tuning_gener
Then look at the documentation for each type of graph by clicking on them below tu run the tests and better understand your results to tune your machine!
-| [Belts graph](./macros/belts_tuning.md) | [Axis input shaper graphs](./macros/axis_tuning.md) | [Vibrations graph](./macros/vibrations_tuning.md) |
+| [Belts graph](./macros/belts_tuning.md) | [Axis input shaper graphs](./macros/axis_tuning.md) | [Vibrations graph](./macros/vibrations_profile.md) |
|:----------------:|:------------:|:---------------------:|
-| [
](./macros/belts_tuning.md) | [
](./macros/axis_tuning.md) | [
](./macros/vibrations_tuning.md) |
+| [
](./macros/belts_tuning.md) | [
](./macros/axis_tuning.md) | [
](./macros/vibrations_profile.md) |
## Additional macros
diff --git a/docs/macros/axis_tuning.md b/docs/macros/axis_tuning.md
index 394f2ab..e2efe5b 100644
--- a/docs/macros/axis_tuning.md
+++ b/docs/macros/axis_tuning.md
@@ -105,7 +105,7 @@ Here's how to troubleshoot the issue:
Such graph patterns can arise from various factors, and there isn't a one-size-fits-all solution. To address them:
1. A wobbly table can be the cause. So first thing to do is to try with the printer directly on the floor.
- 1. Ensure optimal belt tension using the [`BELTS_SHAPER_CALIBRATION` macro](./belts_tuning.md).
+ 1. Ensure optimal belt tension using the [`COMPARE_BELTS_RESPONSES` macro](./belts_tuning.md).
1. If problems persist, it might be due to an improperly squared gantry. For correction, refer to [Nero3D's de-racking video](https://youtu.be/cOn6u9kXvy0?si=ZCSdWU6br3Y9rGsy).
1. If it's still there... you will need to find out what is resonating to fix it. You can use the `EXCITATE_AXIS_AT_FREQ` macro to help you find it.
diff --git a/docs/macros/belts_tuning.md b/docs/macros/belts_tuning.md
index 6ee3d46..70a4c75 100644
--- a/docs/macros/belts_tuning.md
+++ b/docs/macros/belts_tuning.md
@@ -1,13 +1,13 @@
# Belt relative difference measurements
-The `BELTS_SHAPER_CALIBRATION` macro is dedicated for CoreXY machines where it can help you to diagnose belt path problems by measuring and plotting the differences between their behavior. It will also help you tension your belts at the same tension.
+The `COMPARE_BELTS_RESPONSES` macro is dedicated for CoreXY machines where it can help you to diagnose belt path problems by measuring and plotting the differences between their behavior. It will also help you tension your belts at the same tension.
## Usage
**Before starting, ensure that the belts are properly tensioned**. For example, you can follow the [Voron belt tensioning documentation](https://docs.vorondesign.com/tuning/secondary_printer_tuning.html#belt-tension). This is crucial: you need a good starting point to then iterate from it!
-Then, call the `BELTS_SHAPER_CALIBRATION` macro and look for the graphs in the results folder. Here are the parameters available:
+Then, call the `COMPARE_BELTS_RESPONSES` macro and look for the graphs in the results folder. Here are the parameters available:
| parameters | default value | description |
|-----------:|---------------|-------------|
diff --git a/docs/macros/vibrations_tuning.md b/docs/macros/vibrations_profile.md
similarity index 91%
rename from docs/macros/vibrations_tuning.md
rename to docs/macros/vibrations_profile.md
index a414d6e..359f571 100644
--- a/docs/macros/vibrations_tuning.md
+++ b/docs/macros/vibrations_profile.md
@@ -1,6 +1,6 @@
-# Vibrations measurements
+# Machine vibrations profiles
-The `VIBRATIONS_CALIBRATION` macro helps you to identify the speed settings that exacerbate the vibrations of the machine (ie. where the frame and motors resonate badly). This will help you to find the clean speed ranges where the machine is more silent and less prone to vertical fine artifacts on the prints.
+The `SPEED_VIBRATIONS_PROFILE` macro helps you to identify the speed settings that exacerbate the vibrations of the machine (ie. where the frame and motors resonate badly). This will help you to find the clean speed ranges where the machine is more silent and less prone to vertical fine artifacts on the prints.
> **Warning**
>
@@ -9,7 +9,7 @@ The `VIBRATIONS_CALIBRATION` macro helps you to identify the speed settings that
## Usage
-Call the `VIBRATIONS_CALIBRATION` macro with the direction and speed range you want to measure. Here are the parameters available:
+Call the `SPEED_VIBRATIONS_PROFILE` macro with the direction and speed range you want to measure. Here are the parameters available:
| parameters | default value | description |
|-----------:|---------------|-------------|