From 7de5d57e2ba1274d0f1018f6fa5be2b360c341bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Boisselier?= Date: Thu, 22 Feb 2024 23:22:26 +0100 Subject: [PATCH] fixed K-Shake&Tune integration --- config/hardware/accelerometers/adxl345_Fysetc_SB_Can_TH.cfg | 1 - config/hardware/accelerometers/adxl345_rpi.cfg | 2 +- config/hardware/accelerometers/adxl345_usb.cfg | 2 +- config/hardware/accelerometers/adxl345_usb_rampon.cfg | 2 +- config/hardware/accelerometers/adxl345_usb_rp2040_spi1.cfg | 2 +- .../accelerometers/generics/adxl345_hardware_spi1.cfg | 2 +- .../accelerometers/generics/adxl345_hardware_ssp1.cfg | 2 +- .../accelerometers/generics/adxl345_software_spi.cfg | 2 +- config/hardware/accelerometers/lis2dw_usb_rp2040_spi1.cfg | 5 ++--- 9 files changed, 9 insertions(+), 11 deletions(-) diff --git a/config/hardware/accelerometers/adxl345_Fysetc_SB_Can_TH.cfg b/config/hardware/accelerometers/adxl345_Fysetc_SB_Can_TH.cfg index 3dce3260e..9f06e9d80 100644 --- 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 index 172ff2980..b65ff26dc 100644 --- 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 index b73e4043f..0bd2edb72 100644 --- 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 index 20947d46f..0dcb97bb5 100644 --- 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 index 2eb968368..f03a7e46c 100644 --- 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 index f1906ee06..7906be329 100644 --- 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 index c5bf2a71f..9089059c4 100644 --- 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 index 2c279e581..9318acf80 100644 --- 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 index a9063b3fa..fdba7f843 100644 --- 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]