Merge branch 'knutwurst:master' into klicky

Use toolhead/nozzle paring position when aborting the SD print, instead of G28 homing.
Fix print time display.
2023-05-25 01:34:17 +02:00 · 2023-05-24 23:06:13 +02:00 · 2023-05-24 22:38:14 +02:00 · 2023-05-24 22:31:27 +02:00 · 2023-05-24 19:36:20 +02:00 · 2023-05-24 19:27:45 +02:00
9 changed files with 74 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
@@ -2377,15 +2386,15 @@
 * RAMPS-based boards use SERVO3_PIN for the first runout sensor.
 * For other boards you may need to define FIL_RUNOUT_PIN, FIL_RUNOUT2_PIN, etc.
 */
-// #define FILAMENT_RUNOUT_SENSOR
+#define FILAMENT_RUNOUT_SENSOR
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
  #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500.
  #define NUM_RUNOUT_SENSORS   1          // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.

-  #define FIL_RUNOUT_STATE     LOW        // Pin state indicating that filament is NOT present.
-  #define FIL_RUNOUT_PULLUP               // Use internal pullup for filament runout pins.
-  // #define FIL_RUNOUT_PULLDOWN           // Use internal pulldown for filament runout pins.
-  // #define WATCH_ALL_RUNOUT_SENSORS      // Execute runout script on any triggering sensor, not only for the active extruder.
+  #define FIL_RUNOUT_STATE     HIGH        // Pin state indicating that filament is NOT present.
+  // #define FIL_RUNOUT_PULLUP           // Use internal pullup for filament runout pins.
+  // #define FIL_RUNOUT_PULLDOWN         // Use internal pulldown for filament runout pins.
+  // #define WATCH_ALL_RUNOUT_SENSORS    // Execute runout script on any triggering sensor, not only for the active extruder.
  // This is automatically enabled for MIXING_EXTRUDERs.

  // Override individually if the runout sensors vary
@@ -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
@@ -1551,7 +1551,7 @@

  // #define MEDIA_MENU_AT_TOP               // Force the media menu to be listed on the top of the main menu

-  #define EVENT_GCODE_SD_ABORT "G28XY"      // G-code to run on SD Abort Print (e.g., "G28XY" or "G27")
+  #define EVENT_GCODE_SD_ABORT "G27"      // G-code to run on SD Abort Print (e.g., "G28XY" or "G27")

  #if ENABLED(PRINTER_EVENT_LEDS)
    #define PE_LEDS_COMPLETED_TIME  (30 * 60) // (seconds) Time to keep the LED "done" color before restoring normal illumination
@@ -4012,7 +4012,7 @@
  #define HOST_PAUSE_M76                  // Tell the host to pause in response to M76
  #define HOST_PROMPT_SUPPORT             // Initiate host prompts to get user feedback
  #if ENABLED(HOST_PROMPT_SUPPORT)
-    // #define HOST_STATUS_NOTIFICATIONS   // Send some status messages to the host as notifications
+    #define HOST_STATUS_NOTIFICATIONS   // Send some status messages to the host as notifications
  #endif
  // #define HOST_START_MENU_ITEM          // Add a menu item that tells the host to start
  // #define HOST_SHUTDOWN_MENU_ITEM       // Add a menu item that tells the host to shut down
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -252,12 +252,6 @@
  #include "tests/marlin_tests.h"
 #endif

-// PATCH START: Knutwurst
-#if ENABLED(ANYCUBIC_TOUCHSCREEN)
-  #include "lcd/extui/knutwurst/anycubic_touchscreen.h"
-#endif
-// PATCH END: Knutwurst
-
 PGMSTR(M112_KILL_STR, "M112 Shutdown");

 MarlinState marlin_state = MF_INITIALIZING;
@@ -396,88 +390,6 @@ void startOrResumeJob() {

 #endif // SDSUPPORT

-// PATCH START: Knutwurst
-#ifdef ENDSTOP_BEEP
-void EndstopBeep() {
-    static char last_status = ((READ(X_MIN_PIN) << 2) | (READ(Y_MIN_PIN) << 1) | READ(X_MAX_PIN));
-    static unsigned char now_status;
-
-    now_status = ((READ(X_MIN_PIN) << 2) | (READ(Y_MIN_PIN) << 1) | READ(X_MAX_PIN)) & 0xff;
-
-    if (now_status<last_status) {
-      static millis_t endstop_ms = millis() + 300UL;
-      if (ELAPSED(millis(), endstop_ms)) {
-        buzzer.tone(60, 2000);
-      }
-      last_status = now_status;
-    } else if (now_status != last_status) {
-      last_status=now_status;
-    }
-  }
-#endif
-
-#if HAS_FILAMENT_SENSOR
-  void event_filament_runout() {
-    #if ENABLED(ADVANCED_PAUSE_FEATURE)
-      if (did_pause_print) return;  // Action already in progress. Purge triggered repeated runout.
-    #endif
-
-    #if ENABLED(EXTENSIBLE_UI)
-      ExtUI::onFilamentRunout(ExtUI::getActiveTool());
-    #endif
-
-    #if EITHER(HOST_PROMPT_SUPPORT, HOST_ACTION_COMMANDS)
-      const char tool = '0'
-      #if NUM_RUNOUT_SENSORS > 1
-        + active_extruder
-      #endif
-      ;
-    #endif
-
-    //action:out_of_filament
-    #if ENABLED(HOST_PROMPT_SUPPORT)
-      host_prompt_reason = PROMPT_FILAMENT_RUNOUT;
-      host_action_prompt_end();
-      host_action_prompt_begin(PSTR("FilamentRunout T"), false);
-      SERIAL_CHAR(tool);
-      SERIAL_EOL();
-      host_action_prompt_show();
-    #endif
-
-    const bool run_runout_script = !runout.host_handling;
-
-    #if ENABLED(HOST_ACTION_COMMANDS)
-      if (run_runout_script
-        && ( strstr(FILAMENT_RUNOUT_SCRIPT, "M600")
-          || strstr(FILAMENT_RUNOUT_SCRIPT, "M125")
-          #if ENABLED(ADVANCED_PAUSE_FEATURE)
-            || strstr(FILAMENT_RUNOUT_SCRIPT, "M25")
-          #endif
-        )
-      ) {
-        host_action_paused(false);
-      } else {
-        // Legacy Repetier command for use until newer version supports standard dialog
-        // To be removed later when pause command also triggers dialog
-        #ifdef ACTION_ON_FILAMENT_RUNOUT
-          host_action(PSTR(ACTION_ON_FILAMENT_RUNOUT " T"), false);
-          SERIAL_CHAR(tool);
-          SERIAL_EOL();
-        #endif
-
-        host_action_pause(false);
-      }
-      SERIAL_ECHOPGM(" " ACTION_REASON_ON_FILAMENT_RUNOUT " ");
-      SERIAL_CHAR(tool);
-      SERIAL_EOL();
-    #endif // HOST_ACTION_COMMANDS
-
-    if (run_runout_script) {
-      queue.inject_P(PSTR(FILAMENT_RUNOUT_SCRIPT));
-    }
-  }
-#endif // HAS_FILAMENT_SENSOR
-// PATCH END: Knutwurst

 /**
 * Minimal management of Marlin's core activities:
@@ -493,12 +405,6 @@ void EndstopBeep() {
 *  - Pulse FET_SAFETY_PIN if it exists
 */
 inline void manage_inactivity(const bool no_stepper_sleep=false) {
-  // PATCH START: Knutwurst
-  #if ENABLED(ANYCUBIC_TOUCHSCREEN) && ENABLED(ANYCUBIC_FILAMENT_RUNOUT_SENSOR)
-    AnycubicTouchscreen.FilamentRunout();
-  #endif
-  // PATCH END: Knutwurst
-
  queue.get_available_commands();

  const millis_t ms = millis();
@@ -889,12 +795,6 @@ void idle(bool no_stepper_sleep/*=false*/) {
  // Max7219 heartbeat, animation, etc
  TERN_(MAX7219_DEBUG, max7219.idle_tasks());

-  // PATCH START: Knutwurst
-  #ifdef ENDSTOP_BEEP
-    EndstopBeep();
-  #endif
-  // PATCH END: Knutwurst
-
  // Return if setup() isn't completed
  if (marlin_state == MF_INITIALIZING) goto IDLE_DONE;

--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -41,7 +41,7 @@
 * here we define this default string as the date where the latest release
 * version was tagged.
 */
- #define CUSTOM_BUILD_VERSION "1.5.0-b4"
+ #define CUSTOM_BUILD_VERSION "1.5.0-b5"

 #ifndef STRING_DISTRIBUTION_DATE
  #define STRING_DISTRIBUTION_DATE "2023-05-24"
--- a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp
+++ b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp
@@ -34,7 +34,7 @@
 #include "../../../module/settings.h"
 #include "../../../module/stepper.h"

-#define ANYCUBIC_TFT_DEBUG
+//#define ANYCUBIC_TFT_DEBUG

 #ifdef ANYCUBIC_TOUCHSCREEN
  #include "./anycubic_touchscreen.h"
@@ -214,16 +214,13 @@
    LCD_SERIAL.begin(LCD_BAUDRATE);

    #if DISABLED(KNUTWURST_4MAXP2)
-      SENDLINE_PGM("");
-      SENDLINE_PGM("J17"); // J17 Main board reset
-      delay(10);
+      SENDLINE_DBG_PGM("J17", "TFT Serial Debug: Main board reset... J17"); // J17 Main board reset
+      delay_ms(10);
    #endif

    mediaPrintingState = AMPRINTSTATE_NOT_PRINTING;
    mediaPauseState = AMPAUSESTATE_NOT_PAUSED;

-    SENDLINE_DBG_PGM("J12", "TFT Serial Debug: Ready... J12"); // J12 Ready
-
    currentTouchscreenSelection[0] = 0;
    currentFileOrDirectory[0]      = '\0';
    SpecialMenu                    = false;
@@ -239,6 +236,7 @@
    #if BOTH(SDSUPPORT, HAS_SD_DETECT)
      SET_INPUT_PULLUP(SD_DETECT_PIN);
    #endif
+    
    #if ENABLED(FILAMENT_RUNOUT_SENSOR)
      SET_INPUT_PULLUP(FIL_RUNOUT1_PIN);
    #endif
@@ -251,6 +249,10 @@
    setup_OutageTestPin();
    setup_PowerOffPin();

+    SENDLINE_DBG_PGM("J12", "TFT Serial Debug: Ready... J12"); // J12 Ready
+
+    DoFilamentRunoutCheck();
+
    #ifdef STARTUP_CHIME
      BUZZ(100, 554);
      BUZZ(100, 740);
@@ -545,7 +547,7 @@
               || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_PAUSE_L)) != NULL)
               ) {
        SERIAL_ECHOLNPGM("Special Menu: Fil. Change Pause");
-        ResumePrint();
+        PausePrint();
      }
      else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_RESUME_L)) != NULL)
               || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_RESUME_S)) != NULL)
@@ -557,7 +559,7 @@
               || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_DIS_FILSENS_S)) != NULL)
               ) {
        SERIAL_ECHOLNPGM("Special Menu: Disable Filament Sensor");
-
+        queue.inject_P(PSTR("M412 H0 S0\nM500"));
        BUZZ(105, 1108);
        BUZZ(105, 1108);
        BUZZ(105, 1108);
@@ -566,7 +568,7 @@
               || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EN_FILSENS_S)) != NULL)
               ) {
        SERIAL_ECHOLNPGM("Special Menu: Enable Filament Sensor");
-
+        queue.inject_P(PSTR("M412 H0 S1\nM500"));
        BUZZ(105, 1108);
        BUZZ(105, 1108);
      }
@@ -1281,13 +1283,14 @@
                break;
              case 7: // A7 GET PRINTING TIME
              {
+                const uint32_t elapsedSeconds = getProgress_seconds_elapsed();
                SEND_PGM("A7V ");
-                if (starttime != 0) { // print time
-                  uint16_t time = millis() / 60000 - starttime / 60000;
-                  SEND(itostr2(time / 60));
+                if (elapsedSeconds != 0) {  // print time
+                  const uint32_t elapsedMinutes = elapsedSeconds / 60;
+                  SEND(ui8tostr2(elapsedMinutes / 60));
                  SEND_PGM(" H ");
-                  SEND(itostr2(time % 60));
-                  SEND_PGM(" M");
+                  SEND(ui8tostr2(elapsedMinutes % 60));
+                  SENDLINE_PGM(" M");
                }
                else
                  SENDLINE_PGM(" 999:999");
--- 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
@@ -288,7 +288,7 @@

 // RAMPS 1.4 DIO 4 on the servos connector
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN                       4
+  #define FIL_RUNOUT_PIN                      19
 #endif

 #ifndef PS_ON_PIN
--- 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
Knutwurst	570c419165	Use toolhead/nozzle paring position when aborting the SD print, instead of G28 homing.	2023-05-24 23:06:13 +02:00
Knutwurst	05a706dfb6	Fix print time display.	2023-05-24 22:38:14 +02:00
Suat Özgür	78eab4e511	klicky probe initial commit	2023-05-24 22:31:27 +02:00
Knutwurst	7cc485ae3e	Fix host action commands conflicting with integrated filament sensor	2023-05-24 19:36:20 +02:00
Knutwurst	5fbd3337b6	Disable Touchscreen debugging messages	2023-05-24 19:27:45 +02:00
Knutwurst	62fcc2ff35	Fix filament sensor, but disable host action commands.	2023-05-24 19:22:58 +02:00