Upstream main (#14)

* feat: add LDO Leviathan main board (Frix-x#365) Signed-off-by: Stefan Dej <meteyou@gmail.com> * fix fans pins in BTT_Manta_M8P_v2.0.cfg * fix wrong LDO Leviathan cfg location * added Octopus Pro v1.1 template (Frix-x#349) (Frix-x#367) Co-authored-by: Jan-Gerrit Drexhage <102791900+Surion79@users.noreply.github.com> * Fysetc Catalyst Config * added respond on idle_timeout * sherpa mini config (Frix-x#385) Co-authored-by: Félix Boisselier <felix@fboisselier.fr> * switch moonraker update management to dev channel (Frix-x#390) * Update orbiter2.0.cfg (Frix-x#405) Add comment about required current. At the default of 0.45 on the Orbiter 2 motor, very poor performance will occur including significant underextrusion on infill, etc. * chore(mcu): properly label CAN H/L (Frix-x#418) TX and RX are not helpful, looking at the back of the m8p v2 shows that RX is high, and TX is low. * added back the proper idle timeout behavior * BTT S2DW V1.0 and similar RP2040 + lis2dw boards (Frix-x#439) * Add Octopus Pro 1.0 MCU definition as duplicate of Octopus MCU * fix typo in BTT_Octopus_Pro_v1.1.cfg (Frix-x#460) * Turn on filter only if it was used during printing. (Frix-x#380) Co-authored-by: Jan-Gerrit Drexhage <102791900+Surion79@users.noreply.github.com> * added parameters to park (Frix-x#391) * M8P v2.0 SPI fix (Frix-x#389) Co-authored-by: Félix Boisselier <felix@fboisselier.fr> * Add per material filament sensor management (Frix-x#381) * Remove _TIP_SHAPING from End/cancel print macros (Frix-x#357) Co-authored-by: Jan-Gerrit Drexhage <102791900+Surion79@users.noreply.github.com> Co-authored-by: Félix Boisselier <felix@fboisselier.fr> * Klipper SET_PRINT_STATS_INFO compatibility (Frix-x#392) Co-authored-by: Félix Boisselier <felix@fboisselier.fr> * Fix error with turning on filter only if it was used during printing. (Frix-x#406) Fix issue discovered after merging Frix-x#380 * fix missing variable to cancel_print (Frix-x#408) * filament sensor status checks universal (Frix-x#411) * proper Shake&Tune integration in Klippain * add mellow SB2040 v2 and SB2040 Pro toolhead boards (Frix-x#417) * correct overriders misspelling (Frix-x#425) * check if heatsoak is configured to verbose message (Frix-x#424) * typo * Add pin definitions for Fysetc S6 V2.X * add TR8x2 leadscrew config for trident * Add older version of Fysetc mini12864 display * HappyHare & other related dev (Frix-x#371) * HappyHare MMU integration in Klippain * Spoolman support * Multiple MCU templates added or modified, especially MMU templates * LED system rework to support the LED_effects plugin and rainbow barf, etc... ( Frix-x#416 ) * TMC Autotune moonraker updater predefined config (add your motor defs to your overrides.cfg or mcu.cfg) --------- Co-authored-by: Jan-Gerrit Drexhage <102791900+Surion79@users.noreply.github.com> Co-authored-by: claudioguareschi <33001685+claudioguareschi@users.noreply.github.com> Co-authored-by: Félix Boisselier <felix@fboisselier.fr> Co-authored-by: ksummers92 <66363414+ksummers92@users.noreply.github.com> * fix status leds at startup (Frix-x#448) * Status leds on startup fix * display menu and V0 Display (Frix-x#420) * Better display menu adapted to Klippain * V0 display support * Klippain boot logo --------- Co-authored-by: Elias Huwyler <elias.huwyler@ti8m.ch> * improved display management structure * fixed MMU includes for HappyHare symlink * Add BLTouch support (Frix-x#450) * fixed nozzle and status led on/off. (Frix-x#454) * reverted update manager to main branch * followed naming scheme for bltouch include as virtual * moved the machine.cfg include and included additional thermistor defs * Mellow fly super8 template (Frix-x#463) * Support for TMC5160 on Z Axis (Frix-x#469) * added fix to prevent issues when updating Klippain without MMU (Frix-x#462) * Add configs for Fysetc SB Can TH boards (Frix-x#464) Co-authored-by: Félix Boisselier <felix@fboisselier.fr> * fix: make prime line height a variable parameter (Frix-x#466) Fix Frix-x#465 * fix for extrude when temperature is too low (Frix-x#480) * Add BTT Kraken MCU support (Frix-x#476) * Update Fysetc_Spider_v3.x.cfg to fix fan ports (Frix-x#474) * fix BTT_MMB pin (Frix-x#486) * added fix for rsense for TMC5160 (Frix-x#489) * Add support for dockable probes with separate retainer (Frix-x#401) This is needed for probes like https://github.com/kevinakasam/KlackEnder-Probe * fix for rsense on TMC5160 Z (Frix-x#490) * Create stale action workflow (Frix-x#449) Co-authored-by: Félix Boisselier <felix@fboisselier.fr> * fixed K-Shake&Tune integration * Avoid cooling hotend in extruder_preheating Frix-x#495 (Frix-x#496) * Add a park front macro for toolhead maintenance (Frix-x#494) * Update MMU include order to allow overriding default HH defs (Frix-x#497) * avoid led effect flashing on startup if leds desabled on startup (Frix-x#500) * Added BTT SKR2 board template (Frix-x#503) * fixed the regression introduced in startup call * fix typo in stale.yml * fixed probe pin for BTT_SB2209_RP2040_v1.0 (Frix-x#507) * LDO Nitehawk MCU template and tachometer management (Frix-x#505) Co-authored-by: Meindert <19568018+mvdveer@users.noreply.github.com> Co-authored-by: Akash Patel <akashrpatel@yahoo.com> * update primeline to make it adaptive (Frix-x#498) Co-authored-by: Frédéric Beaucamp <88246672+fbeauKmi@users.noreply.github.com> Co-authored-by: Félix Boisselier <felix@fboisselier.fr> * fixed missing adaptive primeline variable * remplaced CANCEL_PRINT by PARK in the automated error management gcode * fixed typo in LDO Nitehawk manufacturer template * Add support for Manta_M5P v1.0 and 0.9 degree steppers on Trident Z axis (Frix-x#514) * fix homing check for PARK in error gcode (Frix-x#513) * fix typo in Fysetc_ERCF_ERB.cfg (Frix-x#519) * Update BTT_Kraken_v1.0.cfg, RGB1 fix listed as PF10, but should be PF12 (pf10 is mcu_min7 already, an endstop) verified rest of pins as well * reverted PARK and PARK_FRONT to fail if axis are not homed * fix PARK with overriden param E (Frix-x#515) * install and uninstall scripts improvement (Frix-x#511) * Don't fail uninstall if the backup folder has been removed * Make uninstall work when backup has sub-directories * Make sure we don't fail making a backup when there is no current user config folder * added Mellow Fly Gemini v3 MCU template (Frix-x#527) * fix pinout for Fysetc_ERB board (Frix-x#530) * updated homing_override to improve sensorless homing (Frix-x#531) by using M400 vs the old 2 second dwell time that is not required anymore * fixed v0_display pin and improved overrides docs (Frix-x#535) * Update rpi_temp.cfg Format with _ so a space is in the name, like other temps * Update cabinet_temp.cfg * switched to the new minimum_cruise_ratio Klipper parameter * commented the default minimum_cruise_ratio to not break older Klipper versions * added Beacon accelerometer support (Frix-x#552) * Update Shake&Tune path This is due to a change in Shake&Tune v3.0.0 * fixed max_z bug in PARK macro * Update BTT_SKR_2.cfg to fix EXP1_4 typo (Frix-x#578) * Nozzle cleaning parameters update (Frix-x#569) * add built in adxl sensor from nitehawk sb board (Frix-x#602) * add: mcu Fystec Cheetah v3 (Frix-x#604) --------- Signed-off-by: Stefan Dej <meteyou@gmail.com> Co-authored-by: Stefan Dej <meteyou@gmail.com> Co-authored-by: Félix Boisselier <felix@fboisselier.fr> Co-authored-by: Jan-Gerrit Drexhage <102791900+Surion79@users.noreply.github.com> Co-authored-by: Benoitone <63300355+Benoitone@users.noreply.github.com> Co-authored-by: Eric <saericzimmerman@gmail.com> Co-authored-by: Devon Hazelett <dhazelett@users.noreply.github.com> Co-authored-by: Gustavo Ribeiro Alves <145077902+gralves2@users.noreply.github.com> Co-authored-by: Andrew Wickham <andrewwickham@westfieldgrp.com> Co-authored-by: tehniemer <jrniemand@gmail.com> Co-authored-by: Arsène Thieffry <arsene.thieffry@gmail.com> Co-authored-by: claudioguareschi <33001685+claudioguareschi@users.noreply.github.com> Co-authored-by: Elias Huwyler <elias.huwyler@gmail.com> Co-authored-by: Elias Huwyler <elias.huwyler@ti8m.ch> Co-authored-by: Neil Smith <8648114+nmsmith22389@users.noreply.github.com> Co-authored-by: Reiner Uhry <24939566+reineruhry@users.noreply.github.com> Co-authored-by: lokiagent <75763148+lokiagent@users.noreply.github.com> Co-authored-by: Arcadien <aurelien.labrosse@gmail.com> Co-authored-by: Tyler Olson <tolson@dlinc.io> Co-authored-by: Felix Boisselier <f.boisselier@irepa-laser.com> Co-authored-by: elpopo <68954733+elpopo-eng@users.noreply.github.com> Co-authored-by: tsk-2222 <111063724+tsk-2222@users.noreply.github.com> Co-authored-by: Meindert <19568018+mvdveer@users.noreply.github.com> Co-authored-by: Akash Patel <akashrpatel@yahoo.com> Co-authored-by: Frédéric Beaucamp <88246672+fbeauKmi@users.noreply.github.com> Co-authored-by: Birkemosen <Birkemosen@users.noreply.github.com> Co-authored-by: Magne Rasmussen <magne.rasmussen@gmail.com> Co-authored-by: Parker <infowolfe@gmail.com> Co-authored-by: Svennixx <xsvenhd@hotmail.com> Co-authored-by: dev-aphex <dev-aphex@users.noreply.github.com> Co-authored-by: Minims <github@minims.fr>
ksummers92 · Jun 22, 2024 · 5c86079 · 5c86079
1 parent 08054c6
commit 5c86079
Show file tree

Hide file tree

Showing 188 changed files with 5,135 additions and 2,786 deletions.
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -0,0 +1,40 @@
+name: Mark and Manage Stale Issues and Pull Requests
+
+on:
+  schedule:
+  - cron: '30 7 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v9.0.0
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        days-before-stale: 30
+        days-before-close: 14
+        stale-issue-message: >
+          📌 **This issue has been marked as stale because it has not had activity in the past 30 days.**
+          
+          To keep it open, please respond to this message or add new information. Otherwise, this will be closed in 14 days.
+          
+          Thank you for your contributions!
+        stale-pr-message: >
+          📌 **This pull request has been marked as stale because it has not had activity in the past 30 days.**
+          
+          Please update the PR or comment to keep it active. Otherwise, this will be closed in 14 days.
+          
+          We appreciate your contribution!
+        stale-issue-label: 'stale'
+        stale-pr-label: 'stale, reviewer-needed'
+        exempt-issue-labels: 'tracking'
+        exempt-pr-labels: 'tracking'
+        close-issue-message: 'This issue was closed due to inactivity for 14 days. Feel free to reopen it if you think it was an error or if you have new information or progress to share'
+        close-pr-message: 'This pull request was closed due to inactivity for 14 days. Please reopen it if you think it was an error or if you wish to continue the contribution.'
+        exempt-all-milestones: true
+        exempt-all-assignees: true
+        exempt-draft-prs: true
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 /*.cfg
 /*.conf
 /.VERSION
+/scripts/K-ShakeTune
 
 
 # -------------------------------------------------------------------

diff --git a/README.md b/README.md
@@ -1,57 +1,57 @@
-# Klippain
-
-> Klippain - The pain-free recipe for (french)bread and butter Klipper configuration!
-
-Klippain is a generic, modular, and highly customizable Klipper configuration for 3D printers. Designed for use on various machines such as Cartesian, CoreXY and CoreXZ, it has been reported working correctly on Voron V2.4, Voron Trident, Voron V0, Voron SwitchWire, TriZero, VZbot, Ender5, Ender3, Prusas, etc...
-
-![Klippain](./docs/klippain.png)
-
-Klippain is regularly updated with new features and merged PRs from users. You can reach me on the Voron Discord as **Frix_x#0161**.
-
-Fun fact: "pain" \pɛ̃\ is the French word for bread, so there's no pain in this pain—only joy! Thanks to the French channel "honhonhonbaguette-FR" on the Voron Discord for the joke and name suggestion!
-
-
-## Features
-
-Klippain is designed for versatility. By selecting and enabling the desired hardware and software options, it can be used on a wide range of machines.
-
-Custom features available out of the box include **adaptive bed mesh**, **custom printer calibration macros**, **automated input shaper workflows**, and **vibration measurement** macros and scripts, ... Refer to the [features documentation](./docs/features.md) for a detailed list and usage instructions.
-
-
-## Installation
-
-To install Klippain, first ensure you have already Klipper, Moonraker, and a WebUI installed on your printer. If not, use [KIAUH](https://github.com/th33xitus/kiauh).
-
-Then, run the installation script using the following command over SSH. This script will backup your old configuration, download this GitHub repository to your RaspberryPi home directory, and set up Klippain in `~/printer_data/config`. You will also be prompted to select and install MCU board_pins templates. This is recommended for faster `mcu.cfg` setup, but you can do it manually later if you prefer.
-
-```bash
-wget -O - https://raw.githubusercontent.com/Frix-x/klippain/main/install.sh | bash
-```
-
-Finally, Klippain requires a few simple steps to configure and customize it for your printer: please follow the [configuration guide](./docs/configuration.md).
-
-  > **Warning**
-  >
-  > General rule to keep the auto-update feature working: **never modify Klippain files directly**, but instead add overrides as per the documentation! To proceed, you can modify all the pre-installed templates in your config root folder (`printer.cfg`, `mcu.cfg`, `variables.cfg` and `overrides.cfg`) as they will be preserved on update.
-
-
-## Removing Klippain
-
-In case Klippain doesn't suit your needs or if you installed it by mistake, you can easily remove Klippain and revert to your previous configuration by using the automated uninstall script. During the uninstallation process, the script will remove all specific Klippain files and configurations. Additionally, you will be given an option to restore your previously backed-up configuration, allowing your printer to return to its last working state (from before Klippain was installed).
-
-To run the uninstall script, execute the following command over SSH:
-
-```bash
-wget -O - https://raw.githubusercontent.com/Frix-x/klippain/main/uninstall.sh | bash
-```
-
-  > **Note**
-  >
-  > All backups are preserved during the uninstallation process. So, you can easily revert back at any time if you wish to :stuck_out_tongue_winking_eye:
-
-
-## Support the Project
-
-I strive to accommodate user requests that align with this configuration's design. Feel free to open an issue or a PR for specific hardware device support or new features.
-
-Alternatively, consider buying me a coffee or contributing to new hardware purchases to support my work!
+# Klippain
+
+> Klippain - The pain-free recipe for (french)bread and butter Klipper configuration!
+
+Klippain is a generic, modular, and highly customizable Klipper configuration for 3D printers. Designed for use on various machines such as Cartesian, CoreXY and CoreXZ, it has been reported working correctly on Voron V2.4, Voron Trident, Voron V0, Voron SwitchWire, TriZero, VZbot, Ender5, Ender3, Prusas, etc...
+
+![Klippain](./docs/klippain.png)
+
+Klippain is regularly updated with new features and merged PRs from users. You can reach me on the Voron Discord as **Frix_x#0161**.
+
+Fun fact: "pain" \pɛ̃\ is the French word for bread, so there's no pain in this pain—only joy! Thanks to the French channel "honhonhonbaguette-FR" on the Voron Discord for the joke and name suggestion!
+
+
+## Features
+
+Klippain is designed for versatility. By selecting and enabling the desired hardware and software options, it can be used on a wide range of machines.
+
+Custom features available out of the box include a full featured set of standard macros, **adaptive bed mesh**, **custom printer calibrations**, **automated input shaper workflows**, and **vibration measurement** macros and scripts, ... Refer to the [features documentation](./docs/features.md) for a detailed list and usage instructions.
+
+
+## Installation
+
+To install Klippain, first ensure you have already Klipper, Moonraker, and a WebUI installed on your printer. If not, you can use [KIAUH](https://github.com/th33xitus/kiauh).
+
+Then, run the installation script using the following command over SSH. This script will backup your old configuration, download this GitHub repository to your RaspberryPi home directory, and set up Klippain in `~/printer_data/config`. You will also be prompted to select and install MCU board_pins templates. This is recommended for faster `mcu.cfg` setup, but you can do it manually later if you prefer.
+
+```bash
+wget -O - https://raw.githubusercontent.com/Frix-x/klippain/main/install.sh | bash
+```
+
+Finally, Klippain requires a few simple steps to configure and customize it for your printer: please follow the [configuration guide](./docs/configuration.md).
+
+  > **Warning**:
+  >
+  > General rule to keep the auto-update feature working: **never modify Klippain files directly**, but instead add overrides as per [the documentation](./docs/overrides.md)! To proceed, you can modify all the pre-installed templates in your config root folder (`printer.cfg`, `mcu.cfg`, `variables.cfg` and `overrides.cfg`) as they will be preserved on update.
+
+
+## Removing Klippain
+
+In case Klippain doesn't suit your needs or if you installed it by mistake, you can easily remove Klippain and revert to your previous configuration by using the automated uninstall script. During the uninstallation process, the script will remove all specific Klippain files and configurations. Additionally, you will be given an option to restore your previously backed-up configuration, allowing your printer to return to its last working state (from before Klippain was installed).
+
+To run the uninstall script, execute the following command over SSH:
+
+```bash
+wget -O - https://raw.githubusercontent.com/Frix-x/klippain/main/uninstall.sh | bash
+```
+
+  > **Note**:
+  >
+  > All backups are preserved during the uninstallation process. So, you can easily revert back at any time if you wish to :stuck_out_tongue_winking_eye:
+
+
+## Support the Project
+
+I strive to accommodate user requests that align with this configuration's design. Feel free to open an issue or a PR for specific hardware device support or new features.
+
+Alternatively, consider buying me a coffee or contributing to new hardware purchases to support my work!
diff --git a/config/hardware/accelerometers/adxl345_Fysetc_SB_Can_TH.cfg b/config/hardware/accelerometers/adxl345_Fysetc_SB_Can_TH.cfg
@@ -0,0 +1,8 @@
+[include generics/adxl345_software_spi.cfg]
+
+# As it's a toolhead ADXL, we add some default pins overrides from here
+[adxl345]
+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
diff --git a/config/hardware/accelerometers/adxl345_nitehawk_sb.cfg b/config/hardware/accelerometers/adxl345_nitehawk_sb.cfg
@@ -0,0 +1,8 @@
+[include generics/adxl345_software_spi.cfg]
+
+# As it's a toolhead ADXL, we add some default pins overrides from here
+[adxl345]
+cs_pin: toolhead:MCU_ADXL_CS
+spi_software_sclk_pin: toolhead:MCU_ADXL_SCK
+spi_software_mosi_pin: toolhead:MCU_ADXL_MOSI
+spi_software_miso_pin: toolhead:MCU_ADXL_MISO
diff --git a/config/hardware/accelerometers/adxl345_rpi.cfg b/config/hardware/accelerometers/adxl345_rpi.cfg
@@ -21,5 +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 ../../../macros/calibration/IS_shaper_calibrate.cfg]
-[include ../../../macros/calibration/IS_vibrations_measurement.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,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]
diff --git a/config/hardware/accelerometers/adxl345_usb_rampon.cfg b/config/hardware/accelerometers/adxl345_usb_rampon.cfg
@@ -21,5 +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 ../../../macros/calibration/IS_shaper_calibrate.cfg]
-[include ../../../macros/calibration/IS_vibrations_measurement.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,5 +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 ../../../macros/calibration/IS_shaper_calibrate.cfg]
-[include ../../../macros/calibration/IS_vibrations_measurement.cfg]
+[include ../../../scripts/K-ShakeTune/K-SnT_*.cfg]
diff --git a/config/hardware/accelerometers/beacon_accelerometer.cfg b/config/hardware/accelerometers/beacon_accelerometer.cfg
@@ -0,0 +1,13 @@
+# Only for Beacon REV H model, REV D does not have a build in accelerometer 
+# You need to include beacon_virtual.cfg and set the correct serial in your overrides for this to work
+# Accelerometer pins etc are all handeled internally by the Beacon Klipper plugin.
+[resonance_tester]
+accel_chip: beacon
+probe_points:
+    -1,-1,-1
+
+
+# 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/K-SnT_*.cfg]
diff --git a/config/hardware/accelerometers/generics/adxl345_hardware_spi1.cfg b/config/hardware/accelerometers/generics/adxl345_hardware_spi1.cfg
@@ -21,5 +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 ../../../../macros/calibration/IS_shaper_calibrate.cfg]
-[include ../../../../macros/calibration/IS_vibrations_measurement.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,5 +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 ../../../../macros/calibration/IS_shaper_calibrate.cfg]
-[include ../../../../macros/calibration/IS_vibrations_measurement.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,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]
diff --git a/config/hardware/accelerometers/lis2dw_usb_rp2040_spi1.cfg b/config/hardware/accelerometers/lis2dw_usb_rp2040_spi1.cfg
@@ -0,0 +1,25 @@
+# This LIS2DW file is dedicated to be used with USB RP2040 boards where the LIS2DW
+# is connected to SPI1
+
+# This include BTT S2DW V1.0, ...
+
+
+# You need to set the proper serial in your overrides.cfg file
+[mcu lis2dw_mcu]
+serial: /dev/serial/by-id/xxx
+
+[lis2dw]
+cs_pin: lis2dw_mcu:gpio9
+spi_bus: spi1a
+axes_map: x,y,z
+
+[resonance_tester]
+accel_chip: lis2dw
+probe_points:
+    -1,-1,-1
+
+
+# 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/K-SnT_*.cfg]
diff --git a/config/hardware/axis/X/TMC/TMC5160.cfg b/config/hardware/axis/X/TMC/TMC5160.cfg
@@ -11,5 +11,5 @@ spi_software_mosi_pin: DRIVER_SPI_MOSI
 spi_software_miso_pin: DRIVER_SPI_MISO
 interpolate: True
 run_current: 0.8
-sense_resistor: 0.110
+sense_resistor: 0.075
 stealthchop_threshold: 0
diff --git a/config/hardware/axis/Y/TMC/TMC5160.cfg b/config/hardware/axis/Y/TMC/TMC5160.cfg
@@ -11,5 +11,5 @@ spi_software_mosi_pin: DRIVER_SPI_MOSI
 spi_software_miso_pin: DRIVER_SPI_MISO
 interpolate: True
 run_current: 0.8
-sense_resistor: 0.110
+sense_resistor: 0.075
 stealthchop_threshold: 0
diff --git a/config/hardware/axis/Z/TMC/TMC5160_1-Motor.cfg b/config/hardware/axis/Z/TMC/TMC5160_1-Motor.cfg
@@ -0,0 +1,18 @@
+# Z TMC5160 definition
+
+# User variable only needed here as they are called recursively
+[gcode_macro _USER_VARIABLES]
+variable_z_driver: "tmc5160"
+gcode:
+
+
+[tmc5160 stepper_z]
+cs_pin: Z_TMCUART
+spi_speed: 500000
+spi_software_sclk_pin: DRIVER_SPI_SCK
+spi_software_mosi_pin: DRIVER_SPI_MOSI
+spi_software_miso_pin: DRIVER_SPI_MISO
+interpolate: True
+run_current: 0.8
+sense_resistor: 0.075
+stealthchop_threshold: 0
diff --git a/config/hardware/axis/Z/TMC/TMC5160_3-Motors.cfg b/config/hardware/axis/Z/TMC/TMC5160_3-Motors.cfg
@@ -0,0 +1,23 @@
+[include TMC5160_1-Motor.cfg]
+
+[tmc5160 stepper_z1]
+cs_pin: Z1_TMCUART
+spi_speed: 500000
+spi_software_sclk_pin: DRIVER_SPI_SCK
+spi_software_mosi_pin: DRIVER_SPI_MOSI
+spi_software_miso_pin: DRIVER_SPI_MISO
+interpolate: True
+run_current: 0.8
+sense_resistor: 0.075
+stealthchop_threshold: 0
+
+[tmc5160 stepper_z2]
+cs_pin: Z2_TMCUART
+spi_speed: 500000
+spi_software_sclk_pin: DRIVER_SPI_SCK
+spi_software_mosi_pin: DRIVER_SPI_MOSI
+spi_software_miso_pin: DRIVER_SPI_MISO
+interpolate: True
+run_current: 0.8
+sense_resistor: 0.075
+stealthchop_threshold: 0
diff --git a/config/hardware/axis/Z/TMC/TMC5160_4-Motors.cfg b/config/hardware/axis/Z/TMC/TMC5160_4-Motors.cfg
@@ -0,0 +1,12 @@
+[include TMC5160_3-Motors.cfg]
+
+[tmc5160 stepper_z3]
+cs_pin: Z3_TMCUART
+spi_speed: 500000
+spi_software_sclk_pin: DRIVER_SPI_SCK
+spi_software_mosi_pin: DRIVER_SPI_MOSI
+spi_software_miso_pin: DRIVER_SPI_MISO
+interpolate: True
+run_current: 0.8
+sense_resistor: 0.075
+stealthchop_threshold: 0
diff --git a/config/hardware/axis/Z/Trident_TR8x2_1.8deg.cfg b/config/hardware/axis/Z/Trident_TR8x2_1.8deg.cfg
@@ -0,0 +1,18 @@
+[stepper_z]
+rotation_distance: 2
+microsteps: 32
+full_steps_per_rotation: 200
+
+[stepper_z1]
+rotation_distance: 2
+microsteps: 32
+full_steps_per_rotation: 200
+
+[stepper_z2]
+rotation_distance: 2
+microsteps: 32
+full_steps_per_rotation: 200
+
+# We also include the default wiring and speeds from here to avoid duplicating
+[include default_wiring_3M.cfg]
+[include default_speed.cfg]
diff --git a/config/hardware/axis/Z/Trident_TR8x8_0.9deg.cfg b/config/hardware/axis/Z/Trident_TR8x8_0.9deg.cfg
@@ -0,0 +1,18 @@
+[stepper_z]
+rotation_distance: 8
+microsteps: 32
+full_steps_per_rotation: 400
+
+[stepper_z1]
+rotation_distance: 8
+microsteps: 32
+full_steps_per_rotation: 400
+
+[stepper_z2]
+rotation_distance: 8
+microsteps: 32
+full_steps_per_rotation: 400
+
+# We also include the default wiring and speeds from here to avoid duplicating
+[include default_wiring_3M.cfg]
+[include default_speed.cfg]
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ @@
     /*.cfg
     /*.conf
     /.VERSION
+    /scripts/K-ShakeTune
     # -------------------------------------------------------------------
@@ Expand Down @@