Update Version to 1.1.5 for next release

- Bump Version to 1.1.4 Beta
- Fix Special Menu Handling when no SD Card is present
- Add Pictures for new WIKI Page
- Set Classic jerk to 0.2 since this is needed for Mesh Leveling

Marlin/Configuration.h

@@ -43,18 +43,24 @@
 //#define ANYCUBIC_TFT_DEBUG
 //#define POWER_OUTAGE_TEST
 
-/*****************************************************************************************
+/*******************************************************************************************
- *                                                                                       *
+ **                                                                                       **
- *                                                                                       *
+ **                                                                                       **
- *   WARNING:                                                                            *
+ **   WARNING:                                                                            **
- *   THE FOLLOWING SETTINGS ARE NORMALLY SET BY PLATFORMIO!                              *
+ **   THE FOLLOWING SETTINGS ARE NORMALLY SET BY PLATFORMIO!                              **
- *                                                                                       *
+ **                                                                                       **
- *   IF YOU CHANGE THEM WITHIN THE SOURCECODE, DO NOT COMMIT                             *
+ **   IF YOU CHANGE THEM WITHIN THE SOURCECODE, DO NOT COMMIT                             **
- *   TO MASTER BRANCH OR BUILD WITH PLATFORMIO ENVIRONMENT!                              *
+ **   TO MASTER BRANCH OR BUILD WITH PLATFORMIO ENVIRONMENT!                              **
- *   OTHERWISE SOME SETTINGS MIGHT BE OVERWRITTEN AND YOU END                            *
+ **   OTHERWISE SOME SETTINGS MIGHT BE OVERWRITTEN AND YOU END                            **
- *   UP WITH A NON FUNCTIONING FIRMWARE!                                                 *
+ **   UP WITH A NON FUNCTIONING FIRMWARE!                                                 **
- *                                                                                       *
+ **                                                                                       **
- * ***************************************************************************************/
+ **   If you want to select a specific configuration for your                             **
+ **   printer, just open the PlatformIO tab on the left, select                           **
+ **   PROJECT TASKS and then "env:i3_MEGA*" (your desired config)                         **
+ **   From there you can build and upload your code.                                      **
+ **                                                                                       **
+ **                                                                                       **
+ *******************************************************************************************/
  
 
 /*
@@ -64,6 +70,9 @@
  * MEGA is the normal i3 Version without spool holder and the cassic extruder
  * MEGA_S is the S version with Titan clone extruder
  * MEGA_X is the big version with 310x310mm Bed
+ * 
+ * PLEASE READ THE WARNING ABOVE!
+ * 
  */
 //#define KNUTWURST_MEGA
 //#define KNUTWURST_MEGA_S
@@ -74,6 +83,9 @@
  * you have the "new" Mega S with the blue/yellow
  * Touchscreen display, you need to enable the
  * DGUS2 switch to get the special menu to work
+ * 
+ * PLEASE READ THE WARNING ABOVE!
+ * 
  */
 //#define KNUTWURST_DGUS2_TFT
 
@@ -81,6 +93,8 @@
  * Enable Support for Trinamic Stepper drivers.
  * This also inverts the X,Y,Z and Extruder motor
  * outputs/directions.
+ * 
+ * PLEASE READ THE WARNING ABOVE!
  */
 //#define KNUTWURST_TMC
 
@@ -90,6 +104,9 @@
  * special menu. It also removes all manual 
  * leveling features because they are not 
  * neccessary at all.
+ * 
+ * PLEASE READ THE WARNING ABOVE!
+ * 
  */
 //#define KNUTWURST_BLTOUCH // see <https://github.com/DerDominik/Marlin-AnycubicI3Mega-BLTouch/wiki/Aufbauplan_BLTouch>
 
@@ -98,22 +115,31 @@
  * It enabled more console output and should be
  * disabled in production. It can cause the
  * printer to stutter.
+ * 
+ * PLEASE READ THE WARNING ABOVE!
+ * 
  */
 //#define KNUTWURST_DEBUG
 
 
-/*****************************************************************************************
+/*******************************************************************************************
- *                                                                                       *
+ **                                                                                       **
- *                                                                                       *
+ **                                                                                       **
- *   WARNING:                                                                            *
+ **   WARNING:                                                                            **
- *   THE SETTINGS ABOVE ARE NORMALLY SET BY PLATFORMIO!                                  *
+ **   THE SETTINGS ABOVE ARE NORMALLY SET BY PLATFORMIO!                                  **
- *                                                                                       *
+ **                                                                                       **
- *   IF YOU CHANGE THEM WITHIN THE SOURCECODE, DO NOT COMMIT                             *
+ **   IF YOU CHANGE THEM WITHIN THE SOURCECODE, DO NOT COMMIT                             **
- *   TO MASTER BRANCH OR BUILD WITH PLATFORMIO ENVIRONMENT!                              *
+ **   TO MASTER BRANCH OR BUILD WITH PLATFORMIO ENVIRONMENT!                              **
- *   OTHERWISE SOME SETTINGS MIGHT BE OVERWRITTEN AND YOU END                            *
+ **   OTHERWISE SOME SETTINGS MIGHT BE OVERWRITTEN AND YOU END                            **
- *   UP WITH A NON FUNCTIONING FIRMWARE!                                                 *
+ **   UP WITH A NON FUNCTIONING FIRMWARE!                                                 **
- *                                                                                       *
+ **                                                                                       **
- * ***************************************************************************************/
+ **   If you want to select a specific configuration for your                             **
+ **   printer, just open the PlatformIO tab on the left, select                           **
+ **   PROJECT TASKS and then "env:i3_MEGA*" (your desired config)                         **
+ **   From there you can build and upload your code.                                      **
+ **                                                                                       **
+ **                                                                                       **
+ *******************************************************************************************/
 
 
 /*
@@ -889,15 +915,15 @@
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
 #if ENABLED(KNUTWURST_MEGA)
-    #define DEFAULT_MAX_FEEDRATE          { 500, 500, 6, 60 }
+    #define DEFAULT_MAX_FEEDRATE          { 500, 500, 8, 60 }
 #endif
 
 #if ENABLED(KNUTWURST_MEGA_S)
-    #define DEFAULT_MAX_FEEDRATE          { 500, 500, 6, 30 }
+    #define DEFAULT_MAX_FEEDRATE          { 500, 500, 8, 30 }
 #endif
 
 #if ENABLED(KNUTWURST_MEGA_X)
-    #define DEFAULT_MAX_FEEDRATE            { 120, 120, 20, 80 }
+    #define DEFAULT_MAX_FEEDRATE            { 120, 120, 18, 80 } // thanks to Simon Geis
 #endif
 
 
@@ -913,7 +939,16 @@
  * Override with M201
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
-#define DEFAULT_MAX_ACCELERATION      { 3000, 2000,  60, 10000 }
+#if EITHER(KNUTWURST_MEGA, KNUTWURST_MEGA_S)
+    #define DEFAULT_MAX_ACCELERATION      { 3000, 2000,  60, 10000 }
+#endif
+
+#if ENABLED(KNUTWURST_MEGA_X)
+    #define DEFAULT_MAX_ACCELERATION      { 400, 400, 60, 10000 }
+#endif
+
+
+
 
 //#define LIMITED_MAX_ACCEL_EDITING     // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
 #if ENABLED(LIMITED_MAX_ACCEL_EDITING)
@@ -956,10 +991,31 @@
  * value set here, it may happen instantaneously.
  */
 //#define CLASSIC_JERK
+
+// I Know.. it's useless to put it here ;)
+#if EITHER(KNUTWURST_MEGA, KNUTWURST_MEGA_S)
+    //#define CLASSIC_JERK
+#endif
+
+#if ENABLED(KNUTWURST_MEGA_X)
+    //#define CLASSIC_JERK
+#endif
+
 #if ENABLED(CLASSIC_JERK)
-  #define DEFAULT_XJERK  10.0
+
-  #define DEFAULT_YJERK  10.0
+#if EITHER(KNUTWURST_MEGA, KNUTWURST_MEGA_S)
-  #define DEFAULT_ZJERK  0.4
+    #define DEFAULT_XJERK  10.0
+    #define DEFAULT_YJERK  10.0
+    #define DEFAULT_ZJERK  0.4
+#endif
+
+#if ENABLED(KNUTWURST_MEGA_X)
+    #define DEFAULT_XJERK  4.0
+    #define DEFAULT_YJERK  4.0
+    #define DEFAULT_ZJERK  0.2
+#endif
+
+
 
   //#define TRAVEL_EXTRA_XYJERK 0.0     // Additional jerk allowance for all travel moves
 
@@ -969,7 +1025,13 @@
   #endif
 #endif
 
-#define DEFAULT_EJERK    5.0  // May be used by Linear Advance
+#if EITHER(KNUTWURST_MEGA, KNUTWURST_MEGA_S)
+    #define DEFAULT_EJERK    5.0  // May be used by Linear Advance
+#endif
+
+#if ENABLED(KNUTWURST_MEGA_X)
+    #define DEFAULT_EJERK    8.0  // May be used by Linear Advance
+#endif
 
 /**
  * Junction Deviation Factor
@@ -979,7 +1041,13 @@
  *   http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
  */
 #if DISABLED(CLASSIC_JERK)
-  #define JUNCTION_DEVIATION_MM 0.013 // (mm) Distance from real junction edge
+    #if EITHER(KNUTWURST_MEGA, KNUTWURST_MEGA_S)
+        #define JUNCTION_DEVIATION_MM 0.013 // (mm) Distance from real junction edge
+    #endif
+
+    #if ENABLED(KNUTWURST_MEGA_X)
+        #define JUNCTION_DEVIATION_MM 0.16 // (mm) Distance from real junction edge
+    #endif
 #endif
 
 /**
@@ -1152,10 +1220,10 @@
 
 // Most probes should stay away from the edges of the bed, but
 // with NOZZLE_AS_PROBE this can be negative for a wider probing area.
-#define MIN_PROBE_EDGE 10
+#define MIN_PROBE_EDGE 30
 
 // X and Y axis travel speed (mm/m) between probes
-#define XY_PROBE_SPEED 3600
+#define XY_PROBE_SPEED 8000
 
 // Feedrate (mm/m) for the first approach when double-probing (MULTIPLE_PROBING == 2)
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
@@ -1606,9 +1674,18 @@
   #define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2)    // Y point for Z homing when homing all axes (G28).
 #endif
 
-// Homing speeds (mm/m)
+#if EITHER(KNUTWURST_MEGA, KNUTWURST_MEGA_S)
-#define HOMING_FEEDRATE_XY (50*60)
+    // Homing speeds (mm/m)
-#define HOMING_FEEDRATE_Z  (4*60)
+    #define HOMING_FEEDRATE_XY (50*60)
+    #define HOMING_FEEDRATE_Z  (5*60)
+#endif
+
+#if ENABLED(KNUTWURST_MEGA_X)
+    // Homing speeds (mm/m)
+    #define HOMING_FEEDRATE_XY (40*60)
+    #define HOMING_FEEDRATE_Z  (6*60)
+#endif
+
 
 // Validate that endstops are triggered on homing moves
 #define VALIDATE_HOMING_ENDSTOPS

Marlin/src/core/language.h

@@ -126,7 +126,7 @@
 #define STR_INVALID_E_STEPPER               "Invalid E stepper"
 #define STR_E_STEPPER_NOT_SPECIFIED         "E stepper not specified"
 #define STR_INVALID_SOLENOID                "Invalid solenoid"
-#define STR_M115_REPORT                     "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " MARLIN-AI3M_VERSION:" CUSTOM_BUILD_VERSION " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID
+#define STR_M115_REPORT                     "FIRMWARE_NAME:Marlin " DETAILED_BUILD_VERSION " KNUTWURST_AI3M_VERSION:" CUSTOM_BUILD_VERSION " DISTRIBUTION_DATE:" STRING_DISTRIBUTION_DATE " SOURCE_CODE_URL:" SOURCE_CODE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:" MACHINE_NAME " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID
 #define STR_MARLIN_AI3M                     "Marlin-AI3M"
 #define STR_COUNT_X                         " Count X:"
 #define STR_COUNT_A                         " Count A:"

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.1.1"
+ #define CUSTOM_BUILD_VERSION "1.1.5"
 
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-07-09"
+  #define STRING_DISTRIBUTION_DATE "2020-08-27"
 #endif
 
 /**

Marlin/src/lcd/anycubic_touchscreen.cpp

@@ -121,10 +121,10 @@ void AnycubicTouchscreenClass::Setup()
   pinMode(SD_DETECT_PIN, INPUT);
   WRITE(SD_DETECT_PIN, HIGH);
 #endif
-  pinMode(19, INPUT);
+  pinMode(FILAMENT_RUNOUT_PIN, INPUT);
-  WRITE(19, HIGH);
+  WRITE(FILAMENT_RUNOUT_PIN, HIGH);
 #if ENABLED(ANYCUBIC_FILAMENT_RUNOUT_SENSOR)
-  if ((READ(19) == true) && FilamentSensorEnabled)
+  if ((READ(FILAMENT_RUNOUT_PIN) == true) && FilamentSensorEnabled)
   {
     HARDWARE_SERIAL_PROTOCOLPGM("J15"); //J15 FILAMENT LACK
     HARDWARE_SERIAL_ENTER();
@@ -134,9 +134,10 @@ void AnycubicTouchscreenClass::Setup()
   }
 #endif
 
-  currentTouchscreenSelection[0] = '\0';
+  currentTouchscreenSelection[0] = 0;
   currentFileOrDirectory[0] = '\0';
   SpecialMenu = false;
+  MMLMenu = false;
   FilamentSensorEnabled = true;
   MyFileNrCnt = 0;
 
@@ -447,13 +448,21 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
   || (strcasestr(currentTouchscreenSelection, SM_PID_HOTEND_S) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: PID Tune Hotend");
-    queue.inject_P(PSTR("M106 S204\nM303 E0 S210 C15 U1"));
+    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"));
+    buzzer.tone(200, 1108);
+    buzzer.tone(200, 1661);
+    buzzer.tone(200, 1108);
+    buzzer.tone(600, 1661);
   }
   else if ((strcasestr(currentTouchscreenSelection, SM_PID_BED_L) != NULL)
   || (strcasestr(currentTouchscreenSelection, SM_PID_BED_S) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: PID Tune Ultrabase");
-    queue.inject_P(PSTR("M303 E-1 S60 C6 U1"));
+    queue.inject_P(PSTR("M303 E-1 S60 C6 U1\nM500"));
+    buzzer.tone(200, 1108);
+    buzzer.tone(200, 1661);
+    buzzer.tone(200, 1108);
+    buzzer.tone(600, 1661);
   }
   else if ((strcasestr(currentTouchscreenSelection, SM_SAVE_EEPROM_L) != NULL)
   || (strcasestr(currentTouchscreenSelection, SM_SAVE_EEPROM_S) != NULL))
@@ -484,6 +493,7 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
   {
     SERIAL_ECHOLNPGM("Special Menu: Start Mesh Leveling");
     queue.inject_P(PSTR("G29 S1"));
+    MMLMenu = true;
   }
   else if ((strcasestr(currentTouchscreenSelection, SM_MESH_NEXT_L) != NULL)
   || (strcasestr(currentTouchscreenSelection, SM_MESH_NEXT_S) != NULL))
@@ -519,17 +529,13 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
   || (strcasestr(currentTouchscreenSelection, SM_Z_UP_001_S) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: Z Up 0.01");
-    queue.inject_P(PSTR("G91\nG1 Z+0.01\nG90"));
+    queue.inject_P(PSTR("G91\nG1 Z+0.03\nG4 P250\nG1 Z-0.02\nG90"));
-    //queue.inject_P(PSTR("G91\nG1 Z+0.01\nG90"));
-    //queue.inject_P(PSTR("G91\nG1 Z-0.02\nG90"));
   }
   else if ((strcasestr(currentTouchscreenSelection, SM_Z_DN_001_L) != NULL)
-  || (strcasestr(currentTouchscreenSelection, SM_Z_DN_001_L) != NULL))
+  || (strcasestr(currentTouchscreenSelection, SM_Z_DN_001_S) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: Z Down 0.01");
-    queue.inject_P(PSTR("G91\nG1 Z-0.01\nG90"));
+    queue.inject_P(PSTR("G91\nG1 Z+0.02\nG4 P250\nG1 Z-0.03\nG90"));
-    //queue.inject_P(PSTR("G91\nG1 Z+0.02\nG90"));
-    //queue.inject_P(PSTR("G91\nG1 Z-0.03\nG90"));
   }
 #endif
 
@@ -538,7 +544,9 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
   || (strcasestr(currentTouchscreenSelection, SM_BLTOUCH_S) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: BLTouch Leveling");
-    queue.inject_P(PSTR("G28\nG29\nM500\nG90\nG1 X0 Z30 F4000\nG91"));
+    queue.inject_P(PSTR("G28\nG29\nM500\nG90\nG1 Z30 F4000\nG1 X0 F4000\nG91\nM84"));
+    buzzer.tone(105, 1108);
+    buzzer.tone(210, 1661);
   }
 #endif
 
@@ -576,12 +584,47 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
   {
     SpecialMenu = false;
   }
+  else if ((strcasestr(currentTouchscreenSelection, SM_BACK_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_BACK_S) != NULL))
+  {
+    MMLMenu = false;
+  }
 }
 
 
 void AnycubicTouchscreenClass::PrintList()
 {
-  if (SpecialMenu)
+  if(MMLMenu)
+  {
+    switch (filenumber)
+    {
+        case 0: // Page 1
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_UP_01_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_UP_01_L);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_DN_01_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_DN_01_L);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_UP_002_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_UP_002_L);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_DN_002_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_DN_002_L);
+        break;
+
+        case 4: // Page 2
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_UP_001_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_UP_001_L);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_DN_001_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_DN_001_L);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_MESH_NEXT_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_MESH_NEXT_L);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_BACK_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_BACK_L);
+          break;
+        
+        default:
+        break;
+      }
+  }
+  else if (SpecialMenu)
   {
     switch (filenumber)
     {
@@ -600,37 +643,17 @@ void AnycubicTouchscreenClass::PrintList()
     case 4: // Page 2
       HARDWARE_SERIAL_PROTOCOLLNPGM(SM_MESH_START_S);
       HARDWARE_SERIAL_PROTOCOLLNPGM(SM_MESH_START_L);
-      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_MESH_NEXT_S);
-      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_MESH_NEXT_L);
-      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_UP_01_S);
-      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_UP_01_L);
-      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_DN_01_S);
-      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_DN_01_L);
-      break;
-
-    case 8: // Page 3
-      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_UP_002_S);
-      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_UP_002_L);
-      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_DN_002_S);
-      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_DN_002_L);
-      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_UP_001_S);
-      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_UP_001_L);
-      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_DN_001_S);
-      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_DN_001_L);
-      break;
-
-    case 12: // Page 4
       HARDWARE_SERIAL_PROTOCOLLNPGM(SM_PID_HOTEND_S);
       HARDWARE_SERIAL_PROTOCOLLNPGM(SM_PID_HOTEND_L);
       HARDWARE_SERIAL_PROTOCOLLNPGM(SM_PID_BED_S);
       HARDWARE_SERIAL_PROTOCOLLNPGM(SM_PID_BED_L);
       HARDWARE_SERIAL_PROTOCOLLNPGM(SM_SAVE_EEPROM_S);
       HARDWARE_SERIAL_PROTOCOLLNPGM(SM_SAVE_EEPROM_L);
-      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_LOAD_DEFAULTS_S);
-      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_LOAD_DEFAULTS_L);
       break;
 
-    case 16: // Page 5
+    case 8: // Page 3
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_LOAD_DEFAULTS_S);
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_LOAD_DEFAULTS_L);
       HARDWARE_SERIAL_PROTOCOLLNPGM(SM_DIS_FILSENS_S);
       HARDWARE_SERIAL_PROTOCOLLNPGM(SM_DIS_FILSENS_L);
       HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EN_FILSENS_S);
@@ -639,6 +662,7 @@ void AnycubicTouchscreenClass::PrintList()
       HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EXIT_L);
       break;
 #endif
+
 #if ENABLED(KNUTWURST_BLTOUCH)
     case 4: // Page 2
       HARDWARE_SERIAL_PROTOCOLLNPGM(SM_BLTOUCH_S);
@@ -661,8 +685,7 @@ void AnycubicTouchscreenClass::PrintList()
       HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EXIT_S);
       HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EXIT_L);
       break;
-    #endif
+#endif
-
     default:
       break;
     }
@@ -725,8 +748,8 @@ void AnycubicTouchscreenClass::PrintList()
         
         // Cut off too long filenames.
         // They don't fit on the screen anyways.
-        if(fileNameLen > MAX_PRINTABLE_FILENAME_LEN)
+        //if(fileNameLen > MAX_PRINTABLE_FILENAME_LEN)
-          fileNameLen = MAX_PRINTABLE_FILENAME_LEN;
+        //  fileNameLen = MAX_PRINTABLE_FILENAME_LEN;
         
         char outputString[fileNameLen];
 
@@ -784,7 +807,8 @@ void AnycubicTouchscreenClass::PrintList()
 #endif
   else
   {
-    // Do nothing?
+    HARDWARE_SERIAL_PROTOCOLLNPGM(SM_SPECIAL_MENU_S);
+    HARDWARE_SERIAL_PROTOCOLLNPGM(SM_SPECIAL_MENU_L);
   }
 }
 
@@ -966,7 +990,7 @@ void AnycubicTouchscreenClass::FilamentRunout()
   if (FilamentSensorEnabled == true)
   {
 #if ENABLED(ANYCUBIC_FILAMENT_RUNOUT_SENSOR)
-    FilamentTestStatus = READ(19) & 0xff;
+    FilamentTestStatus = READ(FILAMENT_RUNOUT_PIN) & 0xff;
 
     if (FilamentTestStatus > FilamentTestLastStatus)
     {
@@ -980,8 +1004,8 @@ void AnycubicTouchscreenClass::FilamentRunout()
 #ifdef ANYCUBIC_TFT_DEBUG
         SERIAL_ECHOLNPGM("DEBUG: Set filament trigger time");
 #endif
-        // set the delayed timestamp to 3000ms later
+        // set the delayed timestamp to 5000ms later
-        fil_delay = fil_ms + 3000UL;
+        fil_delay = fil_ms + 5000UL;
         // this doesn't need to run until the filament is recovered again
         FilamentSetMillis = false;
       }
@@ -993,7 +1017,7 @@ void AnycubicTouchscreenClass::FilamentRunout()
         if (!IsParked)
         {
 #ifdef ANYCUBIC_TFT_DEBUG
-          SERIAL_ECHOLNPGM("DEBUG: 3000ms delay done");
+          SERIAL_ECHOLNPGM("DEBUG: 5000ms delay done");
 #endif
           if (card.isPrinting())
           {
@@ -1052,46 +1076,33 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
     {
         TFTcomment_mode = false; //for new command
 
-        //TFTfromsd[TFTbufindw] = false;
-        
         if(strchr(TFTcmdbuffer[TFTbufindw], 'N') != NULL)
         {
-        /*
+          if(strchr(TFTcmdbuffer[TFTbufindw], '*') != NULL)
-          TFTstrchr_pointer = strchr(TFTcmdbuffer[TFTbufindw], 'N');
-          gcode_N = (strtol(&TFTcmdbuffer[TFTbufindw][TFTstrchr_pointer - TFTcmdbuffer[TFTbufindw] + 1], NULL, 10));
-          if(gcode_N != gcode_LastN+1 && (strstr_P(TFTcmdbuffer[TFTbufindw], PSTR("M110")) == NULL) )
           {
-              HARDWARE_SERIAL_ERROR_START;
+              byte checksum = 0;
-              NEWFlushSerialRequestResend();
+              byte count = 0;
-              serial3_count = 0;
+              while(TFTcmdbuffer[TFTbufindw][count] != '*') checksum = checksum^TFTcmdbuffer[TFTbufindw][count++];
-              return;
+              TFTstrchr_pointer = strchr(TFTcmdbuffer[TFTbufindw], '*');
+        
+              if( (int)(strtod(&TFTcmdbuffer[TFTbufindw][TFTstrchr_pointer - TFTcmdbuffer[TFTbufindw] + 1], NULL)) != checksum)
+              {
+                  HARDWARE_SERIAL_ERROR_START;
+                  HardwareSerial.flush();
+                  HARDWARE_SERIAL_ERROR_START;
+                  HardwareSerial.flush();
+                  serial3_count = 0;
+                  return;
+              }
+            //if no errors, continue parsing
           }
-        */
+          else
-  
-       if(strchr(TFTcmdbuffer[TFTbufindw], '*') != NULL)
-       {
-          byte checksum = 0;
-          byte count = 0;
-          while(TFTcmdbuffer[TFTbufindw][count] != '*') checksum = checksum^TFTcmdbuffer[TFTbufindw][count++];
-          TFTstrchr_pointer = strchr(TFTcmdbuffer[TFTbufindw], '*');
-    
-          if( (int)(strtod(&TFTcmdbuffer[TFTbufindw][TFTstrchr_pointer - TFTcmdbuffer[TFTbufindw] + 1], NULL)) != checksum)
           {
-              HARDWARE_SERIAL_ERROR_START;
+            HARDWARE_SERIAL_ERROR_START;
-              HardwareSerial.flush();
+            HardwareSerial.flush();
-              serial3_count = 0;
+            serial3_count = 0;
-              return;
+            return;
           }
-         //if no errors, continue parsing
-       }
-       else
-       {
-         HARDWARE_SERIAL_ERROR_START;
-         HardwareSerial.flush();
-         serial3_count = 0;
-         return;
-       }  
-       //gcode_LastN = gcode_N;
        //if no errors, continue parsing
        }
        else  // if we don't receive 'N' but still see '*'
@@ -1172,7 +1183,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
             }
             else
             {
-              HARDWARE_SERIAL_PROTOCOLPGM("J02");
+              HARDWARE_SERIAL_PROTOCOLPGM("J02");  // J02 SD Card initilized
             }
           }
           else
@@ -1206,22 +1217,16 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
         case 8: // A8 GET SD LIST
 #ifdef SDSUPPORT
           currentTouchscreenSelection[0] = 0;
-          if (!IS_SD_INSERTED())
-          {
-            HARDWARE_SERIAL_PROTOCOLPGM("J02");
-            HARDWARE_SERIAL_ENTER();
-          }
-          else
-          {
-            if (CodeSeen('S'))
-              filenumber = CodeValue();
 
-            HARDWARE_SERIAL_PROTOCOLPGM("FN "); // Filelist start
+          if (CodeSeen('S'))
-            HARDWARE_SERIAL_ENTER();
+            filenumber = CodeValue();
-            PrintList();
+            
-            HARDWARE_SERIAL_PROTOCOLPGM("END"); // Filelist stop
+          HARDWARE_SERIAL_PROTOCOLPGM("FN "); // Filelist start
-            HARDWARE_SERIAL_ENTER();
+          HARDWARE_SERIAL_ENTER();
-          }
+          PrintList();
+          HARDWARE_SERIAL_PROTOCOLPGM("END"); // Filelist stop
+          HARDWARE_SERIAL_ENTER();
+          
 #endif
           break;
         case 9: // A9 pause sd print
@@ -1611,15 +1616,6 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
           }
 
           currentTouchscreenSelection[0] = 0;
-
-          if (!IS_SD_INSERTED())
-          {
-            HARDWARE_SERIAL_PROTOCOLPGM("J02"); // J02 SD Card initilized
-            HARDWARE_SERIAL_ENTER();
-#ifdef ANYCUBIC_TFT_DEBUG
-            SERIAL_ECHOLNPGM("TFT Serial Debug: SD card initialized... J02");
-#endif
-          }
 #endif
           break;
 #ifdef SERVO_ENDSTOPS
@@ -1638,6 +1634,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
         case 33: // A33 get version info
         {
           HARDWARE_SERIAL_PROTOCOLPGM("J33 ");
+          HARDWARE_SERIAL_PROTOCOLPGM("KW-");
           HARDWARE_SERIAL_PROTOCOLPGM(MSG_MY_VERSION);
           HARDWARE_SERIAL_ENTER();
         }

Marlin/src/lcd/anycubic_touchscreen.h

@@ -36,6 +36,8 @@ char *ftostr32(const float &);
 #define MSG_MY_VERSION CUSTOM_BUILD_VERSION
 #define MAX_PRINTABLE_FILENAME_LEN 30
 
+#define FILAMENT_RUNOUT_PIN 19
+
 #define ANYCUBIC_TFT_STATE_IDLE 0
 #define ANYCUBIC_TFT_STATE_SDPRINT 1
 #define ANYCUBIC_TFT_STATE_SDPAUSE 2
@@ -87,51 +89,55 @@ char *ftostr32(const float &);
 #define SM_EN_FILSENS_S       "<ENSEN>"
 #define SM_EXIT_L             "<Exit>"
 #define SM_EXIT_S             "<EXIT>"
+#define SM_BACK_L             "<End Mesh Leveling>"
+#define SM_BACK_S             "<BACK>"
 #endif
 
 #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_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_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_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_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_L      "<Preheat Ultrabase> .gcode"
 #define SM_PREHEAT_BED_S      "<PREHE~1.GCO"
-#define SM_MESH_START_L       "<Start Mesh Leveling>.gcode"
+#define SM_MESH_START_L       "<Mesh Leveling>     .gcode"
 #define SM_MESH_START_S       "<START~1.GCO"
-#define SM_MESH_NEXT_L        "<Next Mesh Point>.gcode"
+#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_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_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_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_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_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_L         "<Z Down 0.01>       .gcode"
 #define SM_Z_DN_001_S         "<ZDOWN~3.GCO"
-#define SM_BLTOUCH_L          "<BLTouch Leveling>.gcode"
+#define SM_BLTOUCH_L          "<BLTouch Leveling>  .gcode"
 #define SM_BLTOUCH_S          "<BLTOU~1.GCO"
-#define SM_PAUSE_L            "<Fil. Change Pause>.gcode"
+#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_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_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"
 #endif
 
 
@@ -211,6 +217,7 @@ private:
   char currentFileOrDirectory[64];
   uint16_t MyFileNrCnt = 0;
   uint8_t SpecialMenu = false;
+  uint8_t MMLMenu = false;
   uint8_t FilamentSensorEnabled = true;
   
 

README.md

@@ -1,4 +1,4 @@
-# Knutwurst's i3 MEGA (M/S/X) Firmware (based on Marlin 2.0.5.4)
+# Knutwurst's i3 MEGA (M/S/X) Firmware <br>(based on Marlin 2.0.x)
 
 <span style="color: red;">(BITTE GENAU DURCHLESEN! / PLEASE READ CAREFULLY!)</span>
 
@@ -12,24 +12,22 @@
 # Inhaltsverzeichnis (Deutsch)
 - [Funktionen](#funktionen)
    - [Was ist besser?](#besser-im-vergleich-zu-anderen-firmwares-bugfixes)
-   - [Bekannte Bugs](#bekannte-bugs)
 - [Häufig gestellte Fragen (FAQ)](#häufig-gesellte-fragen-faq)
 - [Fotos / Bilder](#bilder)
    - [Spezial Menü](#spezial-menü)
-   - [Manual Mesh Beld Leveling](#manuelles-leveln)
+   - [Manual Mesh Bed Leveling](#manuelles-leveln)
-   - [BLTouch Beld Leveling](#automatisches-bltouch-leveln)
+   - [BLTouch Bed Leveling](#automatisches-bltouch-leveln)
 - [Downloads](#downloads)
 
 
 # Table of Contets (english)
-- [Features](#faq)
+- [Features](#features)
-   - [What's better?](#faq)
+   - [What's better?](#whats-better-in-coparison-to-other-firmwares-bug-fixes)
-   - [Known Bugs](#faq)
 - [Frequently asked questions (FAQ)](#faq)
-- [Photos / Pictures](#bilder)
+- [Photos / Pictures](#pictures)
    - [Special Menü](#special-menu)
-   - [Manual Mesh Beld Leveling](#manual-mesh-beld-leveling)
+   - [Manual Mesh Bed Leveling](#manual-mesh-bed-leveling)
-   - [BLTouch Beld Leveling](#bltouch-beld-leveling)
+   - [BLTouch Bed Leveling](#bltouch-bed-leveling)
 - [Download](#download)
 
 
@@ -37,22 +35,23 @@
 
 ## Funktionen
 
- * Mesh-Bed Kalibrierung / Autokalibrierung mit BLTouch
+ * Mesh-Bed Kalibrierung / Autokalibrierung mit [BLTouch (Installations-Anleitung)](https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/wiki/BLTouch-Installation-(deutsch))
  * S-Kurven Beschleunigung
  * "Juction Deviation" statt des klassischen "Jerk" 
  * "Linear Pressure Control v1.5" aktiviert (kann mit M900 konfiguriert werden)
  * Babystepping während des Druckvorgangs
  * Bilinear Bed Leveling (BBL)
  * Manuelles Editieren der Messpunkte
- * Volle Anycubic Touchscreen Unterstützung
+ * Volle Unterstützung aller [Anycubic Touchscreens](https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/wiki/Types-of-Anycubic-Touchscreens)
- * Unterstützung des neuen Anycubic Touchscreens (DGUS II)
  * Bauteilkühler läuft nun auf 100% statt maximal 70%
  * Pause & Filamentwechselfunktion
  * Automatische EEPROM Initialisierung
  * Filament Runout Sensor kann im Menü temporär deaktiviert werden
  * Wiederaufnahme des Drucks nach Stromausfall (WiP)
- * Druckbettgröße erweitert auf 220 x 225 x 210 mm
+ * [Druckbettgröße erweitert auf 225 x 220 x 210 mm](https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/wiki/Set-new-print-bed-size)
  * Automatischer 'Slowdown', falls Daten nicht schnell genug fließen
+ * Vollautomatisches Hotend und Ultrabase PID Tuning
+ * Optimierungen für [Trinamic TMC Schrittmotortreiber](https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/wiki/Schrittmotortreiber-gegen-TMC2xxx-tauschen)
 
 
 ## Besser im Vergleich zu anderen Firmwares (Bugfixes):
@@ -67,6 +66,8 @@
  * Kein Aufhängen, wenn das Filament leer ist
  * Keine "spezielle" BLTouch Firmware nötig. Hier ist alles drin
  * Konfiguration ganz einfach über Feature-Toggles
+ * Man muss keine Grundkonfiguration per GCODE machen.
+ * Man muss keinen Werksreset durchführen
 
 ---
 
@@ -158,7 +159,7 @@ Bei diesem Mapping ist man eben darauf angewiesen, dass die Funktionen, die man
 
 # Downloads
 
-Du kannst die fertigen Binärdateien hier herunterladen: https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/releases. Natürlich kannst du die Firmware mit PlatformIO oder der Arduino IDE auch selbst kompilieren.
+Du kannst die fertigen Binärdateien hier herunterladen: https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/releases. Natürlich kannst du die Firmware mit PlatformIO oder der Arduino IDE auch [selbst kompilieren](https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/wiki/Howto:-Compile-Firmware-with-PlatformIO).
 
 Um es übersichtlich zu gestalten, beinhalten die Dateinamen die einzelnen Features.
 
@@ -188,22 +189,23 @@ Für (fast) jede Kombination gibt es eine passende Firmware im Download-Bereich.
 
 ## Features:
 
- * Mesh bed calibration / Auto calibration with BLTouch
+ * Mesh bed calibration / Auto calibration with [BLTouch (Installation Manual)](https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/wiki/BLTouch-Installation-(english))
  * S-curve acceleration
  * "Juction Deviation" instead of the classic "Jerk"
- * "Linear Pressure Control v1.5" enabled (can be configured with M900)
+ * "Linear Pressure Control v1.5" activated (can be configured with M900)
- * Baby stepping during printing
+ * Baby stepping during the printing process
  * Bilinear Bed Leveling (BBL)
  * Manual editing of the measuring points
- * Full Anycubic touchscreen support
+ * Full Support for all [Anycubic Touchscreens](https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/wiki/Types-of-Anycubic-Touchscreens)
- * Support for the new Anycubic Touchscreen (DGUS II)
  * Part cooling fan now runs at 100% instead of 70%
  * Pause & filament change function
  * Automatic EEPROM initialization
- * Filament Runout Sensor can be temporarily deactivated in the menu
+ * Filament runout sensor can be temporarily deactivated in the menu
- * Power outage support
+ * Resumption of printing after a power failure (WiP)
- * Print bed size enlarged to 220 x 225 x 210 mm
+ * [Print bed size enlarged to 225 x 220 x 210 mm](https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/wiki/Set-new-print-bed-size)
- * Automatic slowdown in if the data is not received fast enough
+ * Automatic 'slowdown' if data does not flow fast enough
+ * Fully automatic hotend and ultrabase PID tuning
+ * Optimizations for [Trinamic TMC Stepper drivers](https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/wiki/Swap-stepper-motor-driver-for-TMC2xxx)
 
 ### What's better in coparison to other firmwares (bug fixes):
  * Tidy special menu
@@ -284,7 +286,7 @@ With this mapping, you have to rely on the fact that the functions you want to u
 ![SpecialMenu](images/SpecialMenu.jpg)
 ![SpecialMenu DGUS](images/SpecialMenu_DGUS.jpg)
 
-## Manual Mesh Beld Leveling
+## Manual Mesh Bed Leveling
 
 ![Page 1](images/MN_Page1.jpg)
 ![Page 1 DGUS](images/MN_Page1_DGUS.jpg)
@@ -298,7 +300,7 @@ With this mapping, you have to rely on the fact that the functions you want to u
 ![Page 4](images/MN_Page4.jpg)
 ![Page 4 DGUS](images/MN_Page4_DGUS.jpg)
 
-## BLTouch Beld Leveling
+## BLTouch Bed Leveling
 
 ![Page 1](images/BL_Page1.jpg)
 
@@ -309,7 +311,7 @@ With this mapping, you have to rely on the fact that the functions you want to u
 
 # Download
 
-You can download the precompiled binary files from here: https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/releases. Of course you can also compile the firmware yourself with PlatformIO or the Arduino IDE.
+You can download the precompiled binary files from here: https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/releases. Of course you can also [compile the firmware yourself](https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/wiki/Howto:-Compile-Firmware-with-PlatformIO) with PlatformIO or the Arduino IDE.
 
 In order to make it clear, the file names contain the individual features.
 
@@ -331,3 +333,5 @@ In order to make it clear, the file names contain the individual features.
 For (almost) every combination there is a suitable firmware in the download area. ;)
 
 
+### If you like what I do you can buy me a coffee: [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/oliverkoester)
+<sub>*It doesn't have to be a generous donation. A few cents are enough to show me who is interested in further development. So the motivation stays and I just know that I am not programming for the bin ;)<sub>

deploy_firmware_files.sh

@@ -1,15 +1,23 @@
 #!/bin/bash
 
-CURRENT_VERSION="1.1.1"
+VERSION_FILE="/Users/OKoester/Documents/Arduino/Marlin-2-0-x-Anycubic-i3-MEGA-S-Master/Marlin/src/inc/Version.h"
 FIRMWARE_FOLDER="/Users/OKoester/Documents/Arduino/Marlin-2-0-x-Anycubic-i3-MEGA-S-Master/.pio/build/"
 OUTPUT_FOLDER="/Users/OKoester/Desktop/i3_FIRMWARE"
 
-mkdir $OUTPUT_FOLDER
+CUSTOM_BUILD_VERSION=$(egrep -o "([0-9]{1,}\.)+[0-9]{1,}" $VERSION_FILE -m2 | tail -n1)
+
+if [ -d "$$OUTPUT_FOLDER/v$CUSTOM_BUILD_VERSION" ]; then
+    echo "$$OUTPUT_FOLDER/$CUSTOM_BUILD_VERSION already exists."
+else 
+    mkdir $OUTPUT_FOLDER/$CUSTOM_BUILD_VERSION
+fi
+
+echo "Knutwurst's Mega Firmware Version: $CUSTOM_BUILD_VERSION"
 
 cd $FIRMWARE_FOLDER
-for dir in $FIRMWARE_FOLDER/*/     # list directories in the form "/tmp/dirname/"
+for dir in $FIRMWARE_FOLDER/*/
 do
-    dir=${dir%*/}      # remove the trailing "/"
+    dir=${dir%*/}
-    echo ${dir##*/}    # print everything after the final "<--/"
+    echo ${dir##*/}
-    cp ${dir##*/}/firmware.hex /$OUTPUT_FOLDER/${dir##*/}_v$CURRENT_VERSION.hex
+    cp ${dir##*/}/firmware.hex /$OUTPUT_FOLDER/$CUSTOM_BUILD_VERSION/${dir##*/}_v$CUSTOM_BUILD_VERSION.hex
 done

i3_mega_envs.ini

@@ -14,7 +14,6 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 
@@ -27,7 +26,6 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_TMC
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH
 
@@ -42,7 +40,6 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_s.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 
@@ -55,7 +52,6 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_s_dgus.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 
@@ -68,7 +64,6 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_dgus_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_BLTOUCH
 
@@ -81,7 +76,6 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_TMC
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH
 
@@ -96,9 +90,8 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X
-build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT
-build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 
 
 
@@ -109,9 +102,8 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_TMC
-build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT
-build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_BLTOUCH
 
 
 
@@ -129,7 +121,6 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC 
 
@@ -141,7 +132,6 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT 
 
@@ -153,7 +143,6 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_s.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC 
 
@@ -166,7 +155,6 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_s_dgus.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_TMC 
 
@@ -179,7 +167,6 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_dgus_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X 
 
@@ -192,7 +179,6 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT
 
@@ -204,9 +190,8 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_BLTOUCH
-build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_TMC -DKNUTWURST_DGUS2_TFT
-build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_TMC 
 
 
 
@@ -217,9 +202,8 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
-build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT
-build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S 
 
 
 ###########################################################
@@ -227,6 +211,10 @@ build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S
 #  BL Touch Configurations ( TRIGORILLA_14_11 )           #
 #                                                         #
 ###########################################################
+
+#
+#  i3 Mega (normal Version)
+#
 [env:i3_MEGA_BLTOUCH_11]
 platform          = atmelavr
 board             = megaatmega2560
@@ -234,7 +222,6 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC 
 
@@ -246,11 +233,13 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT 
 
 
+#
+#  i3 Mega S
+#
 [env:i3_MEGA_S_BLTOUCH_11]
 platform          = atmelavr
 board             = megaatmega2560
@@ -258,7 +247,6 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_s.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_S -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC 
 
@@ -271,7 +259,6 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts     = pre:build_i3_mega_s_dgus.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_TMC 
 
@@ -284,7 +271,6 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_dgus_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X 
 
@@ -297,11 +283,13 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
 build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_S -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
 build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT 
 
 
+#
+#  i3 Mega X
+#
 [env:i3_MEGA_X_BLTOUCH_11]
 platform          = atmelavr
 board             = megaatmega2560
@@ -309,9 +297,8 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_X -DKNUTWURST_BLTOUCH
-build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_TMC -DKNUTWURST_DGUS2_TFT
-build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_TMC 
 
 
 
@@ -322,6 +309,5 @@ board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
   TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
 src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
-#extra_scripts = pre:build_i3_mega_s_tmc.py
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
-build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_X -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT
-build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S 

platformio.ini

@@ -15,14 +15,34 @@
 # Remove '-fmax-errors=5' from build_flags below to see all.
 #
 
+
+
+# *******************************************************************************************
+# **                                                                                       **
+# **   If you want to select a specific configuration for your                             **
+# **   printer, just open the PlatformIO tab on the left, select                           **
+# **   PROJECT TASKS and then "env:i3_MEGA*" (your desired config)                         **
+# **   From there you can build and upload your code.                                      **
+# **                                                                                       **
+# *******************************************************************************************
+
 [platformio]
 src_dir      = Marlin
 boards_dir   = buildroot/share/PlatformIO/boards
 #default_envs = mega2560
-#default_envs = i3_MEGA_S_TMC
 extra_configs = i3_mega_envs.ini
 default_envs = i3_MEGA, i3_MEGA_TMC, i3_MEGA_S, i3_MEGA_S_DGUS, i3_MEGA_S_DGUS_TMC, i3_MEGA_S_TMC, i3_MEGA_X, i3_MEGA_X_TMC, i3_MEGA_BLTOUCH_10, i3_MEGA_TMC_BLTOUCH_10, i3_MEGA_S_BLTOUCH_10, i3_MEGA_S_DGUS_BLTOUCH_10, i3_MEGA_S_DGUS_TMC_BLTOUCH_10, i3_MEGA_S_TMC_BLTOUCH_10, i3_MEGA_X_BLTOUCH_10, i3_MEGA_X_TMC_BLTOUCH_10, i3_MEGA_BLTOUCH_11, i3_MEGA_TMC_BLTOUCH_11, i3_MEGA_S_BLTOUCH_11, i3_MEGA_S_DGUS_BLTOUCH_11, i3_MEGA_S_DGUS_TMC_BLTOUCH_11, i3_MEGA_S_TMC_BLTOUCH_11, i3_MEGA_X_BLTOUCH_11, i3_MEGA_X_TMC_BLTOUCH_11
 
+# *******************************************************************************************
+# **                                                                                       **
+# **   If you want to select a specific configuration for your                             **
+# **   printer, just open the PlatformIO tab on the left, select                           **
+# **   PROJECT TASKS and then "env:i3_MEGA*" (your desired config)                         **
+# **   From there you can build and upload your code.                                      **
+# **                                                                                       **
+# *******************************************************************************************
+
+
 
 [common]
 default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>