Merge branch 'knutwurst:master' into klicky

Marlin/Configuration.h

@@ -59,7 +59,6 @@
  */
 #if ENABLED(KNUTWURST_CHIRON)
   #define TRIGORILLA_MAPPING_CHIRON
-  #define NO_AUTO_ASSIGN_WARNING
 #else
   #define TRIGORILLA_MAPPING_I3MEGA
   #define SWAP_Z_MOTORS
@@ -95,7 +94,6 @@
  */
 #if ENABLED(KNUTWURST_4MAXP2)
   #define ANYCUBIC_4_MAX_PRO_ENDSTOPS
-  #define NO_AUTO_ASSIGN_WARNING
 #endif
 
 
@@ -1661,7 +1659,7 @@
  * Use G29 repeatedly, adjusting the Z height at each point with movement commands
  * or (with LCD_BED_LEVELING) the LCD controller.
  */
-#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
+#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING, KNUTWURST_KLICKY)
   #define PROBE_MANUALLY
 #endif
 
@@ -1738,22 +1736,25 @@
  * Magnetically Mounted Probe
  * For probes such as Euclid, Klicky, Klackender, etc.
  */
-// #define MAG_MOUNTED_PROBE
+#if ENABLED(KNUTWURST_KLICKY)
+  // @see https://www.printables.com/model/489398-anycubic-mega-klicky-probe
+  #define MAG_MOUNTED_PROBE
   #if ENABLED(MAG_MOUNTED_PROBE)
     #define PROBE_DEPLOY_FEEDRATE (133 * 60)  // (mm/min) Probe deploy speed
     #define PROBE_STOW_FEEDRATE   (133 * 60)  // (mm/min) Probe stow speed
 
-  #define MAG_MOUNTED_DEPLOY_1 { PROBE_DEPLOY_FEEDRATE, { 245, 114, 30 } }  // Move to side Dock & Attach probe
+    #define MAG_MOUNTED_DEPLOY_1 { PROBE_DEPLOY_FEEDRATE, { 176, 0,  0 } }    // Move to front dock & attach probe
-  #define MAG_MOUNTED_DEPLOY_2 { PROBE_DEPLOY_FEEDRATE, { 210, 114, 30 } }  // Move probe off dock
+    #define MAG_MOUNTED_DEPLOY_2 { PROBE_DEPLOY_FEEDRATE, { 176, 0, 20 } }    // Move probe off dock
     #define MAG_MOUNTED_DEPLOY_3 { PROBE_DEPLOY_FEEDRATE, {   0, 0,  0 } }  // Extra move if needed
     #define MAG_MOUNTED_DEPLOY_4 { PROBE_DEPLOY_FEEDRATE, {   0, 0,  0 } }  // Extra move if needed
     #define MAG_MOUNTED_DEPLOY_5 { PROBE_DEPLOY_FEEDRATE, {   0, 0,  0 } }  // Extra move if needed
-  #define MAG_MOUNTED_STOW_1   { PROBE_STOW_FEEDRATE,   { 245, 114, 20 } }  // Move to dock
+    #define MAG_MOUNTED_STOW_1   { PROBE_STOW_FEEDRATE,   { 176, 0, 20 } }    // Move right above the dock
-  #define MAG_MOUNTED_STOW_2   { PROBE_STOW_FEEDRATE,   { 245, 114,  0 } }  // Place probe beside remover
+    #define MAG_MOUNTED_STOW_2   { PROBE_STOW_FEEDRATE,   { 176, 0,  0 } }    // Move probe into dock
-  #define MAG_MOUNTED_STOW_3   { PROBE_STOW_FEEDRATE,   { 230, 114,  0 } }  // Side move to remove probe
+    #define MAG_MOUNTED_STOW_3   { PROBE_STOW_FEEDRATE,   {  50, 0,  0 } }  // Side move to remove probe
-  #define MAG_MOUNTED_STOW_4   { PROBE_STOW_FEEDRATE,   { 210, 114, 20 } }  // Side move to remove probe
+    #define MAG_MOUNTED_STOW_4   { PROBE_STOW_FEEDRATE,   {   0, 0,  0 } }  // Extra move if needed
     #define MAG_MOUNTED_STOW_5   { PROBE_STOW_FEEDRATE,   {   0, 0,  0 } }  // Extra move if needed
   #endif
+#endif
 
 // Duet Smart Effector (for delta printers) - https://bit.ly/2ul5U7J
 // When the pin is defined you can use M672 to set/reset the probe sensitivity.
@@ -1851,7 +1852,11 @@
   #define NOZZLE_TO_PROBE_OFFSET { 0, 0, -16.8 }
 #endif
 
-#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
+#if ENABLED(KNUTWURST_KLICKY)
+  #define NOZZLE_TO_PROBE_OFFSET  { 0, -25, -7 }
+#endif
+
+#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING, KNUTWURST_KLICKY)
   #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
 #endif
 
@@ -1861,6 +1866,8 @@
 
 #if ENABLED(KNUTWURST_CHIRON)
   #define PROBING_MARGIN 15
+#elseif ENABLED(KNUTWURST_KLICKY)
+  #define PROBING_MARGIN 20
 #else
   #define PROBING_MARGIN 35
 #endif
@@ -1941,7 +1948,7 @@
 #define Z_CLEARANCE_MULTI_PROBE     5 // Z Clearance between multiple probes
 // #define Z_AFTER_PROBING           5 // Z position after probing is done
 
-#define Z_PROBE_LOW_POINT          -10 // Farthest distance below the trigger-point to go before stopping
+#define Z_PROBE_LOW_POINT          -2 // Farthest distance below the trigger-point to go before stopping
 
 // For M851 give a range for adjusting the Z probe offset
 #define Z_PROBE_OFFSET_RANGE_MIN -50
@@ -2479,7 +2486,7 @@
  *   leveling in steps so you can manually adjust the Z height at each grid-point.
  *   With an LCD controller the process is guided step-by-step.
  */
-#if EITHER(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
+#if ANY(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING, KNUTWURST_KLICKY)
   // #define AUTO_BED_LEVELING_3POINT
   // #define AUTO_BED_LEVELING_LINEAR
   #define AUTO_BED_LEVELING_BILINEAR
@@ -2487,7 +2494,7 @@
   // #define MESH_BED_LEVELING
 #endif
 
-#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
+#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING, KNUTWURST_KLICKY)
   // #define AUTO_BED_LEVELING_3POINT
   // #define AUTO_BED_LEVELING_LINEAR
   // #define AUTO_BED_LEVELING_BILINEAR
@@ -2853,14 +2860,14 @@
 // Preheat Constants - Up to 10 are supported without changes
 //
 #define PREHEAT_1_LABEL       "PLA"
-#define PREHEAT_1_TEMP_HOTEND 200
+#define PREHEAT_1_TEMP_HOTEND 180
-#define PREHEAT_1_TEMP_BED     60
+#define PREHEAT_1_TEMP_BED     70
 // #define PREHEAT_1_TEMP_CHAMBER 35
 #define PREHEAT_1_FAN_SPEED     0 // Value from 0 to 255
 
 #define PREHEAT_2_LABEL       "ABS"
 #define PREHEAT_2_TEMP_HOTEND 240
-#define PREHEAT_2_TEMP_BED     90
+#define PREHEAT_2_TEMP_BED    110
 // #define PREHEAT_2_TEMP_CHAMBER 35
 #define PREHEAT_2_FAN_SPEED     0 // Value from 0 to 255
 

Marlin/Configuration_adv.h

@@ -989,7 +989,7 @@
    *
    * Set the default state here, change with 'M401 S' or UI, use M500 to save, M502 to reset.
    */
-  #define BLTOUCH_HS_MODE false
+  #define BLTOUCH_HS_MODE true
 
   // Safety: Enable voltage mode settings in the LCD menu.
   // #define BLTOUCH_LCD_VOLTAGE_MENU
@@ -1611,7 +1611,7 @@
    *  - SDSORT_CACHE_NAMES will retain the sorted file listing in RAM. (Expensive!)
    *  - SDSORT_DYNAMIC_RAM only uses RAM when the SD menu is visible. (Use with caution!)
    */
-  #define SDCARD_SORT_ALPHA
+  // #define SDCARD_SORT_ALPHA
 
   // SD Card Sorting options
   #if ENABLED(SDCARD_SORT_ALPHA)
@@ -2658,47 +2658,6 @@
  */
 #define ADVANCED_PAUSE_FEATURE
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
-    #if ENABLED(KNUTWURST_4MAXP2)
-      #define PAUSE_PARK_RETRACT_FEEDRATE         40  // (mm/s) Initial retract feedrate.
-      #define PAUSE_PARK_RETRACT_LENGTH            4  // (mm) Initial retract.
-                                                      // This short retract is done immediately, before parking the nozzle.
-      #define FILAMENT_CHANGE_UNLOAD_FEEDRATE     30  // (mm/s) Unload filament feedrate. This can be pretty fast.
-      #define FILAMENT_CHANGE_UNLOAD_ACCEL        25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
-      #define FILAMENT_CHANGE_UNLOAD_LENGTH        5  // (mm) The length of filament for a complete unload.
-                                                      //   For Bowden, the full length of the tube and nozzle.
-                                                      //   For direct drive, the full length of the nozzle.
-                                                      //   Set to 0 for manual unloading.
-      #define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE   6  // (mm/s) Slow move when starting load.
-      #define FILAMENT_CHANGE_SLOW_LOAD_LENGTH     0  // (mm) Slow length, to allow time to insert material.
-                                                      // 0 to disable start loading and skip to fast load only
-      #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE  30  // (mm/s) Load filament feedrate. This can be pretty fast.
-      #define FILAMENT_CHANGE_FAST_LOAD_ACCEL     25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
-      #define FILAMENT_CHANGE_FAST_LOAD_LENGTH     5  // (mm) Load length of filament, from extruder gear to nozzle.
-                                                      //   For Bowden, the full length of the tube and nozzle.
-                                                      //   For direct drive, the full length of the nozzle.
-    #endif
-
-    #if ENABLED(KNUTWURST_CHIRON)
-      #define PAUSE_PARK_RETRACT_FEEDRATE         40  // (mm/s) Initial retract feedrate.
-      #define PAUSE_PARK_RETRACT_LENGTH            4  // (mm) Initial retract.
-                                                      // This short retract is done immediately, before parking the nozzle.
-      #define FILAMENT_CHANGE_UNLOAD_FEEDRATE     30  // (mm/s) Unload filament feedrate. This can be pretty fast.
-      #define FILAMENT_CHANGE_UNLOAD_ACCEL        25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
-      #define FILAMENT_CHANGE_UNLOAD_LENGTH        5  // (mm) The length of filament for a complete unload.
-                                                      //   For Bowden, the full length of the tube and nozzle.
-                                                      //   For direct drive, the full length of the nozzle.
-                                                      //   Set to 0 for manual unloading.
-      #define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE   6  // (mm/s) Slow move when starting load.
-      #define FILAMENT_CHANGE_SLOW_LOAD_LENGTH     0  // (mm) Slow length, to allow time to insert material.
-                                                      // 0 to disable start loading and skip to fast load only
-      #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE  30  // (mm/s) Load filament feedrate. This can be pretty fast.
-      #define FILAMENT_CHANGE_FAST_LOAD_ACCEL     25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
-      #define FILAMENT_CHANGE_FAST_LOAD_LENGTH     5  // (mm) Load length of filament, from extruder gear to nozzle.
-                                                      //   For Bowden, the full length of the tube and nozzle.
-                                                      //   For direct drive, the full length of the nozzle.
-    #endif
-
-    #if NONE(KNUTWURST_CHIRON, KNUTWURST_4MAXP2)
   #define PAUSE_PARK_RETRACT_FEEDRATE         40  // (mm/s) Initial retract feedrate.
   #define PAUSE_PARK_RETRACT_LENGTH            4  // (mm) Initial retract.
                                                   // This short retract is done immediately, before parking the nozzle.
@@ -2716,15 +2675,12 @@
   #define FILAMENT_CHANGE_FAST_LOAD_LENGTH   538  // (mm) Load length of filament, from extruder gear to nozzle.
                                                   //   For Bowden, the full length of the tube and nozzle.
                                                   //   For direct drive, the full length of the nozzle.
-  #endif
-
   #define ADVANCED_PAUSE_CONTINUOUS_PURGE       // Purge continuously up to the purge length until interrupted.
   #define ADVANCED_PAUSE_PURGE_FEEDRATE        2  // (mm/s) Extrude feedrate (after loading). Should be slower than load feedrate.
   #define ADVANCED_PAUSE_PURGE_LENGTH          2  // (mm) Length to extrude after loading.
                                                   //   Set to 0 for manual extrusion.
                                                   //   Filament can be extruded repeatedly from the Filament Change menu
                                                   //   until extrusion is consistent, and to purge old filament.
-
   // #define ADVANCED_PAUSE_RESUME_PRIME        0  // (mm) Extra distance to prime nozzle after returning from park.
   #define ADVANCED_PAUSE_FANS_PAUSE             // Turn off print-cooling fans while the machine is paused.
 

Marlin/src/inc/Version.h

@@ -41,10 +41,10 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
- #define CUSTOM_BUILD_VERSION "1.5.0-RC1"
+ #define CUSTOM_BUILD_VERSION "1.5.0-b5"
 
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2023-06-02"
+  #define STRING_DISTRIBUTION_DATE "2023-05-24"
 #endif
 
 /**

Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h

@@ -21,9 +21,15 @@
 #ifndef anycubic_touchscreen_h
 #define anycubic_touchscreen_h
 
+// #include <stdio.h>
+// #include "../inc/MarlinConfig.h"
+// #include "../module/configuration_store.h"
+
 #include "../../../inc/MarlinConfigPre.h"
 #include "../../../module/probe.h"
 
+void initializeGrid();
+
 char *itostr2(const uint8_t &x);
 
 #ifndef ULTRA_LCD
@@ -36,13 +42,26 @@ char *itostr2(const uint8_t &x);
 #define MSG_MY_VERSION CUSTOM_BUILD_VERSION
 #define MAX_PRINTABLE_FILENAME_LEN 26
 
+#if ENABLED(KNUTWURST_CHIRON)
+  #define FIL_RUNOUT_PIN 33
+#else
+  #define FIL_RUNOUT_PIN 19
+#endif
+
+#define ANYCUBIC_TFT_STATE_IDLE 0
+#define ANYCUBIC_TFT_STATE_SDPRINT 1
+#define ANYCUBIC_TFT_STATE_SDPAUSE 2
+#define ANYCUBIC_TFT_STATE_SDPAUSE_REQ 3
+#define ANYCUBIC_TFT_STATE_SDPAUSE_OOF 4
+#define ANYCUBIC_TFT_STATE_SDSTOP_REQ 5
+#define ANYCUBIC_TFT_STATE_SDOUTAGE 99
+
 enum AnycubicMediaPrintState {
   AMPRINTSTATE_NOT_PRINTING,
   AMPRINTSTATE_PRINTING,
   AMPRINTSTATE_PAUSE_REQUESTED,
   AMPRINTSTATE_PAUSED,
-  AMPRINTSTATE_STOP_REQUESTED,
+  AMPRINTSTATE_STOP_REQUESTED
-  AMPRINTSTATE_PROBING
 };
 
 enum AnycubicMediaPauseState {
@@ -145,7 +164,7 @@ enum AnycubicMediaPauseState {
 #endif // !KNUTWURST_DGUS2_TFT
 
 #if ENABLED(KNUTWURST_DGUS2_TFT)
-  #define SM_DIR_UP_L           "/..                 .gcode"
+  #define SM_DIR_UP_L           "<<< BACK <<<        .gcode"
   #define SM_DIR_UP_S           "DIR_UP~1.GCO"
   #define SM_SPECIAL_MENU_L     "<Special Menu>      .gcode"
   #define SM_SPECIAL_MENU_S     "<SPECI~1.GCO"
@@ -231,8 +250,15 @@ enum AnycubicMediaPauseState {
   #define SM_BLTZ_EXIT_S        "<EXTABLM.GCO"
 #endif // KNUTWURST_DGUS2_TFT
 
-class AnycubicTouchscreenClass {
+#if ENABLED(KNUTWURST_TFT_LEVELING)
+  // eeprom_index
+  extern int z_values_index;
+  extern int z_values_size;
+  // temp value which needs to be saved
+  extern float SAVE_zprobe_zoffset;
+#endif
 
+class AnycubicTouchscreenClass {
 public:
 AnycubicTouchscreenClass();
 
@@ -247,11 +273,9 @@ void KillTFT();
 static void OnPrintTimerStarted();
 static void OnPrintTimerPaused();
 static void OnPrintTimerStopped();
-
 #if BOTH(ANYCUBIC_TFT_DEBUG, KNUTWURST_DGUS2_TFT)
   void Command(const char * const command);
 #endif
-
 #if ENABLED(KNUTWURST_TFT_LEVELING)
   void LevelingDone();
 #endif
@@ -276,11 +300,6 @@ int currentFlowRate       = 0;
 bool PrintdoneAndPowerOFF = true;
 bool powerOFFflag         = 0;
 
-#if ENABLED(KNUTWURST_TFT_LEVELING)
-  xy_uint8_t       selectedmeshpoint;
-  float            live_Zoffset;
-#endif
-
 static AnycubicMediaPrintState mediaPrintingState;
 static AnycubicMediaPauseState mediaPauseState;
 
@@ -299,6 +318,7 @@ static AnycubicMediaPauseState mediaPauseState;
 int CodeValueInt();
 float CodeValue();
 bool CodeSeen(char);
+void PrintList();
 void StartPrint();
 void PausePrint();
 void StopPrint();
@@ -311,14 +331,12 @@ void FilamentChangePause();
 void ResumePrint();
 void ReheatNozzle();
 void ParkAfterStop();
-void RenderCurrentFileList();
-void RenderSpecialMenu(uint16_t);
-void RenderCurrentFolder(uint16_t);
 
-char currentTouchscreenSelection[64];
+char currentTouchscreenSelection[30];
-char currentFileOrDirectory[64];
+char currentFileOrDirectory[30];
 String flowRateBuffer;
 String zOffsetBuffer;
+uint16_t MyFileNrCnt          = 0;
 uint8_t FilamentSensorEnabled = true;
 
 uint8_t SpecialMenu = false;

Marlin/src/pins/pins.h

@@ -164,7 +164,7 @@
 #elif MB(TRIGORILLA_13)
   #include "ramps/pins_TRIGORILLA_13.h"         // ATmega2560                             env:mega2560
 #elif MB(TRIGORILLA_14, TRIGORILLA_14_11)
-  #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:mega2560 env:MEGA_1G env:MEGA_1G_TMC env:MEGA_1G_BLT_10 env:MEGA_1G_BLT_11 env:MEGA_1G_TMC_BLT_10 env:MEGA_1G_TMC_BLT_11 env:MEGA env:MEGA_TMC env:MEGA_BLT_10 env:MEGA_BLT_11 env:MEGA_TMC_BLT_10 env:MEGA_TMC_BLT_11 env:MEGA_S env:MEGA_S_TMC env:MEGA_S_BLT_10 env:MEGA_S_BLT_11 env:MEGA_S_TMC_BLT_10 env:MEGA_S_TMC_BLT_11 env:MEGA_S_DGUS env:MEGA_S_DGUS_TMC env:MEGA_S_DGUS_BLT_10 env:MEGA_S_DGUS_BLT_11 env:MEGA_S_DGUS_TMC_BLT_10 env:MEGA_S_DGUS_TMC_BLT_11 env:MEGA_X env:MEGA_X_TMC env:MEGA_X_BLT_10 env:MEGA_X_BLT_11 env:MEGA_X_TMC_BLT_10 env:MEGA_X_TMC_BLT_11 env:MEGA_X_DGUS env:MEGA_X_DGUS_TMC env:MEGA_X_DGUS_BLT_10 env:MEGA_X_DGUS_BLT_11 env:MEGA_X_DGUS_TMC_BLT_10 env:MEGA_X_DGUS_TMC_BLT_11 env:MEGA_P_DGUS env:MEGA_P_DGUS_TMC env:MEGA_P_DGUS_BLT_10 env:MEGA_P_DGUS_BLT_11 env:MEGA_P_DGUS_TMC_BLT_10 env:MEGA_P_DGUS_TMC_BLT_11 env:4MAXP2 env:4MAXP2_TMC env:4MAXP2_BLT_10 env:4MAXP2_BLT_11 env:4MAXP2_TMC_BLT_10 env:4MAXP2_TMC_BLT_11 env:4MAXP2_DGUS env:4MAXP2_DGUS_TMC env:4MAXP2_DGUS_BLT_10 env:4MAXP2_DGUS_BLT_11 env:4MAXP2_DGUS_TMC_BLT_10 env:4MAXP2_DGUS_TMC_BLT_11
+  #include "ramps/pins_TRIGORILLA_14.h"         // ATmega2560                             env:mega2560 env:MEGA_1G env:MEGA_1G_TMC env:MEGA_1G_BLT_10 env:MEGA_1G_BLT_11 env:MEGA_1G_TMC_BLT_10 env:MEGA_1G_TMC_BLT_11 env:MEGA env:MEGA_TMC env:MEGA_TMC_KLICKY env:MEGA_BLT_10 env:MEGA_BLT_11 env:MEGA_TMC_BLT_10 env:MEGA_TMC_BLT_11 env:MEGA_S env:MEGA_S_TMC env:MEGA_S_TMC_KLICKY env:MEGA_S_BLT_10 env:MEGA_S_BLT_11 env:MEGA_S_TMC_BLT_10 env:MEGA_S_TMC_BLT_11 env:MEGA_S_DGUS env:MEGA_S_DGUS_TMC env:MEGA_S_DGUS_BLT_10 env:MEGA_S_DGUS_BLT_11 env:MEGA_S_DGUS_TMC_BLT_10 env:MEGA_S_DGUS_TMC_BLT_11 env:MEGA_X env:MEGA_X_TMC env:MEGA_X_BLT_10 env:MEGA_X_BLT_11 env:MEGA_X_TMC_BLT_10 env:MEGA_X_TMC_BLT_11 env:MEGA_X_DGUS env:MEGA_X_DGUS_TMC env:MEGA_X_DGUS_BLT_10 env:MEGA_X_DGUS_BLT_11 env:MEGA_X_DGUS_TMC_BLT_10 env:MEGA_X_DGUS_TMC_BLT_11 env:MEGA_P_DGUS env:MEGA_P_DGUS_TMC env:MEGA_P_DGUS_BLT_10 env:MEGA_P_DGUS_BLT_11 env:MEGA_P_DGUS_TMC_BLT_10 env:MEGA_P_DGUS_TMC_BLT_11 env:4MAXP2 env:4MAXP2_TMC env:4MAXP2_BLT_10 env:4MAXP2_BLT_11 env:4MAXP2_TMC_BLT_10 env:4MAXP2_TMC_BLT_11 env:4MAXP2_DGUS env:4MAXP2_DGUS_TMC env:4MAXP2_DGUS_BLT_10 env:4MAXP2_DGUS_BLT_11 env:4MAXP2_DGUS_TMC_BLT_10 env:4MAXP2_DGUS_TMC_BLT_11
 #elif MB(RAMPS_ENDER_4)
   #include "ramps/pins_RAMPS_ENDER_4.h"         // ATmega2560                             env:mega2560
 #elif MB(RAMPS_CREALITY)

Marlin/src/pins/ramps/pins_RAMPS.h

@@ -286,10 +286,8 @@
   #endif
 #endif
 
-
+// RAMPS 1.4 DIO 4 on the servos connector
-#if ANY(KNUTWURST_CHIRON, KNUTWURST_4MAXP2)
+#ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN 33
-#else
   #define FIL_RUNOUT_PIN                      19
 #endif
 

Marlin/src/pins/ramps/pins_RAMPS_CHIRON.h

@@ -253,7 +253,7 @@
 
 // RAMPS 1.4 DIO 4 on the servos connector
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN                      33
+  #define FIL_RUNOUT_PIN                       4
 #endif
 
 #ifndef PS_ON_PIN

Marlin/src/pins/ramps/pins_TRIGORILLA_14.h

@@ -86,12 +86,6 @@
     #define OUTAGECON_PIN                     58
   #endif
 
-  #if ANY(KNUTWURST_CHIRON, KNUTWURST_4MAXP2)
-    #define FIL_RUNOUT_PIN 33
-  #else
-    #define FIL_RUNOUT_PIN 19
-  #endif
-
   #if ENABLED(TRIGORILLA_MAPPING_CHIRON)
     #ifndef FIL_RUNOUT_PIN
       #define FIL_RUNOUT_PIN                  33

Marlin/src/pins/ramps/pins_TRIGORILLA_CHIRON.h

@@ -64,7 +64,7 @@
 #define TG_FAN1_PIN                            7  // Anycubic Kossel: Unused
 #define TG_FAN2_PIN                           44  // Anycubic Kossel: Hotend fan
 #define CONTROLLER_FAN_PIN                    TG_FAN1_PIN
-#define FIL_RUNOUT_PIN                        33
+#define FIL_RUNOUT_PIN                        19
 #define BEEPER_PIN                            31
 #define SDSS                                  53
 #define LED_PIN                               13

ini/i3_mega.ini

@@ -79,6 +79,15 @@ build_src_filter  = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_TMC
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_CHIRON -DKNUTWURST_4MAXP2 
 
+[env:MEGA_TMC_KLICKY]
+platform          = atmelavr
+board             = megaatmega2560
+board_build.f_cpu = 16000000L
+lib_deps          = ${common.lib_deps}
+build_src_filter  = ${common.default_src_filter} +<src/HAL/AVR>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_TMC -DKNUTWURST_KLICKY
+build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_CHIRON -DKNUTWURST_4MAXP2 
+
 [env:MEGA_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560
@@ -138,6 +147,15 @@ build_src_filter  = ${common.default_src_filter} +<src/HAL/AVR>
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_TMC
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_CHIRON -DKNUTWURST_4MAXP2 
 
+[env:MEGA_S_TMC_KLICKY]
+platform          = atmelavr
+board             = megaatmega2560
+board_build.f_cpu = 16000000L
+lib_deps          = ${common.lib_deps}
+build_src_filter  = ${common.default_src_filter} +<src/HAL/AVR>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_TMC -DKNUTWURST_KLICKY
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH -DKNUTWURST_ONE_Z_ENDSTOP -DKNUTWURST_CHIRON -DKNUTWURST_4MAXP2 
+
 [env:MEGA_S_BLT_10]
 platform          = atmelavr
 board             = megaatmega2560

platformio.ini

@@ -27,12 +27,14 @@ default_envs =
   MEGA_1G_TMC_BLT_11
   MEGA
   MEGA_TMC
+  MEGA_TMC_KLICKY
   MEGA_BLT_10
   MEGA_BLT_11
   MEGA_TMC_BLT_10
   MEGA_TMC_BLT_11
   MEGA_S
   MEGA_S_TMC
+  MEGA_S_TMC_KLICKY
   MEGA_S_BLT_10
   MEGA_S_BLT_11
   MEGA_S_TMC_BLT_10