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
7 changed files with 216 additions and 142 deletions
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1659,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

@@ -1736,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
@@ -1849,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

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

 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2023-05-28"
+  #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
@@ -166,6 +166,42 @@
    #endif
  }

+  char *itostr2(const uint8_t &x) {
+    int xx = x;
+    _conv[0] = (xx / 10) % 10 + '0';
+    _conv[1] = (xx) % 10 + '0';
+    _conv[2] = 0;
+    return _conv;
+  }
+
+  #ifndef ULTRA_LCD
+    #define DIGIT(n) ('0' + (n))
+    #define DIGIMOD(n, f) DIGIT((n) / (f) % 10)
+    #define RJDIGIT(n, f) ((n) >= (f) ? DIGIMOD(n, f) : ' ')
+    #define MINUSOR(n, alt) (n >= 0 ? (alt) : (n = -n, '-'))
+
+    char *itostr3(const int x) {
+      int xx = x;
+      _conv[4] = MINUSOR(xx, RJDIGIT(xx, 100));
+      _conv[5] = RJDIGIT(xx, 10);
+      _conv[6] = DIGIMOD(xx, 1);
+      return &_conv[4];
+    }
+
+    // Convert signed float to fixed-length string with 023.45 / -23.45 format
+
+    char *ftostr32(const float &x) {
+      long xx = x * 100;
+      _conv[1] = MINUSOR(xx, DIGIMOD(xx, 10000));
+      _conv[2] = DIGIMOD(xx, 1000);
+      _conv[3] = DIGIMOD(xx, 100);
+      _conv[4] = '.';
+      _conv[5] = DIGIMOD(xx, 10);
+      _conv[6] = DIGIMOD(xx, 1);
+      return &_conv[1];
+    }
+  #endif
+
  using namespace ExtUI;

  AnycubicTouchscreenClass::AnycubicTouchscreenClass() {
@@ -213,11 +249,9 @@
    setup_OutageTestPin();
    setup_PowerOffPin();

-    SENDLINE_DBG_PGM("J12", "TFT Serial Debug: Ready... J12");
+    SENDLINE_DBG_PGM("J12", "TFT Serial Debug: Ready... J12"); // J12 Ready

-    CheckHeaterError();
    DoFilamentRunoutCheck();
-    

    #ifdef STARTUP_CHIME
      BUZZ(100, 554);
@@ -313,7 +347,7 @@
    #if ENABLED(SDSUPPORT)
      #if ENABLED(FILAMENT_RUNOUT_SENSOR)
        if (READ(FIL_RUNOUT_PIN)) {
-          #if ENABLED(ANYCUBIC_TFT_DEBUG)
+          #if ENABLED(ANYCUBIC_LCD_DEBUG)
            SERIAL_ECHOLNPGM("TFT Serial Debug: Resume Print with filament sensor still tripped... ");
          #endif

@@ -360,7 +394,7 @@
  void AnycubicTouchscreenClass::HandleSpecialMenu() {
    #if ENABLED(KNUTWURST_SPECIAL_MENU)
      #ifdef ANYCUBIC_TFT_DEBUG
-        SERIAL_ECHOPGM("TFT Serial Debug: Special Menu Selection: ", currentTouchscreenSelection);
+        SERIAL_ECHOPGM("DEBUG: Special Menu Selection: ", currentTouchscreenSelection);
        SERIAL_EOL();
      #endif
      if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_SPECIAL_MENU_L)) != NULL)
@@ -374,19 +408,19 @@
        SERIAL_ECHOLNPGM("Special Menu: PID Tune Hotend");

        #if ANY(KNUTWURST_MEGA, KNUTWURST_MEGA_S, KNUTWURST_MEGA_P)
-          injectCommands(F("G28\nG90\nG1 Z20\nG1 X110 Y110 F4000\nG1 Z5\nM106 S172\nG4 P500\nM303 E0 S215 C15 U1\nG4 P500\nM107\nG28\nG1 Z10\nM84\nM500\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300"));
+          queue.inject_P(PSTR("G28\nG90\nG1 Z20\nG1 X110 Y110 F4000\nG1 Z5\nM106 S172\nG4 P500\nM303 E0 S215 C15 U1\nG4 P500\nM107\nG28\nG1 Z10\nM84\nM500\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300"));
        #endif

        #if ENABLED(KNUTWURST_MEGA_X)
-          injectCommands(F("G28\nG90\nG1 Z20\nG1 X155 Y155 F4000\nG1 Z5\nM106 S172\nG4 P500\nM303 E0 S215 C15 U1\nG4 P500\nM107\nG28\nG1 Z10\nM84\nM500\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300"));
+          queue.inject_P(PSTR("G28\nG90\nG1 Z20\nG1 X155 Y155 F4000\nG1 Z5\nM106 S172\nG4 P500\nM303 E0 S215 C15 U1\nG4 P500\nM107\nG28\nG1 Z10\nM84\nM500\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300"));
        #endif

        #if ENABLED(KNUTWURST_CHIRON)
-          injectCommands(F("G28\nG90\nG1 Z20\nG1 X205 Y205 F4000\nG1 Z5\nM106 S172\nG4 P500\nM303 E0 S215 C15 U1\nG4 P500\nM107\nG28\nG1 Z10\nM84\nM500\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300"));
+          queue.inject_P(PSTR("G28\nG90\nG1 Z20\nG1 X205 Y205 F4000\nG1 Z5\nM106 S172\nG4 P500\nM303 E0 S215 C15 U1\nG4 P500\nM107\nG28\nG1 Z10\nM84\nM500\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300"));
        #endif

        #if ENABLED(KNUTWURST_4MAXP2)
-          injectCommands(F("G28\nG90\nG1 Z20\nG1 X105 Y135 F4000\nG1 Z5\nM106 S172\nG4 P500\nM303 E0 S215 C15 U1\nG4 P500\nM107\nG28\nG1 Z10\nM84\nM500\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300"));
+          queue.inject_P(PSTR("G28\nG90\nG1 Z20\nG1 X105 Y135 F4000\nG1 Z5\nM106 S172\nG4 P500\nM303 E0 S215 C15 U1\nG4 P500\nM107\nG28\nG1 Z10\nM84\nM500\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300"));
        #endif

        BUZZ(200, 1108);
@@ -398,11 +432,7 @@
               || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_PID_BED_S)) != NULL)
               ) {
        SERIAL_ECHOLNPGM("Special Menu: PID Tune Ultrabase");
-        BUZZ(200, 1108);
-        BUZZ(200, 1661);
-        BUZZ(200, 1108);
-        BUZZ(600, 1661);
-        injectCommands(F("M303 E-1 S60 C6 U1\nM500\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300"));
+        queue.inject_P(PSTR("M303 E-1 S60 C6 U1\nM500\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300"));
        BUZZ(200, 1108);
        BUZZ(200, 1661);
        BUZZ(200, 1108);
@@ -431,7 +461,7 @@
               || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_PREHEAT_BED_S)) != NULL)
               ) {
        SERIAL_ECHOLNPGM("Special Menu: Preheat Ultrabase");
-        injectCommands(F("M140 S60"));
+        queue.inject_P(PSTR("M140 S60"));
      }

      #if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
@@ -444,49 +474,49 @@
                 || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_MESH_START_S)) != NULL)
                 ) {
          SERIAL_ECHOLNPGM("Special Menu: Start Mesh Leveling");
-          injectCommands(F("G28\nG29 S1"));
+          queue.inject_P(PSTR("G28\nG29 S1"));
        }
        else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_MESH_NEXT_L)) != NULL)
                 || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_MESH_NEXT_S)) != NULL)
                 ) {
          SERIAL_ECHOLNPGM("Special Menu: Next Mesh Point");
-          injectCommands(F("G29 S2"));
+          queue.inject_P(PSTR("G29 S2"));
        }
        else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_Z_UP_01_L)) != NULL)
                 || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_Z_UP_01_S)) != NULL)
                 ) {
          SERIAL_ECHOLNPGM("Special Menu: Z Up 0.1");
-          injectCommands(F("G91\nG1 Z+0.1\nG90"));
+          queue.inject_P(PSTR("G91\nG1 Z+0.1\nG90"));
        }
        else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_Z_DN_01_L)) != NULL)
                 || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_Z_DN_01_S)) != NULL)
                 ) {
          SERIAL_ECHOLNPGM("Special Menu: Z Down 0.1");
-          injectCommands(F("G91\nG1 Z-0.1\nG90"));
+          queue.inject_P(PSTR("G91\nG1 Z-0.1\nG90"));
        }
        else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_Z_UP_002_L)) != NULL)
                 || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_Z_UP_002_S)) != NULL)
                 ) {
          SERIAL_ECHOLNPGM("Special Menu: Z Up 0.02");
-          injectCommands(F("G91\nG1 Z+0.02\nG90"));
+          queue.inject_P(PSTR("G91\nG1 Z+0.02\nG90"));
        }
        else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_Z_DN_002_L)) != NULL)
                 || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_Z_DN_002_S)) != NULL)
                 ) {
          SERIAL_ECHOLNPGM("Special Menu: Z Down 0.02");
-          injectCommands(F("G91\nG1 Z-0.02\nG90"));
+          queue.inject_P(PSTR("G91\nG1 Z-0.02\nG90"));
        }
        else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_Z_UP_001_L)) != NULL)
                 || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_Z_UP_001_S)) != NULL)
                 ) {
          SERIAL_ECHOLNPGM("Special Menu: Z Up 0.01");
-          injectCommands(F("G91\nG1 Z+0.03\nG4 P250\nG1 Z-0.02\nG90"));
+          queue.inject_P(PSTR("G91\nG1 Z+0.03\nG4 P250\nG1 Z-0.02\nG90"));
        }
        else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_Z_DN_001_L)) != NULL)
                 || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_Z_DN_001_S)) != NULL)
                 ) {
          SERIAL_ECHOLNPGM("Special Menu: Z Down 0.01");
-          injectCommands(F("G91\nG1 Z+0.02\nG4 P250\nG1 Z-0.03\nG90"));
+          queue.inject_P(PSTR("G91\nG1 Z+0.02\nG4 P250\nG1 Z-0.03\nG90"));
        }
      #endif // if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)

@@ -495,7 +525,7 @@
                 || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTOUCH_S)) != NULL)
                 ) {
          SERIAL_ECHOLNPGM("Special Menu: BLTouch Leveling");
-          injectCommands(F("G28\nG29\nM500\nG90\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300\nG1 Z30 F4000\nG1 X0 F4000\nG91\nM84\nM420 S1"));
+          queue.inject_P(PSTR("G28\nG29\nM500\nG90\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300\nG1 Z30 F4000\nG1 X0 F4000\nG91\nM84\nM420 S1"));
          BUZZ(105, 1108);
          BUZZ(210, 1661);
        }
@@ -517,7 +547,7 @@
               || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_PAUSE_L)) != NULL)
               ) {
        SERIAL_ECHOLNPGM("Special Menu: Fil. Change Pause");
-        injectCommands(F("M600"));
+        PausePrint();
      }
      else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_RESUME_L)) != NULL)
               || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_RESUME_S)) != NULL)
@@ -529,7 +559,7 @@
               || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_DIS_FILSENS_S)) != NULL)
               ) {
        SERIAL_ECHOLNPGM("Special Menu: Disable Filament Sensor");
-        injectCommands(F("M412 H0 S0\nM500"));
+        queue.inject_P(PSTR("M412 H0 S0\nM500"));
        BUZZ(105, 1108);
        BUZZ(105, 1108);
        BUZZ(105, 1108);
@@ -538,7 +568,7 @@
               || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EN_FILSENS_S)) != NULL)
               ) {
        SERIAL_ECHOLNPGM("Special Menu: Enable Filament Sensor");
-        injectCommands(F("M412 H0 S1\nM500"));
+        queue.inject_P(PSTR("M412 H0 S1\nM500"));
        BUZZ(105, 1108);
        BUZZ(105, 1108);
      }
@@ -626,32 +656,32 @@
               ) {
        SERIAL_ECHOLNPGM("Special Menu: Enter Easy Level Menu");
        LevelMenu = true;
-        injectCommands(F("G28\nM420 S0\nG90\nG1 Z5\nG1 X15 Y15 F4000\nG1 Z0"));
+        queue.inject_P(PSTR("G28\nM420 S0\nG90\nG1 Z5\nG1 X15 Y15 F4000\nG1 Z0"));
      }
      else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_P1_L)) != NULL)
               || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_P1_S)) != NULL)
               ) {
        SERIAL_ECHOLNPGM("Special Menu: Easy Level POINT 1");
-        injectCommands(F("G90\nG1 Z5\nG1 X15 Y15 F4000\nG1 Z0"));
+        queue.inject_P(PSTR("G90\nG1 Z5\nG1 X15 Y15 F4000\nG1 Z0"));
      }
      else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_P2_L)) != NULL)
               || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_P2_S)) != NULL)
               ) {
        SERIAL_ECHOLNPGM("Special Menu: Easy Level POINT 2");
        #if ANY(KNUTWURST_MEGA, KNUTWURST_MEGA_S, KNUTWURST_MEGA_P)
-          injectCommands(F("G90\nG1 Z5\nG1 X205 Y15 F4000\nG1 Z0"));
+          queue.inject_P(PSTR("G90\nG1 Z5\nG1 X205 Y15 F4000\nG1 Z0"));
        #endif

        #if ENABLED(KNUTWURST_MEGA_X)
-          injectCommands(F("G90\nG1 Z5\nG1 X295 Y15 F4000\nG1 Z0"));
+          queue.inject_P(PSTR("G90\nG1 Z5\nG1 X295 Y15 F4000\nG1 Z0"));
        #endif

        #if ENABLED(KNUTWURST_CHIRON)
-          injectCommands(F("G90\nG1 Z5\nG1 X385 Y15 F4000\nG1 Z0"));
+          queue.inject_P(PSTR("G90\nG1 Z5\nG1 X385 Y15 F4000\nG1 Z0"));
        #endif

        #if ENABLED(KNUTWURST_4MAXP2)
-          injectCommands(F("G90\nG1 Z5\nG1 X255 Y15 F4000\nG1 Z0"));
+          queue.inject_P(PSTR("G90\nG1 Z5\nG1 X255 Y15 F4000\nG1 Z0"));
        #endif
      }
      else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_P3_L)) != NULL)
@@ -659,19 +689,19 @@
               ) {
        SERIAL_ECHOLNPGM("Special Menu: Easy Level POINT 3");
        #if ANY(KNUTWURST_MEGA, KNUTWURST_MEGA_S, KNUTWURST_MEGA_P)
-          injectCommands(F("G90\nG1 Z5\nG1 X205 Y200 F4000\nG1 Z0"));
+          queue.inject_P(PSTR("G90\nG1 Z5\nG1 X205 Y200 F4000\nG1 Z0"));
        #endif

        #if ENABLED(KNUTWURST_MEGA_X)
-          injectCommands(F("G90\nG1 Z5\nG1 X295 Y295 F4000\nG1 Z0"));
+          queue.inject_P(PSTR("G90\nG1 Z5\nG1 X295 Y295 F4000\nG1 Z0"));
        #endif

        #if ENABLED(KNUTWURST_CHIRON)
-          injectCommands(F("G90\nG1 Z5\nG1 X395 Y395 F4000\nG1 Z0"));
+          queue.inject_P(PSTR("G90\nG1 Z5\nG1 X395 Y395 F4000\nG1 Z0"));
        #endif

        #if ENABLED(KNUTWURST_4MAXP2)
-          injectCommands(F("G90\nG1 Z5\nG1 X255 Y195 F4000\nG1 Z0"));
+          queue.inject_P(PSTR("G90\nG1 Z5\nG1 X255 Y195 F4000\nG1 Z0"));
        #endif
      }
      else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_P4_L)) != NULL)
@@ -679,19 +709,19 @@
               ) {
        SERIAL_ECHOLNPGM("Special Menu: Easy Level POINT 4");
        #if ANY(KNUTWURST_MEGA, KNUTWURST_MEGA_S, KNUTWURST_MEGA_P)
-          injectCommands(F("G90\nG1 Z5\nG1 X15 Y200 F4000\nG1 Z0"));
+          queue.inject_P(PSTR("G90\nG1 Z5\nG1 X15 Y200 F4000\nG1 Z0"));
        #endif

        #if ENABLED(KNUTWURST_MEGA_X)
-          injectCommands(F("G90\nG1 Z5\nG1 X15 Y295 F4000\nG1 Z0"));
+          queue.inject_P(PSTR("G90\nG1 Z5\nG1 X15 Y295 F4000\nG1 Z0"));
        #endif

        #if ENABLED(KNUTWURST_CHIRON)
-          injectCommands(F("G90\nG1 Z5\nG1 X15 Y395 F4000\nG1 Z0"));
+          queue.inject_P(PSTR("G90\nG1 Z5\nG1 X15 Y395 F4000\nG1 Z0"));
        #endif

        #if ENABLED(KNUTWURST_4MAXP2)
-          injectCommands(F("G90\nG1 Z5\nG1 X15 Y195 F4000\nG1 Z0"));
+          queue.inject_P(PSTR("G90\nG1 Z5\nG1 X15 Y195 F4000\nG1 Z0"));
        #endif
      }
      else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_EXIT_L)) != NULL)
@@ -699,7 +729,7 @@
               ) {
        SERIAL_ECHOLNPGM("Special Menu: Exit Easy Level Menu");
        LevelMenu = false;
-        injectCommands(F("G90\nG1 Z10\nG1 X15 Y15 F4000\nM420 S1"));
+        queue.inject_P(PSTR("G90\nG1 Z10\nG1 X15 Y15 F4000\nM420 S1"));
      }
    #endif // if ENABLED(KNUTWURST_SPECIAL_MENU)
  }
@@ -766,7 +796,7 @@
        zOffsetBuffer = SM_BLTZ_DISP_L;

        #ifdef ANYCUBIC_TFT_DEBUG
-          SERIAL_ECHOPGM("TFT Serial Debug: Current probe.offset.z: ", float(probe.offset.z));
+          SERIAL_ECHOPGM("DEBUG: Current probe.offset.z: ", float(probe.offset.z));
          SERIAL_EOL();
        #endif

@@ -1050,8 +1080,7 @@
  }

  void AnycubicTouchscreenClass::CheckHeaterError() {
-    if ( (getTargetTemp_celsius((extruder_t)E0) < 5)
-      || (getTargetTemp_celsius((extruder_t)E0) > 300)) {
+    if ((thermalManager.degHotend(0) < 5) || (thermalManager.degHotend(0) > 300)) {
      if (HeaterCheckCount > 600000) {
        HeaterCheckCount = 0;
        SENDLINE_DBG_PGM("J10", "TFT Serial Debug: Hotend temperature abnormal... J10");
@@ -1093,7 +1122,7 @@
 }

  void AnycubicTouchscreenClass::UserConfirmRequired(const char * const msg) {
-    #if ENABLED(ANYCUBIC_TFT_DEBUG)
+    #if ENABLED(ANYCUBIC_LCD_DEBUG)
      SERIAL_ECHOLNPGM("TFT Serial Debug: OnUserConfirmRequired triggered... ", msg);
    #endif

@@ -1124,6 +1153,10 @@
      else if (strcmp_P(msg, PSTR("Filament Purging...")) == 0) {
        mediaPrintingState = AMPRINTSTATE_PAUSED;
        mediaPauseState    = AMPAUSESTATE_FILAMENT_PURGING;
+        
+        // TODO: JBA I don't think J05 just disables the continue button, i think it injects a rogue M25. So taking this out
+        // disable continue button
+        // SENDLINE_DBG_PGM("J05", "TFT Serial Debug: UserConfirm SD Filament Purging... J05"); // J05 printing pause

        // enable continue button
        SENDLINE_DBG_PGM("J18", "TFT Serial Debug: UserConfirm Filament is purging... J18");
@@ -1202,23 +1235,30 @@
            TFTstrchr_pointer = strchr(TFTcmdbuffer[TFTbufindw], 'A');
            switch ((int)((strtod(&TFTcmdbuffer[TFTbufindw][TFTstrchr_pointer - TFTcmdbuffer[TFTbufindw] + 1], NULL)))) {
              case 0: // A0 GET HOTEND TEMP
-                SEND_PGM_VAL("A0V ", int(getActualTemp_celsius(E0) + 0.5));
+                SEND_PGM_VAL("A0V ", int(thermalManager.degHotend(0) + 0.5));
                break;

              case 1: // A1  GET HOTEND TARGET TEMP
-                SEND_PGM_VAL("A1V ", int(getTargetTemp_celsius(E0) + 0.5));
+                SEND_PGM_VAL("A1V ", int(thermalManager.degTargetHotend(0) + 0.5));
                break;

              case 2: // A2 GET HOTBED TEMP
-                SEND_PGM_VAL("A2V ", int(getActualTemp_celsius(BED) + 0.5));
+                SEND_PGM_VAL("A2V ", int(thermalManager.degBed() + 0.5));
                break;

              case 3: // A3 GET HOTBED TARGET TEMP
-                SEND_PGM_VAL("A3V ", int(getTargetTemp_celsius(BED) + 0.5));
+                SEND_PGM_VAL("A3V ", int(thermalManager.degTargetBed() + 0.5));
                break;

              case 4: // A4 GET FAN SPEED
-                SEND_PGM_VAL("A4V ", int(getActualFan_percent(FAN0)));
+              {
+                unsigned int temp;
+
+                temp = ((thermalManager.fan_speed[0] * 100) / 255);
+                temp = constrain(temp, 0, 100);
+
+                SEND_PGM_VAL("A4V ", temp);
+              }
              break;
              case 5: // A5 GET CURRENT COORDINATE
                SEND_PGM("A5V X: "); LCD_SERIAL.print(current_position[X_AXIS]);
@@ -1229,16 +1269,16 @@

              case 6: // A6 GET SD CARD PRINTING STATUS
                #ifdef SDSUPPORT
-                  if (isPrintingFromMedia())
-                  {
+                  if (card.isPrinting()) {
                    SEND_PGM("A6V ");
-                    if (isMediaInserted())
-                      SENDLINE(ui8tostr3rj(getProgress_percent()));
+                    if (card.isMounted())
+                      SENDLINE(itostr3(card.percentDone()));
                    else
-                      SENDLINE_DBG_PGM("J02", "TFT Serial Debug: No SD Card mounted to return printing status... J02");
+                      SENDLINE_DBG_PGM("J02", "TFT Serial Debug: SD Card initialized... J02");
                  }
-                  else
+                  else {
                    SENDLINE_PGM("A6V ---");
+                  }
                #endif
                break;
              case 7: // A7 GET PRINTING TIME
@@ -1301,29 +1341,27 @@

              case 13: // A13 SELECTION FILE
                #if ENABLED(SDSUPPORT)
-                  {
+                  if (isMediaInserted()) {
                    starpos = (strchr(TFTstrchr_pointer + 4, '*'));
                    if (TFTstrchr_pointer[4] == '/') {
                      strcpy(currentTouchscreenSelection, TFTstrchr_pointer + 5);
-                      #ifdef ANYCUBIC_TFT_DEBUG
-                        SERIAL_ECHOPGM("TFT Serial Debug: currentTouchscreenSelection: ", currentTouchscreenSelection);
-                        SERIAL_EOL();
-                      #endif
+                      currentFileOrDirectory[0] = 0;
+                      SENDLINE_DBG_PGM("J21", "TFT Serial Debug: Clear file selection... J21 "); // J21 Not File Selected
+                      SENDLINE_PGM("");
                    }
                    else if (TFTstrchr_pointer[4] == '<') {
                      strcpy(currentTouchscreenSelection, TFTstrchr_pointer + 4);
-                      #ifdef ANYCUBIC_TFT_DEBUG
-                        SERIAL_ECHOPGM("J21", "TFT Serial Debug: Clear file selection... J21 ");
-                        SERIAL_EOL();
-                      #endif
+                      SpecialMenu = true;
+                      currentFileOrDirectory[0] = 0;
+                      SENDLINE_DBG_PGM("J21", "TFT Serial Debug: Clear file selection... J21 "); // J21 Not File Selected
+                      SENDLINE_PGM("");
                    }
                    else {
-                      if (SpecialMenu == false)
-                        currentTouchscreenSelection[0] = 0;
+                      currentTouchscreenSelection[0] = 0;

-                      if (starpos != NULL) *(starpos - 1) = '\0';
-                        strcpy(currentFileOrDirectory, TFTstrchr_pointer + 4);
-                      
+                      if (starpos) *(starpos - 1) = '\0';
+
+                      strcpy(currentFileOrDirectory, TFTstrchr_pointer + 4);
                      SENDLINE_DBG_PGM_VAL("J20", "TFT Serial Debug: File Selected... J20 ", currentFileOrDirectory); // J20 File Selected
                    }
                  }
@@ -1354,14 +1392,14 @@
                unsigned int tempvalue;
                if (CodeSeen('S')) {
                  tempvalue = constrain(CodeValue(), 0, 260);
-                  if (getTargetTemp_celsius((extruder_t)E0) <= 260)
-                    setTargetTemp_celsius(tempvalue, (extruder_t)E0);; // do not set Temp from TFT if it is set via gcode
+                  if (thermalManager.degTargetHotend(0) <= 260)
+                    thermalManager.setTargetHotend(tempvalue, 0); // do not set Temp from TFT if it is set via gcode
                }
-                else if ((CodeSeen('C')) && (!isPrinting())) {
-                  if ((getAxisPosition_mm(Z) < 10))
-                    injectCommands(F("G1 Z10")); // RASE Z AXIS
+                else if ((CodeSeen('C')) && (!planner.movesplanned())) {
+                  if ((current_position[Z_AXIS] < 10))
+                    queue.inject_P(PSTR("G1 Z10")); // RASE Z AXIS
                  tempvalue = constrain(CodeValue(), 0, 260);
-                  setTargetTemp_celsius(tempvalue, (extruder_t)E0);
+                  thermalManager.setTargetHotend(tempvalue, 0);
                }
              }
              break;
@@ -1370,33 +1408,36 @@
              {
                unsigned int tempbed;
                if (CodeSeen('S')) {
-                  tempbed = constrain(CodeValue(), 0, 120);
-                  if (getTargetTemp_celsius((heater_t)BED) <= 100)
-                    setTargetTemp_celsius(tempbed, (heater_t)BED); // do not set Temp from TFT if it is set via gcode
+                  tempbed = constrain(CodeValue(), 0, 115);
+                  thermalManager.setTargetBed(tempbed);
+                  if (thermalManager.degTargetBed() <= 100)
+                    thermalManager.setTargetBed(tempbed); // do not set Temp from TFT if it is set via gcode
                }
              }
              break;

              case 18: // A18 set fan speed
-                float fanPercent;
+                unsigned int temp;
                if (CodeSeen('S')) {
-                  fanPercent = CodeValue();
-                  fanPercent = constrain(fanPercent, 0, 100);
-                  setTargetFan_percent(fanPercent, FAN0);
+                  temp = (CodeValue() * 255 / 100);
+                  temp = constrain(temp, 0, 255);
+                  thermalManager.set_fan_speed(0, temp);
                }
                else {
-                  fanPercent = 100;
-                  setTargetFan_percent(fanPercent, FAN0);
+                  thermalManager.set_fan_speed(0, 255);
                }
                SENDLINE_PGM("");
                break;

              case 19: // A19 stop stepper drivers
-                if (!isPrinting()) {
+                if ((!planner.movesplanned())
+                    #ifdef SDSUPPORT
+                      && (!card.isPrinting())
+                    #endif
+                    ) {
                  quickstop_stepper();
                  stepper.disable_all_steppers();
                }
-
                SENDLINE_PGM("");
                break;

@@ -1512,51 +1553,55 @@
                break;

              case 26: // A26 refresh SD
-              {
                #ifdef SDSUPPORT
                  #ifdef ANYCUBIC_TFT_DEBUG
-                    SERIAL_ECHOPGM("TFT Serial Debug: currentTouchscreenSelection: ", currentTouchscreenSelection);
+                    SERIAL_ECHOPGM(" TFT Serial Debug: currentTouchscreenSelection: ", currentTouchscreenSelection);
                    SERIAL_EOL();
                  #endif
-
-                  if (strlen(currentTouchscreenSelection) > 0) {
-                    FileList currentFileList;
-                    if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_DIR_UP_S)) != NULL)
-                        ||  (strcasestr_P(currentTouchscreenSelection, PSTR(SM_DIR_UP_L)) != NULL)
-                        ) {
-                      #ifdef ANYCUBIC_TFT_DEBUG
-                        SERIAL_ECHOLNPGM("TFT Serial Debug: Directory UP (cd ..)");
-                      #endif
-                      currentFileList.upDir();
-                    }
-                    else {
-                      if (currentTouchscreenSelection[0] == '<') {
+                   if (isMediaInserted()) {
+                    if (strlen(currentTouchscreenSelection) > 0) {
+                      FileList currentFileList;
+                      if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_DIR_UP_S)) != NULL)
+                          ||  (strcasestr_P(currentTouchscreenSelection, PSTR(SM_DIR_UP_L)) != NULL)
+                          ) {
                        #ifdef ANYCUBIC_TFT_DEBUG
-                          SERIAL_ECHOLNPGM("TFT Serial Debug: Enter Special Menu");
+                          SERIAL_ECHOLNPGM("TFT Serial Debug: Directory UP (cd ..)");
                        #endif
-                        HandleSpecialMenu();
+                        currentFileList.upDir();
                      }
                      else {
-                        #ifdef ANYCUBIC_TFT_DEBUG
-                          SERIAL_ECHOLNPGM("TFT Serial Debug: Not a menu. Must be a directory!");
-                        #endif
+                        if (currentTouchscreenSelection[0] == '<') {
+                          #ifdef ANYCUBIC_TFT_DEBUG
+                            SERIAL_ECHOLNPGM("TFT Serial Debug: Enter Special Menu");
+                          #endif
+                          HandleSpecialMenu();
+                        }
+                        else {
+                          #ifdef ANYCUBIC_TFT_DEBUG
+                            SERIAL_ECHOLNPGM("TFT Serial Debug: Not a menu. Must be a directory!");
+                          #endif

-                        #if ENABLED(KNUTWURST_DGUS2_TFT)
-                          strcpy(currentFileOrDirectory, currentTouchscreenSelection);
-                          int currentFileLen = strlen(currentFileOrDirectory);
-                          currentFileOrDirectory[currentFileLen - 4] = '\0';
-                          card.cd(currentFileOrDirectory);
-                        #else
-                          currentFileList.changeDir(currentTouchscreenSelection);
-                        #endif
+                          #if ENABLED(KNUTWURST_DGUS2_TFT)
+                            strcpy(currentFileOrDirectory, currentTouchscreenSelection);
+                            int currentFileLen = strlen(currentFileOrDirectory);
+                            currentFileOrDirectory[currentFileLen - 4] = '\0';
+                            card.cd(currentFileOrDirectory);
+                          #else
+                            currentFileList.changeDir(currentTouchscreenSelection);
+                          #endif
+                        }
                      }
                    }
                  }
                  if (SpecialMenu == false)
                    currentTouchscreenSelection[0] = 0;
-                }
+
                #endif // ifdef SDSUPPORT
                break;
+                #ifdef SERVO_ENDSTOPS
+                    case 27: // A27 servos angles  adjust
+                      break;
+                #endif

              case 28: // A28 filament test
              {
@@ -1588,7 +1633,7 @@

                      if (!isPrinting()) {
                        if (!all_axes_trusted()) {
-                          injectCommands(F("G28\n"));
+                          queue.inject_P(PSTR("G28\n"));
                          /*
                             set_axis_is_at_home(X_AXIS);
                             sync_plan_position();
@@ -1732,12 +1777,12 @@
                    case 42:
                      if (CaseLight == true) {
                        SERIAL_ECHOLNPGM("Case Light OFF");
-                        injectCommands(F("M355 S1 P0"));
+                        queue.inject_P(PSTR("M355 S1 P0"));
                        CaseLight = false;
                      }
                      else {
                        SERIAL_ECHOLNPGM("Case Light ON");
-                        injectCommands(F("M355 S1 P255"));
+                        queue.inject_P(PSTR("M355 S1 P255"));
                        CaseLight = true;
                      }
                      // break; <-- TODO: do we need it?
@@ -1948,7 +1993,7 @@
    if (ELAPSED(ms, nextStopCheck)) {
      nextStopCheck = ms + 1000UL;
      if (mediaPrintingState == AMPRINTSTATE_STOP_REQUESTED) {
-        #if ENABLED(ANYCUBIC_TFT_DEBUG)
+        #if ENABLED(ANYCUBIC_LCD_DEBUG)
          SERIAL_ECHOLNPGM("TFT Serial Debug: Finished stopping print, releasing motors ...");
        #endif
        mediaPrintingState = AMPRINTSTATE_NOT_PRINTING;
--- 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/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