Merge pull request #94 from Frix-x/develop

Shake&Tune v3.0.0

.git-blame-ignore-revs

@@ -0,0 +1 @@
+ef006dbd1e31cc7cae2fae978401a818ee2025d1

.gitignore

@@ -158,3 +158,6 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+
+test/
+.vscode/

K-ShakeTune/K-SnT_axis.cfg

@@ -13,7 +13,7 @@ gcode:
     {% set scv = params.SCV|default(None) %}
     {% set max_sm = params.MAX_SMOOTHING|default(None) %}
     {% set keep_results = params.KEEP_N_RESULTS|default(3)|int %}
-    {% set keep_csv = params.KEEP_CSV|default(True) %}
+    {% set keep_csv = params.KEEP_CSV|default(0)|int %}
 
     {% set X, Y = False, False %}
 
@@ -27,17 +27,21 @@ gcode:
         { action_raise_error("AXIS selection invalid. Should be either all, x or y!") }
     {% endif %}
 
-    {% if scv is none %}
+    {% if scv is none or scv == "" %}
         {% set scv = printer.toolhead.square_corner_velocity %}
     {% endif %}
 
+    {% if max_sm == "" %}
+        {% set max_sm = none %}
+    {% endif %}
+
     {% if X %}
         TEST_RESONANCES AXIS=X OUTPUT=raw_data NAME=x FREQ_START={min_freq} FREQ_END={max_freq} HZ_PER_SEC={hz_per_sec}
         M400
 
         RESPOND MSG="X axis frequency profile generation..."
         RESPOND MSG="This may take some time (1-3min)"
-        RUN_SHELL_COMMAND CMD=shaketune PARAMS="--type shaper --scv {scv} {% if max_sm is not none %}--max_smoothing {max_sm}{% endif %} {% if keep_csv %}--keep_csv{% endif %}"
+        RUN_SHELL_COMMAND CMD=shaketune PARAMS="--type shaper --scv {scv} {% if max_sm is not none %}--max_smoothing {max_sm}{% endif %} {% if keep_csv %}--keep_csv{% endif %} --keep_results {keep_results}"
     {% endif %}
 
     {% if Y %}
@@ -46,8 +50,5 @@ gcode:
 
         RESPOND MSG="Y axis frequency profile generation..."
         RESPOND MSG="This may take some time (1-3min)"
-        RUN_SHELL_COMMAND CMD=shaketune PARAMS="--type shaper --scv {scv} {% if max_sm is not none %}--max_smoothing {max_sm}{% endif %} {% if keep_csv %}--keep_csv{% endif %}"
+        RUN_SHELL_COMMAND CMD=shaketune PARAMS="--type shaper --scv {scv} {% if max_sm is not none %}--max_smoothing {max_sm}{% endif %} {% if keep_csv %}--keep_csv{% endif %} --keep_results {keep_results}"
     {% endif %}
-
-    M400
-    RUN_SHELL_COMMAND CMD=shaketune PARAMS="--type clean --keep_results {keep_results}"

K-ShakeTune/K-SnT_belts.cfg

@@ -3,14 +3,14 @@
 ################################################
 # 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 %}
     {% set max_freq = params.FREQ_END|default(133.33)|float %}
     {% set hz_per_sec = params.HZ_PER_SEC|default(1)|float %}
     {% set keep_results = params.KEEP_N_RESULTS|default(3)|int %}
-    {% set keep_csv = params.KEEP_CSV|default(True) %}
+    {% set keep_csv = params.KEEP_CSV|default(0)|int %}
 
     TEST_RESONANCES AXIS=1,1 OUTPUT=raw_data NAME=b FREQ_START={min_freq} FREQ_END={max_freq} HZ_PER_SEC={hz_per_sec}
     M400
@@ -20,6 +20,4 @@ gcode:
 
     RESPOND MSG="Belts comparative frequency profile generation..."
     RESPOND MSG="This may take some time (3-5min)"
-    RUN_SHELL_COMMAND CMD=shaketune PARAMS="--type belts {% if keep_csv %}--keep_csv{% endif %}"
-    M400
-    RUN_SHELL_COMMAND CMD=shaketune PARAMS="--type clean --keep_results {keep_results}"
+    RUN_SHELL_COMMAND CMD=shaketune PARAMS="--type belts {% if keep_csv %}--keep_csv{% endif %} --keep_results {keep_results}"