fixed K-Shake&Tune integration

Frix-x · Feb 22, 2024 · 7de5d57 · 7de5d57
1 parent ef862ad
commit 7de5d57
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 11 deletions.
diff --git a/config/hardware/accelerometers/adxl345_Fysetc_SB_Can_TH.cfg b/config/hardware/accelerometers/adxl345_Fysetc_SB_Can_TH.cfg
@@ -6,4 +6,3 @@ cs_pin: toolhead:ADXL_CS
 spi_software_sclk_pin: toolhead:ADXL_SCLK
 spi_software_mosi_pin: toolhead:ADXL_MOSI
 spi_software_miso_pin: toolhead:ADXL_MISO
-axes_map: -y,z,-x
diff --git a/config/hardware/accelerometers/adxl345_rpi.cfg b/config/hardware/accelerometers/adxl345_rpi.cfg
@@ -21,4 +21,4 @@ probe_points:
 # Include the IS calibration macros to unlock them when
 # an accelerometer is installed on the machine
 [include ../../../macros/helpers/resonance_override.cfg]
-[include ../../../scripts/K-ShakeTune/*.cfg]
+[include ../../../scripts/K-ShakeTune/K-SnT_*.cfg]
diff --git a/config/hardware/accelerometers/adxl345_usb.cfg b/config/hardware/accelerometers/adxl345_usb.cfg
@@ -22,4 +22,4 @@ probe_points:
 # Include the IS calibration macros to unlock them when
 # an accelerometer is installed on the machine
 [include ../../../macros/helpers/resonance_override.cfg]
-[include ../../../scripts/K-ShakeTune/*.cfg]
+[include ../../../scripts/K-ShakeTune/K-SnT_*.cfg]
diff --git a/config/hardware/accelerometers/adxl345_usb_rampon.cfg b/config/hardware/accelerometers/adxl345_usb_rampon.cfg
@@ -21,4 +21,4 @@ probe_points:
 # Include the IS calibration macros to unlock them when
 # an accelerometer is installed on the machine
 [include ../../../macros/helpers/resonance_override.cfg]
-[include ../../../scripts/K-ShakeTune/*.cfg]
+[include ../../../scripts/K-ShakeTune/K-SnT_*.cfg]
diff --git a/config/hardware/accelerometers/adxl345_usb_rp2040_spi1.cfg b/config/hardware/accelerometers/adxl345_usb_rp2040_spi1.cfg
@@ -25,4 +25,4 @@ probe_points:
 # Include the IS calibration macros to unlock them when
 # an accelerometer is installed on the machine
 [include ../../../macros/helpers/resonance_override.cfg]
-[include ../../../scripts/K-ShakeTune/*.cfg]
+[include ../../../scripts/K-ShakeTune/K-SnT_*.cfg]
diff --git a/config/hardware/accelerometers/generics/adxl345_hardware_spi1.cfg b/config/hardware/accelerometers/generics/adxl345_hardware_spi1.cfg
@@ -21,4 +21,4 @@ probe_points:
 # Include the IS calibration macros to unlock them when
 # an accelerometer is installed on the machine
 [include ../../../../macros/helpers/resonance_override.cfg]
-[include ../../../../scripts/K-ShakeTune/*.cfg]
+[include ../../../../scripts/K-ShakeTune/K-SnT_*.cfg]
diff --git a/config/hardware/accelerometers/generics/adxl345_hardware_ssp1.cfg b/config/hardware/accelerometers/generics/adxl345_hardware_ssp1.cfg
@@ -18,4 +18,4 @@ probe_points:
 # Include the IS calibration macros to unlock them when
 # an accelerometer is installed on the machine
 [include ../../../../macros/helpers/resonance_override.cfg]
-[include ../../../../scripts/K-ShakeTune/*.cfg]
+[include ../../../../scripts/K-ShakeTune/K-SnT_*.cfg]
diff --git a/config/hardware/accelerometers/generics/adxl345_software_spi.cfg b/config/hardware/accelerometers/generics/adxl345_software_spi.cfg
@@ -22,4 +22,4 @@ probe_points:
 # Include the IS calibration macros to unlock them when
 # an accelerometer is installed on the machine
 [include ../../../../macros/helpers/resonance_override.cfg]
-[include ../../../../scripts/K-ShakeTune/*.cfg]
+[include ../../../../scripts/K-ShakeTune/K-SnT_*.cfg]
diff --git a/config/hardware/accelerometers/lis2dw_usb_rp2040_spi1.cfg b/config/hardware/accelerometers/lis2dw_usb_rp2040_spi1.cfg
@@ -11,7 +11,7 @@ serial: /dev/serial/by-id/xxx
 [lis2dw]
 cs_pin: lis2dw_mcu:gpio9
 spi_bus: spi1a
-axes_map: -y,x,-z
+axes_map: x,y,z
 
 [resonance_tester]
 accel_chip: lis2dw
@@ -22,5 +22,4 @@ probe_points:
 # Include the IS calibration macros to unlock them when
 # an accelerometer is installed on the machine
 [include ../../../macros/helpers/resonance_override.cfg]
-[include ../../../macros/calibration/IS_shaper_calibrate.cfg]
-[include ../../../macros/calibration/IS_vibrations_measurement.cfg]
+[include ../../../scripts/K-ShakeTune/K-SnT_*.cfg]