Properly purge AXES_MAP_CALIBRATION

Author: stew675

install.sh

@@ -109,18 +109,15 @@ function link_extension {
 }
 
 function link_module {
-    if [ ! -d "${KLIPPER_PATH}/klippy/extras/shaketune" ]; then
-        echo "[INSTALL] Linking Shake&Tune module to Klipper extras"
-        ln -frsn ${K_SHAKETUNE_PATH}/shaketune ${KLIPPER_PATH}/klippy/extras/shaketune
-    else
-        printf "[INSTALL] Klippain Shake&Tune Klipper module is already installed. Continuing...\n\n"
-    fi
+    mv ${KLIPPER_PATH}/klippy/extras/shaketune ${K_SHAKETUNE_PATH}/backups/shaketune_link.$date
+    echo "[INSTALL] Linking Shake&Tune module to Klipper extras"
+    ln -frsn ${K_SHAKETUNE_PATH}/shaketune ${KLIPPER_PATH}/klippy/extras/shaketune
 }
 
 function update_klipper {
     DATE=$(date +"%Y%m%d%H%M%S")
-    cp /home/mks/klipper/klippy/extras/resonance_tester.py backups/resonance_tester.py.$date
-    cp /home/mks/klipper/klippy/extras/shaper_calibrate.py backups/shaper_calibrate.py.$date
+    cp /home/mks/klipper/klippy/extras/resonance_tester.py ${K_SHAKETUNE_PATH}/backups/resonance_tester.py.$date
+    cp /home/mks/klipper/klippy/extras/shaper_calibrate.py ${K_SHAKETUNE_PATH}/backups/shaper_calibrate.py.$date
     cp resonance_tester.py shaper_calibrate.py /home/mks/klipper/klippy/extras
 }
 

shaketune/commands/__init__.py

@@ -7,7 +7,6 @@
 # Description: Imports various commands function (to run and record the tests) for the Shake&Tune package.
 
 
-from .axes_map_calibration import axes_map_calibration as axes_map_calibration
 from .axes_shaper_calibration import axes_shaper_calibration as axes_shaper_calibration
 from .compare_belts_responses import compare_belts_responses as compare_belts_responses
 from .create_vibrations_profile import create_vibrations_profile as create_vibrations_profile

shaketune/dummy_macros.cfg

@@ -32,16 +32,6 @@ gcode:
     _EXCITATE_AXIS_AT_FREQ {% for key, value in params_filtered.items() if value is defined and value is not none and value != '' %}{key}={value} {% endfor %}
 
 
-[gcode_macro AXES_MAP_CALIBRATION]
-description: dummy
-gcode:
-    {% set dummy = params.Z_HEIGHT|default(20) %}
-    {% set dummy = params.SPEED|default(80) %}
-    {% set dummy = params.ACCEL|default(1500) %}
-    {% set dummy = params.TRAVEL_SPEED|default(120) %}
-    _AXES_MAP_CALIBRATION {rawparams}
-
-
 [gcode_macro COMPARE_BELTS_RESPONSES]
 description: dummy
 gcode:

shaketune/shaketune.py

@@ -14,7 +14,6 @@
 from typing_extensions import Callable
 
 from .commands import (
-    axes_map_calibration,
     axes_shaper_calibration,
     compare_belts_responses,
     create_vibrations_profile,
@@ -37,10 +36,6 @@
     'EXCITATE_AXIS_AT_FREQ': (
         'Maintain a specified excitation frequency for a period of time to diagnose and locate a source of vibrations'
     ),
-    'AXES_MAP_CALIBRATION': (
-        'Perform a set of movements to measure the orientation of the accelerometer '
-        'and help you set the best axes_map configuration for your printer'
-    ),
     'COMPARE_BELTS_RESPONSES': (
         'Perform a custom half-axis test to analyze and compare the '
         'frequency profiles of individual belts on CoreXY or CoreXZ printers'
@@ -92,7 +87,6 @@ def _register_commands(self) -> None:
         gcode = self._printer.lookup_object('gcode')
         measurement_commands = [
             ('EXCITATE_AXIS_AT_FREQ', self.cmd_EXCITATE_AXIS_AT_FREQ, ST_COMMANDS['EXCITATE_AXIS_AT_FREQ']),
-            ('AXES_MAP_CALIBRATION', self.cmd_AXES_MAP_CALIBRATION, ST_COMMANDS['AXES_MAP_CALIBRATION']),
             ('COMPARE_BELTS_RESPONSES', self.cmd_COMPARE_BELTS_RESPONSES, ST_COMMANDS['COMPARE_BELTS_RESPONSES']),
             ('AXES_SHAPER_CALIBRATION', self.cmd_AXES_SHAPER_CALIBRATION, ST_COMMANDS['AXES_SHAPER_CALIBRATION']),
             ('CREATE_VIBRATIONS_PROFILE', self.cmd_CREATE_VIBRATIONS_PROFILE, ST_COMMANDS['CREATE_VIBRATIONS_PROFILE']),
@@ -169,9 +163,6 @@ def _cmd_helper(self, gcmd, graph_type: str, cmd_function: Callable) -> None:
     def cmd_EXCITATE_AXIS_AT_FREQ(self, gcmd) -> None:
         self._cmd_helper(gcmd, 'static frequency', excitate_axis_at_freq)
 
-    def cmd_AXES_MAP_CALIBRATION(self, gcmd) -> None:
-        self._cmd_helper(gcmd, 'axes map', axes_map_calibration)
-
     def cmd_COMPARE_BELTS_RESPONSES(self, gcmd) -> None:
         self._cmd_helper(gcmd, 'belts comparison', compare_belts_responses)