Merge branch 'knutwurst:master' into klicky

klicky probe initial commit
2023-05-25 01:34:17 +02:00 · 2023-05-24 22:31:27 +02:00
12 changed files with 747 additions and 682 deletions
--- a/Marlin/Configuration.h
+++ b/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,21 +1736,24 @@
 * Magnetically Mounted Probe
 * For probes such as Euclid, Klicky, Klackender, etc.
 */
-// #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
+#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_2 { PROBE_DEPLOY_FEEDRATE, { 210, 114, 30 } }  // 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_2   { PROBE_STOW_FEEDRATE,   { 245, 114,  0 } }  // Place probe beside remover
-  #define MAG_MOUNTED_STOW_3   { PROBE_STOW_FEEDRATE,   { 230, 114,  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_5   { PROBE_STOW_FEEDRATE,   {   0,   0,  0 } }  // Extra move if needed
+    #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, { 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,   { 176, 0, 20 } }    // Move right above the dock
+    #define MAG_MOUNTED_STOW_2   { PROBE_STOW_FEEDRATE,   { 176, 0,  0 } }    // Move probe into dock
+    #define MAG_MOUNTED_STOW_3   { PROBE_STOW_FEEDRATE,   {  50, 0,  0 } }  // 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
@@ -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_BED     60
+#define PREHEAT_1_TEMP_HOTEND 180
+#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

--- a/Marlin/Configuration_adv.h
+++ b/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,73 +2658,29 @@
 */
 #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    10  // (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   550  // (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.
-      #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      555  // (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   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 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      555  // (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   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.
  #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.

--- a/Marlin/src/inc/Version.h
+++ b/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"
+ #define CUSTOM_BUILD_VERSION "1.5.0-b5"

 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2023-06-07"
+  #define STRING_DISTRIBUTION_DATE "2023-05-24"
 #endif

 /**
--- a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp
+++ b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp
--- a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h
+++ b/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_PROBING
+  AMPRINTSTATE_STOP_REQUESTED
 };

 enum AnycubicMediaPauseState {
@@ -57,143 +76,189 @@ enum AnycubicMediaPauseState {
  AMPAUSESTATE_PAUSED
 };

-  
-#define SM_DIR_UP_S           "DIR_UP~1.GCO"
-#define SM_SPECIAL_MENU_S     "<SPECI~1.GCO"
-#define SM_PID_HOTEND_S       "<PIDTU~1.GCO"
-#define SM_PID_BED_S          "<PIDTU~2.GCO"
-#define SM_SAVE_EEPROM_S      "<SAVEE~1.GCO"
-#define SM_LOAD_DEFAULTS_S    "<LOADF~1.GCO"
-#define SM_PREHEAT_BED_S      "<PREHE~1.GCO"
-#define SM_MESH_MENU_S        "<MESHL~1.GCO"
-#define SM_MESH_START_S       "<START~1.GCO"
-#define SM_MESH_NEXT_S        "<NEXTM~1.GCO"
-#define SM_Z_UP_01_S          "<ZUP01~1.GCO"
-#define SM_Z_DN_01_S          "<ZDOWN~1.GCO"
-#define SM_Z_UP_002_S         "<ZUP00~1.GCO"
-#define SM_Z_DN_002_S         "<ZDOWN~2.GCO"
-#define SM_Z_UP_001_S         "<ZUP00~2.GCO"
-#define SM_Z_DN_001_S         "<ZDOWN~3.GCO"
-#define SM_BLTOUCH_S          "<BLTOU~1.GCO"
-#define SM_RESETLV_S          "<RSTLV~1.GCO"
-#define SM_PAUSE_S            "<FILCH~2.GCO"
-#define SM_RESUME_S           "<FILCH~1.GCO"
-#define SM_DIS_FILSENS_S      "<DISAB~1.GCO"
-#define SM_EN_FILSENS_S       "<ENABL~1.GCO"
-#define SM_EXIT_S             "<EXIT_~1.GCO"
-#define SM_BACK_S             "<BACK_~1.GCO"
-#define SM_FLOWMENU_S         "<SETFLO1.GCO"
-#define SM_FLOW_DISP_S        "<FLDISPL.GCO"
-#define SM_FLOW_UP_S          "<UPFLOW1.GCO"
-#define SM_FLOW_DN_S          "<DWNFLOW.GCO"
-#define SM_FLOW_EXIT_S        "<EXTFLW1.GCO"
-#define SM_EZLVL_MENU_S       "<EZLVLM1.GCO"
-#define SM_EZLVL_P1_S         "<EZLPA01.GCO"
-#define SM_EZLVL_P2_S         "<EZLPB01.GCO"
-#define SM_EZLVL_P3_S         "<EZLPC01.GCO"
-#define SM_EZLVL_P4_S         "<EZLPD01.GCO"
-#define SM_EZLVL_EXIT_S       "<EZLEXT1.GCO"
-#define SM_BLTZMENU_S         "<SETOFZ0.GCO"
-#define SM_BLTZ_DISP_S        "<OFZDSP0.GCO"
-#define SM_BLTZ_UP_S          "<UPOFFZ0.GCO"
-#define SM_BLTZ_DN_S          "<DOWNOFZ.GCO"
-#define SM_BLTZ_EXIT_S        "<EXTABLM.GCO"
-#define SM_HS_DISABLE_S       "<HSDISAB.GCO"
-#define SM_HS_ENABLE_S        "<HSENABL.GCO"
-
-
 #if DISABLED(KNUTWURST_DGUS2_TFT)
  #define SM_DIR_UP_L           "/.."
+  #define SM_DIR_UP_S           ".."
  #define SM_SPECIAL_MENU_L     "<Special Menu>"
+  #define SM_SPECIAL_MENU_S     "<SPECM>"
  #define SM_PID_HOTEND_L       "<PID Tune Hotend>"
+  #define SM_PID_HOTEND_S       "<PIDHE>"
  #define SM_PID_BED_L          "<PID Tune Ultrabase>"
+  #define SM_PID_BED_S          "<PIDUB>"
  #define SM_SAVE_EEPROM_L      "<Save EEPROM>"
+  #define SM_SAVE_EEPROM_S      "<SAVEE>"
  #define SM_LOAD_DEFAULTS_L    "<Load FW Defaults>"
+  #define SM_LOAD_DEFAULTS_S    "<LDDEF>"
  #define SM_PREHEAT_BED_L      "<Preheat Ultrabase>"
+  #define SM_PREHEAT_BED_S      "<PREHE>"
  #define SM_MESH_MENU_L        "<Mesh Leveling>"
+  #define SM_MESH_MENU_S        "<MESHL>"
  #define SM_MESH_START_L       "<Start Mesh Leveling>"
+  #define SM_MESH_START_S       "<SMESH>"
  #define SM_MESH_NEXT_L        "<Next Mesh Point>"
+  #define SM_MESH_NEXT_S        "<NEXTM>"
  #define SM_Z_UP_01_L          "<Z Up 0.1>"
+  #define SM_Z_UP_01_S          "<ZUP01>"
  #define SM_Z_DN_01_L          "<Z Down 0.1>"
+  #define SM_Z_DN_01_S          "<ZDN01>"
  #define SM_Z_UP_002_L         "<Z Up 0.02>"
+  #define SM_Z_UP_002_S         "<ZUP002>"
  #define SM_Z_DN_002_L         "<Z Down 0.02>"
+  #define SM_Z_DN_002_S         "<ZDN002>"
  #define SM_Z_UP_001_L         "<Z Up 0.01>"
+  #define SM_Z_UP_001_S         "<ZUP001>"
  #define SM_Z_DN_001_L         "<Z Down 0.01>"
+  #define SM_Z_DN_001_S         "<ZDN001>"
  #define SM_BLTOUCH_L          "<Start Auto Leveling>"
+  #define SM_BLTOUCH_S          "<BLTCH>"
  #define SM_RESETLV_L          "<Reset Level Grid>"
+  #define SM_RESETLV_S          "<RSTLV>"
  #define SM_PAUSE_L            "<Fil. Change Pause>"
+  #define SM_PAUSE_S            "<PAUSE>"
  #define SM_RESUME_L           "<Fil. Change Resume>"
+  #define SM_RESUME_S           "<RESUM>"
  #define SM_DIS_FILSENS_L      "<Disable Fil. Sensor>"
+  #define SM_DIS_FILSENS_S      "<DISSEN>"
  #define SM_EN_FILSENS_L       "<Enable Fil. Sensor>"
+  #define SM_EN_FILSENS_S       "<ENSEN>"
  #define SM_EXIT_L             "<Exit>"
+  #define SM_EXIT_S             "<SMEXIT>"
+
  #define SM_BACK_L             "<End Mesh Leveling>"
+  #define SM_BACK_S             "<BACK>"
+
  #define SM_FLOWMENU_L         "<Set Flowrate>"
+  #define SM_FLOWMENU_S         "<SETFLO>"
  #define SM_FLOW_DISP_L        "<Flow is XXX>"
+  #define SM_FLOW_DISP_S        "<FLDISP>"
  #define SM_FLOW_UP_L          "<Up>"
+  #define SM_FLOW_UP_S          "<FLUP>"
  #define SM_FLOW_DN_L          "<Down>"
+  #define SM_FLOW_DN_S          "<FLDN>"
  #define SM_FLOW_EXIT_L        "<Exit Flow Settings>"
+  #define SM_FLOW_EXIT_S        "<EXTFLW>"
+
  #define SM_EZLVL_MENU_L       "<Easy 4 Point Level>"
+  #define SM_EZLVL_MENU_S       "<EZLVLM>"
  #define SM_EZLVL_P1_L         "<Point A>"
+  #define SM_EZLVL_P1_S         "<EZLPA>"
  #define SM_EZLVL_P2_L         "<Point B>"
+  #define SM_EZLVL_P2_S         "<EZLPB>"
  #define SM_EZLVL_P3_L         "<Point C>"
+  #define SM_EZLVL_P3_S         "<EZLPC>"
  #define SM_EZLVL_P4_L         "<Point D>"
+  #define SM_EZLVL_P4_S         "<EZLPD>"
  #define SM_EZLVL_EXIT_L       "<Exit Easy Level>"
+  #define SM_EZLVL_EXIT_S       "<EZLEXT>"
+
  #define SM_BLTZMENU_L         "<Auto Leveling>"
+  #define SM_BLTZMENU_S         "<SETOFZ>"
  #define SM_BLTZ_DISP_L        "<Z Offset: XXXXX>"
+  #define SM_BLTZ_DISP_S        "<OFZDSP>"
  #define SM_BLTZ_UP_L          "<Up>"
+  #define SM_BLTZ_UP_S          "<UPOFFZ0>"
  #define SM_BLTZ_DN_L          "<Down>"
+  #define SM_BLTZ_DN_S          "<DNOFFZ0>"
  #define SM_BLTZ_EXIT_L        "<SAVE and EXIT>"
-  #define SM_HS_DISABLE_L       "<Disable HiSpeed Mode>"
-  #define SM_HS_ENABLE_L        "<Enable HiSpeed Mode>"
+  #define SM_BLTZ_EXIT_S        "<EXTABLM>"
 #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"
  #define SM_PID_HOTEND_L       "<PID Tune Hotend>   .gcode"
+  #define SM_PID_HOTEND_S       "<PIDTU~1.GCO"
  #define SM_PID_BED_L          "<PID Tune Ultrabase>.gcode"
+  #define SM_PID_BED_S          "<PIDTU~2.GCO"
  #define SM_SAVE_EEPROM_L      "<Save EEPROM>       .gcode"
+  #define SM_SAVE_EEPROM_S      "<SAVEE~1.GCO"
  #define SM_LOAD_DEFAULTS_L    "<Load FW Defaults>  .gcode"
+  #define SM_LOAD_DEFAULTS_S    "<LOADF~1.GCO"
  #define SM_PREHEAT_BED_L      "<Preheat Ultrabase> .gcode"
+  #define SM_PREHEAT_BED_S      "<PREHE~1.GCO"
  #define SM_MESH_MENU_L        "<Mesh Leveling>     .gcode"
+  #define SM_MESH_MENU_S        "<MESHL~1.GCO"
  #define SM_MESH_START_L       "<Start MeshLeveling>.gcode"
+  #define SM_MESH_START_S       "<START~1.GCO"
  #define SM_MESH_NEXT_L        "<Next Mesh Point>   .gcode"
+  #define SM_MESH_NEXT_S        "<NEXTM~1.GCO"
  #define SM_Z_UP_01_L          "<Z Up 0.1>          .gcode"
+  #define SM_Z_UP_01_S          "<ZUP01~1.GCO"
  #define SM_Z_DN_01_L          "<Z Down 0.1>        .gcode"
+  #define SM_Z_DN_01_S          "<ZDOWN~1.GCO"
  #define SM_Z_UP_002_L         "<Z Up 0.02>         .gcode"
+  #define SM_Z_UP_002_S         "<ZUP00~1.GCO"
  #define SM_Z_DN_002_L         "<Z Down 0.02>       .gcode"
+  #define SM_Z_DN_002_S         "<ZDOWN~2.GCO"
  #define SM_Z_UP_001_L         "<Z Up 0.01>         .gcode"
+  #define SM_Z_UP_001_S         "<ZUP00~2.GCO"
  #define SM_Z_DN_001_L         "<Z Down 0.01>       .gcode"
+  #define SM_Z_DN_001_S         "<ZDOWN~3.GCO"
  #define SM_BLTOUCH_L          "<Start AutoLeveling>.gcode"
+  #define SM_BLTOUCH_S          "<BLTOU~1.GCO"
  #define SM_RESETLV_L          "<Reset Level Grid>  .gcode"
+  #define SM_RESETLV_S          "<RSTLV~1.GCO>"
  #define SM_PAUSE_L            "<Fil. Change Pause> .gcode"
+  #define SM_PAUSE_S            "<FILCH~2.GCO"
  #define SM_RESUME_L           "<Fil. Change Resume>.gcode"
+  #define SM_RESUME_S           "<FILCH~1.GCO"
  #define SM_DIS_FILSENS_L      "<Disable Fil.Sensor>.gcode"
+  #define SM_DIS_FILSENS_S      "<DISAB~1.GCO"
  #define SM_EN_FILSENS_L       "<Enable Fil. Sensor>.gcode"
+  #define SM_EN_FILSENS_S       "<ENABL~1.GCO"
  #define SM_EXIT_L             "<Exit>              .gcode"
+  #define SM_EXIT_S             "<EXIT_~1.GCO"
+
  #define SM_BACK_L             "<End Mesh Leveling> .gcode"
+  #define SM_BACK_S             "<BACK_~1.GCO"
+
  #define SM_FLOWMENU_L         "<Set Flowrate>      .gcode"
+  #define SM_FLOWMENU_S         "<SETFLO1.GCO"
  #define SM_FLOW_DISP_L        "<Flow is XXX%>      .gcode"
+  #define SM_FLOW_DISP_S        "<FLDISPL.GCO"
  #define SM_FLOW_UP_L          "<Up>                .gcode"
+  #define SM_FLOW_UP_S          "<UPFLOW1.GCO"
  #define SM_FLOW_DN_L          "<Down>              .gcode"
+  #define SM_FLOW_DN_S          "<DWNFLOW.GCO"
  #define SM_FLOW_EXIT_L        "<Exit Flow Settings>.gcode"
+  #define SM_FLOW_EXIT_S        "<EXTFLW1.GCO"
+
  #define SM_EZLVL_MENU_L       "<Easy 4 Point Level>.gcode"
+  #define SM_EZLVL_MENU_S       "<EZLVLM1.GCO"
  #define SM_EZLVL_P1_L         "<Point A>           .gcode"
+  #define SM_EZLVL_P1_S         "<EZLPA01.GCO"
  #define SM_EZLVL_P2_L         "<Point B>           .gcode"
+  #define SM_EZLVL_P2_S         "<EZLPB01.GCO"
  #define SM_EZLVL_P3_L         "<Point C>           .gcode"
+  #define SM_EZLVL_P3_S         "<EZLPC01.GCO"
  #define SM_EZLVL_P4_L         "<Point D>           .gcode"
+  #define SM_EZLVL_P4_S         "<EZLPD01.GCO"
  #define SM_EZLVL_EXIT_L       "<Exit Easy Leveling>.gcode"
+  #define SM_EZLVL_EXIT_S       "<EZLEXT1.GCO"
+
  #define SM_BLTZMENU_L         "<Auto Leveling>     .gcode"
+  #define SM_BLTZMENU_S         "<SETOFZ0.GCO"
  #define SM_BLTZ_DISP_L        "<Z Offset: XXXXX>   .gcode"
+  #define SM_BLTZ_DISP_S        "<OFZDSP0.GCO"
  #define SM_BLTZ_UP_L          "<Up>                .gcode"
+  #define SM_BLTZ_UP_S          "<UPOFFZ0.GCO"
  #define SM_BLTZ_DN_L          "<Down>              .gcode"
+  #define SM_BLTZ_DN_S          "<DOWNOFZ.GCO"
  #define SM_BLTZ_EXIT_L        "<SAVE and EXIT>     .gcode"
-  #define SM_HS_DISABLE_L       "<Disable HiSpeed>   .gcode"
-  #define SM_HS_ENABLE_L        "<Enable HiSpeed>    .gcode"
+  #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();

@@ -205,14 +270,12 @@ void UserConfirmRequired(const char *);
 void SDCardStateChange(bool);
 void SDCardError();
 void KillTFT();
-void OnPrintTimerStarted();
-void OnPrintTimerPaused();
-void OnPrintTimerStopped();
-
+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
@@ -227,13 +290,15 @@ int serial3_count = 0;
 char *TFTstrchr_pointer;
 char FlagResumFromOutage  = 0;
 int filenumber            = 0;
+unsigned long starttime   = 0;
+unsigned long stoptime    = 0;
 uint8_t tmp_extruder      = 0;
+char LastSDstatus         = 0;
 uint16_t HeaterCheckCount = 0;
+bool IsParked             = false;
 int currentFlowRate       = 0;
 bool PrintdoneAndPowerOFF = true;
 bool powerOFFflag         = 0;
-xy_uint8_t       selectedmeshpoint;
-float            live_Zoffset;

 static AnycubicMediaPrintState mediaPrintingState;
 static AnycubicMediaPauseState mediaPauseState;
@@ -253,23 +318,26 @@ static AnycubicMediaPauseState mediaPauseState;
 int CodeValueInt();
 float CodeValue();
 bool CodeSeen(char);
+void PrintList();
 void StartPrint();
 void PausePrint();
-void ResumePrint();
 void StopPrint();
+void StateHandler();
 void GetCommandFromTFT();
 void CheckSDCardChange();
 void CheckHeaterError();
-void FilamentChangePause();
 void HandleSpecialMenu();
-void RenderCurrentFileList();
-void RenderSpecialMenu(uint16_t);
-void RenderCurrentFolder(uint16_t);
+void FilamentChangePause();
+void ResumePrint();
+void ReheatNozzle();
+void ParkAfterStop();

-char currentTouchscreenSelection[64];
-char currentFileOrDirectory[64];
+char currentTouchscreenSelection[30];
+char currentFileOrDirectory[30];
 String flowRateBuffer;
 String zOffsetBuffer;
+uint16_t MyFileNrCnt          = 0;
+uint8_t FilamentSensorEnabled = true;

 uint8_t SpecialMenu = false;
 uint8_t MMLMenu     = false;
--- a/Marlin/src/pins/pins.h
+++ b/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)
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -286,11 +286,9 @@
  #endif
 #endif

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

 #ifndef PS_ON_PIN
--- a/Marlin/src/pins/ramps/pins_RAMPS_CHIRON.h
+++ b/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
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_14.h
+++ b/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
--- a/Marlin/src/pins/ramps/pins_TRIGORILLA_CHIRON.h
+++ b/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
--- a/ini/i3_mega.ini
+++ b/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
--- a/platformio.ini
+++ b/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
Author	SHA1	Message	Date
Suat Özgür	12e23161fe	Merge branch 'knutwurst:master' into klicky	2023-05-25 01:34:17 +02:00
Suat Özgür	78eab4e511	klicky probe initial commit	2023-05-24 22:31:27 +02:00