Bum build version to 1.1.6 for next release

* 'master' of https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S:
  Update README.md

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: ["https://paypal.me/oliverkoester"]

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,43 @@
+---
+name: Bug report
+about: Report a bug in Marlin
+title: "[BUG] (short description)"
+labels: ''
+assignees: ''
+
+---
+
+<!--
+
+Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md
+
+Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use one of the support links at https://github.com/MarlinFirmware/Marlin/issues/new/choose
+
+Before filing an issue be sure to test the "bugfix" branches to see whether the issue has been resolved.
+
+-->
+
+### Bug Description
+
+<!-- Description of the bug -->
+
+### My Configurations
+
+**Required:** Please include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.
+
+### Steps to Reproduce
+
+<!-- Please describe the steps needed to reproduce the issue -->
+
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+**Expected behavior:** [What you expect to happen]
+
+**Actual behavior:** [What actually happens]
+
+#### Additional Information
+
+* Provide pictures or links to videos that clearly demonstrate the issue.
+* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,17 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Marlin Documentation
+    url: http://marlinfw.org/
+    about: Lots of documentation on installing and using Marlin.
+  - name: MarlinFirmware Facebook group
+    url: https://www.facebook.com/groups/1049718498464482
+    about: Please ask and answer questions here.
+  - name: Marlin on Discord
+    url: https://discord.gg/n5NJ59y
+    about: Join the Discord server for support and discussion.
+  - name: Marlin Discussion Forum
+    url: http://forums.reprap.org/list.php?415
+    about: A searchable web forum hosted by RepRap dot org.
+  - name: Marlin Videos on YouTube
+    url: https://www.youtube.com/results?search_query=marlin+firmware
+    about: Tutorials and more from Marlin users all around the world. Great for new users!

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,35 @@
+---
+name: Feature request
+about: Request a Feature
+title: "[FR] (feature request title)"
+labels: ''
+assignees: ''
+
+---
+
+<!--
+
+Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md
+
+Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use one of the support links at https://github.com/MarlinFirmware/Marlin/issues/new/choose
+
+Before filing an issue be sure to test the "bugfix" branches to see whether the issue has been resolved.
+
+-->
+
+### Description
+
+<!-- Description of the requested feature -->
+
+### Feature Workflow
+
+<!-- Please describe the feature's behavior, user interaction, etc. -->
+
+1. [First Action]
+2. [Second Action]
+3. [and so on...]
+
+#### Additional Information
+
+* Provide pictures or links that demonstrate a similar feature or concept.
+* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.

.github/issue_template.md

@@ -0,0 +1,11 @@
+# NO SUPPORT REQUESTS PLEASE
+
+Do you want to ask a question? Are you looking for support? Please don't post here. Support Requests posted here will be automatically closed!
+
+Instead use one of the following options:
+
+- The Marlin Firmware forum at https://reprap.org/forum/list.php?415
+- The MarlinFirmware Facebook Group at https://www.facebook.com/groups/1049718498464482/
+- The MarlinFirmware Discord Server at https://discord.gg/n5NJ59y.
+
+Before filing an issue be sure to test the latest "bugfix" branch to see whether the issue is already addressed.

.github/lock.yml

@@ -0,0 +1,40 @@
+#
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads-app
+#
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 60
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+skipCreatedBefore: false
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+exemptLabels: [ 'no-locking' ]
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: >
+  This thread has been automatically locked since there has not been
+  any recent activity after it was closed. Please open a new issue for
+  related bugs.
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: true
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+# issues:
+#   exemptLabels:
+#     - help-wanted
+#   lockLabel: outdated
+
+# pulls:
+#   daysUntilLock: 30
+
+# Repository to extend settings from
+# _extends: repo

.github/pull_request_template.md

@@ -0,0 +1,23 @@
+### Requirements
+
+* Filling out this template is required. Pull Requests without a clear description may be closed at the maintainers' discretion.
+
+### Description
+
+<!--
+
+We must be able to understand your proposed change from this description. If we can't understand what the code will do from this description, the Pull Request may be closed at the maintainers' discretion. Keep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code recently, so please walk us through the concepts.
+
+-->
+
+### Benefits
+
+<!-- What does this fix or improve? -->
+
+### Configurations
+
+<!-- Attach any Configuration.h, Configuration_adv.h, or platformio.ini files needed to compile/test your Pull Request. -->
+
+### Related Issues
+
+<!-- Whether this fixes a bug or fulfills a feature request, please list any related Issues here. -->

.github/workflows/build-all.yml

@@ -0,0 +1,114 @@
+name: Build All Firmware Variants
+
+on:
+  #pull_request:
+  #  branches:
+  #  - master
+  #  paths-ignore:
+  #  - config/**
+  #  - data/**
+  #  - docs/**
+  #  - '**/*.md'
+  push:
+    branches:
+    - master
+    paths-ignore:
+    - config/**
+    - data/**
+    - docs/**
+    - '**/*.md'
+
+jobs:
+  build:
+    name: Build
+    if: github.repository == 'knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S'
+
+    runs-on: ubuntu-latest
+
+    strategy:
+       matrix:
+         platform:
+         # Knutwurst Base Environments
+         - MEGA_1G
+         - MEGA_1G_TMC
+         - MEGA_1G_BLT_10
+         - MEGA_1G_BLT_11
+         - MEGA_1G_TMC_BLT_10
+         - MEGA_1G_TMC_BLT_11
+         - MEGA
+         - MEGA_TMC
+         - MEGA_BLT_10
+         - MEGA_BLT_11
+         - MEGA_TMC_BLT_10
+         - MEGA_TMC_BLT_11
+         - MEGA_S
+         - MEGA_S_TMC
+         - MEGA_S_BLT_10
+         - MEGA_S_BLT_11
+         - MEGA_S_TMC_BLT_10
+         - MEGA_S_TMC_BLT_11
+         - MEGA_S_DGUS
+         - MEGA_S_DGUS_TMC
+         - MEGA_S_DGUS_BLT_10
+         - MEGA_S_DGUS_BLT_11
+         - MEGA_S_DGUS_TMC_BLT_10
+         - MEGA_S_DGUS_TMC_BLT_11
+         - MEGA_X
+         - MEGA_X_TMC
+         - MEGA_X_BLT_10
+         - MEGA_X_BLT_11
+         - MEGA_X_TMC_BLT_10
+         - MEGA_X_TMC_BLT_11
+         - MEGA_P
+         - MEGA_P_TMC
+         - MEGA_P_BLT_10
+         - MEGA_P_BLT_11
+         - MEGA_P_TMC_BLT_10
+         - MEGA_P_TMC_BLT_11
+
+    steps:
+
+    - name: Setup Python 3.7
+      uses: actions/setup-python@v1
+      with:
+        python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax.
+        architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
+
+    - name: Install PlatformIO
+      run: |
+        pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
+        platformio update
+
+    - name: Install PlatformIO dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install platformio
+    
+    - uses: actions/checkout@master
+
+    - name: Compile Firmware with PlatformIO
+      run: platformio run --environment ${{ matrix.platform }}
+    
+    - name: Set Environment Variables
+      run: |
+         CUSTOM_BUILD_VERSION=$(egrep -o "([0-9]{1,}\.)+[0-9]{1,}" Marlin/src/inc/Version.h -m2 | tail -n1) && \
+         echo "::set-env name=CUSTOM_BUILD_VER::$CUSTOM_BUILD_VERSION"
+
+    - name: Rename Output Files
+      run: |
+        CUSTOM_BUILD_VERSION=$(egrep -o "([0-9]{1,}\.)+[0-9]{1,}" Marlin/src/inc/Version.h -m2 | tail -n1) && \
+        mv .pio/build/${{ matrix.platform }}/firmware.hex .pio/build/${{ matrix.platform }}/${{ matrix.platform }}_v$CUSTOM_BUILD_VERSION.hex
+
+    #- name: Archive artifacts into single Files
+    #  uses: actions/upload-artifact@master
+    #  with:
+    #    name: Knutwurst_${{ matrix.platform }}
+    #    path: |
+    #     .pio/build/${{ matrix.platform }}/${{ matrix.platform }}_v*.hex
+
+    - name: Archive all artifacts into one ZIP file
+      uses: actions/upload-artifact@master
+      with:
+        name: Knuwurst-all-in-one_v$CUSTOM_BUILD_VER
+        path: |
+         .pio/build/${{ matrix.platform }}/${{ matrix.platform }}_v*.hex

.github/workflows/bump-date.yml

@@ -0,0 +1,31 @@
+#
+# bump-date.yml
+# Bump the distribution date once per day
+#
+
+name: Bump Distribution Date
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  bump_date:
+    name: Bump Distribution Date
+  
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - uses: actions/checkout@master
+
+    - name: Bump Distribution Date
+      run: |
+        # Inline Bump Script
+        DIST=$( date +"%Y-%m-%d" )
+        eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \
+        git config user.name "${GITHUB_ACTOR}" && \
+        git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && \
+        git add . && \
+        git commit -m "[cron] Bump distribution date ($DIST)" && \
+        git push

.github/workflows/check-pr.yml

@@ -0,0 +1,31 @@
+#
+# check-pr.yml
+# Close PRs directed at release branches
+#
+
+name: PR Bad Target
+
+on:
+  pull_request:
+    branches:
+    - 2.0.x
+
+jobs:
+  bad_target:
+    name: PR Bad Target
+    if: github.repository == 'knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S'
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: peter-evans/close-pull@v1
+      with:
+        delete-branch: false
+        comment: >
+          Thanks for your contribution! Unfortunately we can't accept PRs directed at release branches. We make patches to the bugfix branches and only later do we push them out as releases.
+
+          Please redo this PR starting with the `bugfix-2.0.x` branch and be careful to target `bugfix-2.0.x` when resubmitting the PR.
+
+          It may help to set your fork's default branch to `bugfix-2.0.x`.
+
+          See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.

.github/workflows/close-stale.yml

@@ -0,0 +1,27 @@
+#
+# close-stale.yml
+# Close open issues after a period of inactivity
+#
+
+name: Close Stale Issues
+
+on:
+  schedule:
+  - cron: "22 1 * * *"
+
+jobs:
+  stale:
+    name: Close Stale Issues
+    if: github.repository == 'knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S'
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label / comment or this will be closed in 5 days.'
+        days-before-stale: 30
+        days-before-close: 5
+        stale-issue-label: 'stale-closing-soon'
+        exempt-issue-labels: 'T: Feature Request'

.github/workflows/lock-closed.yml

@@ -0,0 +1,32 @@
+#
+# lock-closed.yml
+# Lock closed issues after a period of inactivity
+#
+
+name: Lock Closed Issues
+
+on:
+  schedule:
+    - cron: '0 1/13 * * *'
+
+jobs:
+  lock:
+    name: Lock Closed Issues
+    if: github.repository == 'knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S'
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: dessant/lock-threads@v2
+      with:
+        github-token: ${{ github.token }}
+        process-only: 'issues'
+        issue-lock-inactive-days: '60'
+        issue-exclude-created-before: ''
+        issue-exclude-labels: 'no-locking'
+        issue-lock-labels: ''
+        issue-lock-comment: >
+          This issue has been automatically locked since there
+          has not been any recent activity after it was closed.
+          Please open a new issue for related bugs.
+        issue-lock-reason: ''

.github/workflows/unlock-reopened.yml

@@ -0,0 +1,22 @@
+#
+# unlock-reopened.yml
+# Unlock an issue whenever it is re-opened
+#
+
+name: "Unlock reopened issue"
+
+on:
+  issues:
+    types: [reopened]
+
+jobs:
+  unlock:
+    name: Unlock Reopened
+    if: github.repository == 'knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S'
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: OSDKDev/unlock-issues@v1.1
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

Marlin/Configuration.h

@@ -38,10 +38,150 @@
  */
 #define CONFIGURATION_H_VERSION 020005
 
-#define KNUTWURST_MEGAS
-#define KNUTWURST_TMC
+#define ANYCUBIC_TOUCHSCREEN
+#define ANYCUBIC_FILAMENT_RUNOUT_SENSOR
+//#define ANYCUBIC_TFT_DEBUG
 //#define POWER_OUTAGE_TEST
 
+/*******************************************************************************************
+ **                                                                                       **
+ **                                                                                       **
+ **   WARNING:                                                                            **
+ **   THE FOLLOWING SETTINGS ARE NORMALLY SET BY PLATFORMIO!                              **
+ **                                                                                       **
+ **   IF YOU CHANGE THEM WITHIN THE SOURCECODE, DO NOT COMMIT                             **
+ **   TO MASTER BRANCH OR BUILD WITH PLATFORMIO ENVIRONMENT!                              **
+ **   OTHERWISE SOME SETTINGS MIGHT BE OVERWRITTEN AND YOU END                            **
+ **   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.                                      **
+ **                                                                                       **
+ **                                                                                       **
+ *******************************************************************************************/
+ 
+
+/*
+ * Select your printer.
+ * DO NOT ENABLE MORE THAN ONE LINE!
+ * 
+ * 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
+ * MEGA_P is the "Pro" Version with BMG Extruder, 2 TMC Steppers and Laser
+ * 
+ * PLEASE READ THE WARNING ABOVE!
+ * 
+ */
+//#define KNUTWURST_MEGA
+//#define KNUTWURST_MEGA_S
+//#define KNUTWURST_MEGA_X
+//#define KNUTWURST_MEGA_P
+
+/*
+ * If you own the first generation i3 Mega
+ * with only one Z endstop, you need to activate
+ * KNUTWURST_MEGA and also this to disable
+ * the left endstop and switch the Z Motors.
+ * 
+ * If the option is disabled, two Z endstops
+ * are used by default.
+ * 
+ * PLEASE READ THE WARNING ABOVE!
+ * 
+ */
+//#define KNUTWURST_ONE_Z_ENDSTOP
+
+/*
+ * If you have defined the MEGA_X or if
+ * 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
+
+/*
+ * 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
+
+/*
+ * Invert E0 Stepper driver for
+ * Bondtech Mini Geared (BMG) Extruders
+ * 
+ * This flag is mandatory if you own a
+ * MEGA Pro, which has this Extruder by
+ * default.
+ * 
+ */
+//#define KNUTWURST_BMG
+
+/*
+ * This enables the BLTouch Support and also 
+ * activates the BLTouch Menu item in the 
+ * special menu. It also removes all manual 
+ * leveling features because they are not 
+ * neccessary at all.
+ * 
+ * PLEASE READ THE WARNING ABOVE!
+ * 
+ */
+//#define KNUTWURST_BLTOUCH
+
+/*
+ * This feature is for debugging purpose only.
+ * 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:                                                                            **
+ **   THE SETTINGS ABOVE ARE NORMALLY SET BY PLATFORMIO!                                  **
+ **                                                                                       **
+ **   IF YOU CHANGE THEM WITHIN THE SOURCECODE, DO NOT COMMIT                             **
+ **   TO MASTER BRANCH OR BUILD WITH PLATFORMIO ENVIRONMENT!                              **
+ **   OTHERWISE SOME SETTINGS MIGHT BE OVERWRITTEN AND YOU END                            **
+ **   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.                                      **
+ **                                                                                       **
+ **                                                                                       **
+ *******************************************************************************************/
+
+
+/*
+ * Here you can set the default preheat-Temperatures
+ * which are set when you use the builtin preheat
+ * functions in the TFT.
+ * 
+ * These settings are required and not set by PlatformIO.
+ */
+#define KNUTWURST_PRHEAT_NOZZLE_PLA 200
+#define KNUTWURST_PRHEAT_BED_PLA     60
+#define KNUTWURST_PRHEAT_NOZZLE_ABS 240
+#define KNUTWURST_PRHEAT_BED_ABS     90
+
+
 //===========================================================================
 //============================= Getting Started =============================
 //===========================================================================
@@ -76,6 +216,7 @@
 
 // Author info of this build printed to the host during boot and M115
 #define STRING_CONFIG_H_AUTHOR "(knutwurst)" // Who made the changes.
+//#define CUSTOM_VERSION_FILE Version.h // Path from the root directory (no quotes)
 
 /**
  * *** VENDORS PLEASE READ ***
@@ -143,7 +284,7 @@
  * on the upper left of the PCB silkscreen.
  */
 #ifndef MOTHERBOARD
-  #define MOTHERBOARD BOARD_TRIGORILLA_14
+  //#define MOTHERBOARD BOARD_TRIGORILLA_14  // Is normally set by PlatformIO
 #endif
 
 // Name displayed in the LCD "Ready" message and Info menu
@@ -634,7 +775,10 @@
 #define USE_XMIN_PLUG
 #define USE_YMIN_PLUG
 #define USE_ZMIN_PLUG
-#define USE_XMAX_PLUG
+
+#if DISABLED(KNUTWURST_ONE_Z_ENDSTOP)
+  #define USE_XMAX_PLUG
+#endif
 //#define USE_YMAX_PLUG
 //#define USE_ZMAX_PLUG
 
@@ -664,14 +808,28 @@
   //#define ENDSTOPPULLDOWN_ZMIN_PROBE
 #endif
 
-// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
-#define X_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
-#define Y_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
-#define Z_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
-#define X_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
-#define Y_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
-#define Z_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
-#define Z_MIN_PROBE_ENDSTOP_INVERTING true // set to true to invert the logic of the probe.
+#if ENABLED(KNUTWURST_MEGA) || ENABLED(KNUTWURST_MEGA_S) || ENABLED(KNUTWURST_MEGA_P)
+    // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
+    #define X_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
+    #define Y_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
+    #define Z_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
+    #define X_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
+    #define Y_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
+    #define Z_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
+    //#define Z_MIN_PROBE_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
+#endif
+
+#if ENABLED(KNUTWURST_MEGA_X)
+    // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
+    #define X_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
+    #define Y_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop.
+    #define Z_MIN_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
+    #define X_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
+    #define Y_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
+    #define Z_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
+    //#define Z_MIN_PROBE_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop.
+#endif
+
 
 /**
  * Stepper Drivers
@@ -690,41 +848,41 @@
  * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'L6474', 'POWERSTEP01', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
  */
 #if ENABLED(KNUTWURST_TMC)
-#define X_DRIVER_TYPE  TMC2208_STANDALONE
-#define Y_DRIVER_TYPE  TMC2208_STANDALONE
-#define Z_DRIVER_TYPE  TMC2208_STANDALONE
-#define X2_DRIVER_TYPE TMC2208_STANDALONE
-#define Y2_DRIVER_TYPE TMC2208_STANDALONE
-#define Z2_DRIVER_TYPE TMC2208_STANDALONE
-#define Z3_DRIVER_TYPE TMC2208_STANDALONE
-#define Z4_DRIVER_TYPE TMC2208_STANDALONE
-#define E0_DRIVER_TYPE TMC2208_STANDALONE
-#define E1_DRIVER_TYPE TMC2208_STANDALONE
-#define E2_DRIVER_TYPE TMC2208_STANDALONE
-#define E3_DRIVER_TYPE TMC2208_STANDALONE
-#define E4_DRIVER_TYPE TMC2208_STANDALONE
-//#define E5_DRIVER_TYPE A4988
-//#define E6_DRIVER_TYPE A4988
-//#define E7_DRIVER_TYPE A4988
+    #define X_DRIVER_TYPE  TMC2208_STANDALONE
+    #define Y_DRIVER_TYPE  TMC2208_STANDALONE
+    #define Z_DRIVER_TYPE  TMC2208_STANDALONE
+    //#define X2_DRIVER_TYPE TMC2208_STANDALONE
+    //#define Y2_DRIVER_TYPE TMC2208_STANDALONE
+    //#define Z2_DRIVER_TYPE TMC2208_STANDALONE
+    //#define Z3_DRIVER_TYPE TMC2208_STANDALONE
+    //#define Z4_DRIVER_TYPE TMC2208_STANDALONE
+    #define E0_DRIVER_TYPE TMC2208_STANDALONE
+    #define E1_DRIVER_TYPE TMC2208_STANDALONE
+    //#define E2_DRIVER_TYPE TMC2208_STANDALONE
+    //#define E3_DRIVER_TYPE TMC2208_STANDALONE
+    //#define E4_DRIVER_TYPE TMC2208_STANDALONE
+    //#define E5_DRIVER_TYPE TMC2208_STANDALONE
+    //#define E6_DRIVER_TYPE TMC2208_STANDALONE
+    //#define E7_DRIVER_TYPE TMC2208_STANDALONE
 #endif
 
 #if DISABLED(KNUTWURST_TMC)
-#define X_DRIVER_TYPE  A4988
-#define Y_DRIVER_TYPE  A4988
-#define Z_DRIVER_TYPE  A4988
-#define X2_DRIVER_TYPE A4988
-#define Y2_DRIVER_TYPE A4988
-#define Z2_DRIVER_TYPE A4988
-#define Z3_DRIVER_TYPE A4988
-#define Z4_DRIVER_TYPE A4988
-#define E0_DRIVER_TYPE A4988
-#define E1_DRIVER_TYPE A4988
-#define E2_DRIVER_TYPE A4988
-#define E3_DRIVER_TYPE A4988
-#define E4_DRIVER_TYPE A4988
-//#define E5_DRIVER_TYPE A4988
-//#define E6_DRIVER_TYPE A4988
-//#define E7_DRIVER_TYPE A4988
+    #define X_DRIVER_TYPE  A4988
+    #define Y_DRIVER_TYPE  A4988
+    #define Z_DRIVER_TYPE  A4988
+    //#define X2_DRIVER_TYPE A4988
+    //#define Y2_DRIVER_TYPE A4988
+    //#define Z2_DRIVER_TYPE A4988
+    //#define Z3_DRIVER_TYPE A4988
+    //#define Z4_DRIVER_TYPE A4988
+    #define E0_DRIVER_TYPE A4988
+    #define E1_DRIVER_TYPE A4988
+    //#define E2_DRIVER_TYPE A4988
+    //#define E3_DRIVER_TYPE A4988
+    //#define E4_DRIVER_TYPE A4988
+    //#define E5_DRIVER_TYPE A4988
+    //#define E6_DRIVER_TYPE A4988
+    //#define E7_DRIVER_TYPE A4988
 #endif
 
 // Enable this feature if all enabled endstop pins are interrupt-capable.
@@ -770,28 +928,47 @@
  * Override with M92
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
-
-#if ENABLED(KNUTWURST_MEGAS)
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 400, 384 }
+#if ENABLED(KNUTWURST_MEGA)
+    #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 400, 96 }
 #endif
 
-#if DISABLED(KNUTWURST_MEGAS)
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 400, 96 }
+#if ENABLED(KNUTWURST_MEGA_S)
+    #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 400, 392 }
 #endif
 
+#if ENABLED(KNUTWURST_MEGA_X)
+    #define DEFAULT_AXIS_STEPS_PER_UNIT    { 80, 80, 800, 400 }
+#endif
+
+#if ENABLED(KNUTWURST_MEGA_P)
+    #define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 400, 415 }
+#endif
+
+
 /**
  * Default Max Feed Rate (mm/s)
  * Override with M203
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
-#if ENABLED(KNUTWURST_MEGAS)
-#define DEFAULT_MAX_FEEDRATE          { 500, 500, 6, 30 }
+#if ENABLED(KNUTWURST_MEGA)
+    #if ENABLED(KNUTWURST_BMG)
+        #define DEFAULT_MAX_FEEDRATE          { 500, 500, 8, 30 }
+    #else
+        #define DEFAULT_MAX_FEEDRATE          { 500, 500, 8, 60 }
+    #endif 
 #endif
 
-#if DISABLED(KNUTWURST_MEGAS)
-#define DEFAULT_MAX_FEEDRATE          { 500, 500, 6, 60 }
+#if ENABLED(KNUTWURST_MEGA_S)
+    #define DEFAULT_MAX_FEEDRATE          { 500, 500, 8, 30 }
 #endif
 
+#if ENABLED(KNUTWURST_MEGA_X)
+    #define DEFAULT_MAX_FEEDRATE            { 120, 120, 18, 80 } // thanks to Simon Geis
+#endif
+
+#if ENABLED(KNUTWURST_MEGA_P)
+    #define DEFAULT_MAX_FEEDRATE          { 500, 500, 8, 30 }
+#endif
 
 
 //#define LIMITED_MAX_FR_EDITING        // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
@@ -805,7 +982,16 @@
  * Override with M201
  *                                      X, Y, Z, E0 [, E1[, E2...]]
  */
-#define DEFAULT_MAX_ACCELERATION      { 3000, 2000,  60, 10000 }
+#if ENABLED(KNUTWURST_MEGA) || ENABLED(KNUTWURST_MEGA_S) || ENABLED(KNUTWURST_MEGA_P)
+    #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)
@@ -821,17 +1007,35 @@
  *   M204 T    Travel Acceleration
  */
 
-#if ENABLED(KNUTWURST_MEGAS)
-#define DEFAULT_ACCELERATION          1600    // X, Y, Z and E acceleration for printing moves
-#define DEFAULT_RETRACT_ACCELERATION  1500    // E acceleration for retracts
-#define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
+#if ENABLED(KNUTWURST_MEGA)
+    #define DEFAULT_ACCELERATION          1600    // X, Y, Z and E acceleration for printing moves
+    #if ENABLED(KNUTWURST_BMG)
+        #define DEFAULT_RETRACT_ACCELERATION  1500    // E acceleration for retracts
+    #else
+        #define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration for retracts
+    #endif
+    
+    #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
 #endif
 
-#if DISABLED(KNUTWURST_MEGAS)
-#define DEFAULT_ACCELERATION          1600    // X, Y, Z and E acceleration for printing moves
-#define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration for retracts
-#define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
+#if ENABLED(KNUTWURST_MEGA_S)
+    #define DEFAULT_ACCELERATION          1600    // X, Y, Z and E acceleration for printing moves
+    #define DEFAULT_RETRACT_ACCELERATION  1500    // E acceleration for retracts
+    #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
 #endif
+
+#if ENABLED(KNUTWURST_MEGA_X)
+    #define DEFAULT_ACCELERATION          400     // X, Y, Z and E acceleration for printing moves
+    #define DEFAULT_RETRACT_ACCELERATION  3000    // E acceleration for retracts
+    #define DEFAULT_TRAVEL_ACCELERATION   400     // X, Y, Z acceleration for travel (non printing) moves
+#endif
+
+#if ENABLED(KNUTWURST_MEGA_P)
+    #define DEFAULT_ACCELERATION          1600    // X, Y, Z and E acceleration for printing moves
+    #define DEFAULT_RETRACT_ACCELERATION  1500    // E acceleration for retracts
+    #define DEFAULT_TRAVEL_ACCELERATION   3000    // X, Y, Z acceleration for travel (non printing) moves
+#endif
+
 /**
  * Default Jerk limits (mm/s)
  * Override with M205 X Y Z E
@@ -841,10 +1045,31 @@
  * value set here, it may happen instantaneously.
  */
 //#define CLASSIC_JERK
+
+// I Know.. it's useless to put it here ;)
+#if ENABLED(KNUTWURST_MEGA) || ENABLED(KNUTWURST_MEGA_S) || ENABLED(KNUTWURST_MEGA_P)
+    //#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
-  #define DEFAULT_ZJERK  0.4
+
+#if ENABLED(KNUTWURST_MEGA) || ENABLED(KNUTWURST_MEGA_S) || ENABLED(KNUTWURST_MEGA_P)
+    #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
 
@@ -854,7 +1079,13 @@
   #endif
 #endif
 
-#define DEFAULT_EJERK    5.0  // May be used by Linear Advance
+#if ENABLED(KNUTWURST_MEGA) || ENABLED(KNUTWURST_MEGA_S) || ENABLED(KNUTWURST_MEGA_P)
+    #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
@@ -864,7 +1095,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 ENABLED(KNUTWURST_MEGA) || ENABLED(KNUTWURST_MEGA_S) || ENABLED(KNUTWURST_MEGA_P)
+        #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
 
 /**
@@ -909,7 +1146,9 @@
  *      - normally-open switches to 5V and D32.
  *
  */
-//#define Z_MIN_PROBE_PIN 32 // Pin 32 is the RAMPS default
+#if ENABLED(KNUTWURST_BLTOUCH)
+    #define Z_MIN_PROBE_PIN 2 // Pin 32 is the RAMPS default
+#endif
 
 /**
  * Probe Type
@@ -923,7 +1162,10 @@
  * Use G29 repeatedly, adjusting the Z height at each point with movement commands
  * or (with LCD_BED_LEVELING) the LCD controller.
  */
+#if DISABLED(KNUTWURST_BLTOUCH)
 #define PROBE_MANUALLY
+#endif
+
 //#define MANUAL_PROBE_START_Z 0.2
 
 /**
@@ -947,7 +1189,9 @@
 /**
  * The BLTouch probe uses a Hall effect sensor and emulates a servo.
  */
-//#define BLTOUCH
+#if ENABLED(KNUTWURST_BLTOUCH)
+    #define BLTOUCH
+#endif
 
 /**
  * Touch-MI Probe by hotends.fr
@@ -1019,11 +1263,18 @@
  *
  * Specify a Probe position as { X, Y, Z }
  */
-#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
+#if ENABLED(KNUTWURST_BLTOUCH)
+    #define NOZZLE_TO_PROBE_OFFSET { -2, -25, 0 } //https://www.thingiverse.com/thing:2824005
+    //#define NOZZLE_TO_PROBE_OFFSET { 29, -15, 0 } //X-Carriage
+#endif
+
+#if DISABLED(KNUTWURST_BLTOUCH)
+    #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
+#endif
 
 // 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 8000
@@ -1065,14 +1316,23 @@
 #define Z_CLEARANCE_MULTI_PROBE     5 // Z Clearance between multiple probes
 //#define Z_AFTER_PROBING           5 // Z position after probing is done
 
-#define Z_PROBE_LOW_POINT          -2 // Farthest distance below the trigger-point to go before stopping
+#if ENABLED(KNUTWURST_BLTOUCH)
+    #define Z_PROBE_LOW_POINT          -10 // Farthest distance below the trigger-point to go before stopping
+#endif
+
+#if DISABLED(KNUTWURST_BLTOUCH)
+    #define Z_PROBE_LOW_POINT          -2 // Farthest distance below the trigger-point to go before stopping
+#endif
+
 
 // For M851 give a range for adjusting the Z probe offset
 #define Z_PROBE_OFFSET_RANGE_MIN -20
 #define Z_PROBE_OFFSET_RANGE_MAX 20
 
 // Enable the M48 repeatability test to test probe accuracy
-//#define Z_MIN_PROBE_REPEATABILITY_TEST
+#if ENABLED(KNUTWURST_BLTOUCH)
+    #define Z_MIN_PROBE_REPEATABILITY_TEST
+#endif
 
 // Before deploy/stow pause for user confirmation
 //#define PAUSE_BEFORE_DEPLOY_STOW
@@ -1118,42 +1378,100 @@
 
 // @section machine
 
-#if ENABLED(KNUTWURST_TMC)
-// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
-#define INVERT_X_DIR false // set to true for stock drivers or TMC2208 with reversed connectors
-#define INVERT_Y_DIR true // set to false for stock drivers or TMC2208 with reversed connectors
-#define INVERT_Z_DIR true // set to false for stock drivers or TMC2208 with reversed connectors
+#if DISABLED(KNUTWURST_TMC)
 
-// @section extruder
+    #if ENABLED(KNUTWURST_MEGA) || ENABLED(KNUTWURST_MEGA_S) || ENABLED(KNUTWURST_MEGA_X)
+        // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
+        #define INVERT_X_DIR true // set to true for stock drivers or TMC2208 with reversed connectors
+        #define INVERT_Y_DIR false // set to false for stock drivers or TMC2208 with reversed connectors
+        #define INVERT_Z_DIR false // set to false for stock drivers or TMC2208 with reversed connectors
 
-// For direct drive extruder v9 set to true, for geared extruder set to false.
-#define INVERT_E0_DIR true // set to false for stock drivers or TMC2208 with reversed connectors
-#define INVERT_E1_DIR true // set to false for stock drivers or TMC2208 with reversed connectors
-#define INVERT_E2_DIR false
-#define INVERT_E3_DIR false
-#define INVERT_E4_DIR false
-#define INVERT_E5_DIR false
-#define INVERT_E6_DIR false
-#define INVERT_E7_DIR false
+        // @section extruder
+
+        // For direct drive extruder v9 set to true, for geared extruder set to false.
+        #if ENABLED(KNUTWURST_BMG)
+            #define INVERT_E0_DIR true // set to false for stock drivers or TMC2208 with reversed connectors
+        #else
+            #define INVERT_E0_DIR false // set to false for stock drivers or TMC2208 with reversed connectors
+        #endif
+        #define INVERT_E1_DIR false // set to false for stock drivers or TMC2208 with reversed connectors
+        #define INVERT_E2_DIR false
+        #define INVERT_E3_DIR false
+        #define INVERT_E4_DIR false
+        #define INVERT_E5_DIR false
+        #define INVERT_E6_DIR false
+        #define INVERT_E7_DIR false
+    #endif
+
+    #if ENABLED(KNUTWURST_MEGA_P)
+        // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
+        #define INVERT_X_DIR false // set to true for stock drivers or TMC2208 with reversed connectors
+        #define INVERT_Y_DIR true // set to false for stock drivers or TMC2208 with reversed connectors
+        #define INVERT_Z_DIR false // set to false for stock drivers or TMC2208 with reversed connectors
+
+        // @section extruder
+
+        // For direct drive extruder v9 set to true, for geared extruder set to false.
+        #if ENABLED(KNUTWURST_BMG)
+            #define INVERT_E0_DIR true // set to false for stock drivers or TMC2208 with reversed connectors
+        #else
+            #define INVERT_E0_DIR false // set to false for stock drivers or TMC2208 with reversed connectors
+        #endif
+        #define INVERT_E1_DIR false // set to false for stock drivers or TMC2208 with reversed connectors
+        #define INVERT_E2_DIR false
+        #define INVERT_E3_DIR false
+        #define INVERT_E4_DIR false
+        #define INVERT_E5_DIR false
+        #define INVERT_E6_DIR false
+        #define INVERT_E7_DIR false
+    #endif
 #endif
 
-#if DISABLED(KNUTWURST_TMC)
-// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
-#define INVERT_X_DIR true // set to true for stock drivers or TMC2208 with reversed connectors
-#define INVERT_Y_DIR false // set to false for stock drivers or TMC2208 with reversed connectors
-#define INVERT_Z_DIR false // set to false for stock drivers or TMC2208 with reversed connectors
+#if ENABLED(KNUTWURST_TMC)
+    #if ENABLED(KNUTWURST_MEGA) || ENABLED(KNUTWURST_MEGA_S) || ENABLED(KNUTWURST_MEGA_X)
+        // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
+        #define INVERT_X_DIR false // set to true for stock drivers or TMC2208 with reversed connectors
+        #define INVERT_Y_DIR true // set to false for stock drivers or TMC2208 with reversed connectors
+        #define INVERT_Z_DIR true // set to false for stock drivers or TMC2208 with reversed connectors
 
-// @section extruder
+        // @section extruder
 
-// For direct drive extruder v9 set to true, for geared extruder set to false.
-#define INVERT_E0_DIR false // set to false for stock drivers or TMC2208 with reversed connectors
-#define INVERT_E1_DIR false // set to false for stock drivers or TMC2208 with reversed connectors
-#define INVERT_E2_DIR false
-#define INVERT_E3_DIR false
-#define INVERT_E4_DIR false
-#define INVERT_E5_DIR false
-#define INVERT_E6_DIR false
-#define INVERT_E7_DIR false
+        // For direct drive extruder v9 set to true, for geared extruder set to false.
+        #if ENABLED(KNUTWURST_BMG)
+            #define INVERT_E0_DIR false // set to false for stock drivers or TMC2208 with reversed connectors
+        #else
+            #define INVERT_E0_DIR true // set to false for stock drivers or TMC2208 with reversed connectors
+        #endif
+        #define INVERT_E1_DIR true // set to false for stock drivers or TMC2208 with reversed connectors
+        #define INVERT_E2_DIR false
+        #define INVERT_E3_DIR false
+        #define INVERT_E4_DIR false
+        #define INVERT_E5_DIR false
+        #define INVERT_E6_DIR false
+        #define INVERT_E7_DIR false
+    #endif
+    #if ENABLED(KNUTWURST_MEGA_P)
+        // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
+        #define INVERT_X_DIR false // set to true for stock drivers or TMC2208 with reversed connectors
+        #define INVERT_Y_DIR true // set to false for stock drivers or TMC2208 with reversed connectors
+        #define INVERT_Z_DIR true // set to false for stock drivers or TMC2208 with reversed connectors
+
+        // @section extruder
+
+        // For direct drive extruder v9 set to true, for geared extruder set to false.
+        #if ENABLED(KNUTWURST_BMG)
+            #define INVERT_E0_DIR false // set to false for stock drivers or TMC2208 with reversed connectors
+        #else
+            #define INVERT_E0_DIR true // set to false for stock drivers or TMC2208 with reversed connectors
+        #endif
+        #define INVERT_E1_DIR true // set to false for stock drivers or TMC2208 with reversed connectors
+        #define INVERT_E2_DIR false
+        #define INVERT_E3_DIR false
+        #define INVERT_E4_DIR false
+        #define INVERT_E5_DIR false
+        #define INVERT_E6_DIR false
+        #define INVERT_E7_DIR false
+    #endif
 #endif
 
 // @section homing
@@ -1176,16 +1494,25 @@
 // @section machine
 
 // The size of the print bed
-#define X_BED_SIZE 215
-#define Y_BED_SIZE 215
+#if ENABLED(KNUTWURST_MEGA) || ENABLED(KNUTWURST_MEGA_S) || ENABLED(KNUTWURST_MEGA_P)
+    #define X_BED_SIZE 225
+    #define Y_BED_SIZE 220
+    #define Z_BED_HEIGHT 210
+#endif
+
+#if ENABLED(KNUTWURST_MEGA_X)
+    #define X_BED_SIZE 310
+    #define Y_BED_SIZE 310
+    #define Z_BED_HEIGHT 305
+#endif
 
 // Travel limits (mm) after homing, corresponding to endstop positions.
-#define X_MIN_POS -5
+#define X_MIN_POS 0
 #define Y_MIN_POS 0
 #define Z_MIN_POS 0
 #define X_MAX_POS X_BED_SIZE
 #define Y_MAX_POS Y_BED_SIZE
-#define Z_MAX_POS 205
+#define Z_MAX_POS Z_BED_HEIGHT
 
 /**
  * Software Endstops
@@ -1286,11 +1613,21 @@
  *   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.
  */
-//#define AUTO_BED_LEVELING_3POINT
-//#define AUTO_BED_LEVELING_LINEAR
-//#define AUTO_BED_LEVELING_BILINEAR
-//#define AUTO_BED_LEVELING_UBL
-#define MESH_BED_LEVELING
+#if ENABLED(KNUTWURST_BLTOUCH)
+    //#define AUTO_BED_LEVELING_3POINT
+    //#define AUTO_BED_LEVELING_LINEAR
+    #define AUTO_BED_LEVELING_BILINEAR
+    //#define AUTO_BED_LEVELING_UBL
+    //#define MESH_BED_LEVELING
+#endif
+
+#if DISABLED(KNUTWURST_BLTOUCH)
+    //#define AUTO_BED_LEVELING_3POINT
+    //#define AUTO_BED_LEVELING_LINEAR
+    //#define AUTO_BED_LEVELING_BILINEAR
+    //#define AUTO_BED_LEVELING_UBL
+    #define MESH_BED_LEVELING
+#endif
 
 /**
  * Normally G28 leaves leveling disabled on completion. Enable
@@ -1303,7 +1640,9 @@
  * Turn on with the command 'M111 S32'.
  * NOTE: Requires a lot of PROGMEM!
  */
-//#define DEBUG_LEVELING_FEATURE
+#if ENABLED(KNUTWURST_DEBUG)
+#define DEBUG_LEVELING_FEATURE
+#endif
 
 #if ANY(MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL)
   // Gradually reduce leveling correction until a set height is reached,
@@ -1335,7 +1674,7 @@
 #if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR)
 
   // Set the number of grid points per dimension.
-  #define GRID_MAX_POINTS_X 3
+  #define GRID_MAX_POINTS_X 5
   #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
 
   // Probe along the Y axis, advancing X after each column
@@ -1447,9 +1786,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)
-#define HOMING_FEEDRATE_XY (50*60)
-#define HOMING_FEEDRATE_Z  (4*60)
+#if ENABLED(KNUTWURST_MEGA) || ENABLED(KNUTWURST_MEGA_S) || ENABLED(KNUTWURST_MEGA_P)
+    // Homing speeds (mm/m)
+    #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
@@ -1839,7 +2187,7 @@
 //
 // Short 2KHz beep when endstops are hit
 //
-#define ENDSTOP_BEEP
+//#define ENDSTOP_BEEP
 
 //
 // The duration and frequency for the UI feedback sound.
@@ -2350,9 +2698,3 @@
 
 // Allow servo angle to be edited and saved to EEPROM
 //#define EDITABLE_SERVO_ANGLES
-
-#define ANYCUBIC_TOUCHSCREEN
-#define ANYCUBIC_FILAMENT_RUNOUT_SENSOR
-//#define ANYCUBIC_TFT_DEBUG
-//#define KNUTWURST_MEGAS_DEBUG
-//#define KNUTWURST_TMC_DEBUG

Marlin/Configuration_adv.h

@@ -423,13 +423,27 @@
  * Multiple extruders can be assigned to the same pin in which case
  * the fan will turn on when any selected extruder is above the threshold.
  */
-#define E0_AUTO_FAN_PIN FAN2_PIN
-#define E1_AUTO_FAN_PIN -1
-#define E2_AUTO_FAN_PIN -1
-#define E3_AUTO_FAN_PIN -1
-#define E4_AUTO_FAN_PIN -1
-#define E5_AUTO_FAN_PIN -1
-#define CHAMBER_AUTO_FAN_PIN -1
+
+#if EITHER(KNUTWURST_MEGA, KNUTWURST_MEGA_S)
+    #define E0_AUTO_FAN_PIN FAN2_PIN
+    #define E1_AUTO_FAN_PIN -1
+    #define E2_AUTO_FAN_PIN -1
+    #define E3_AUTO_FAN_PIN -1
+    #define E4_AUTO_FAN_PIN -1
+    #define E5_AUTO_FAN_PIN -1
+    #define CHAMBER_AUTO_FAN_PIN -1
+#endif
+
+#if ENABLED(KNUTWURST_MEGAX)
+    #define E0_AUTO_FAN_PIN -1
+    #define E1_AUTO_FAN_PIN -1
+    #define E2_AUTO_FAN_PIN -1
+    #define E3_AUTO_FAN_PIN -1
+    #define E4_AUTO_FAN_PIN -1
+    #define E5_AUTO_FAN_PIN -1
+    #define CHAMBER_AUTO_FAN_PIN -1
+#endif
+
 
 #define EXTRUDER_AUTO_FAN_TEMPERATURE 50
 #define EXTRUDER_AUTO_FAN_SPEED 255   // 255 == full speed
@@ -523,19 +537,21 @@
 #define NUM_Z_STEPPER_DRIVERS 2   // (1-4) Z options change based on how many
 
 #if NUM_Z_STEPPER_DRIVERS > 1
-  #define Z_MULTI_ENDSTOPS
-  #if ENABLED(Z_MULTI_ENDSTOPS)
-    #define Z2_USE_ENDSTOP          _XMAX_
-    #define Z2_ENDSTOP_ADJUSTMENT   0
-    #if NUM_Z_STEPPER_DRIVERS >= 3
-      #define Z3_USE_ENDSTOP        _YMAX_
-      #define Z3_ENDSTOP_ADJUSTMENT 0
-    #endif
-    #if NUM_Z_STEPPER_DRIVERS >= 4
-      #define Z4_USE_ENDSTOP        _ZMAX_
-      #define Z4_ENDSTOP_ADJUSTMENT 0
-    #endif
+  #if DISABLED(KNUTWURST_ONE_Z_ENDSTOP)
+    #define Z_MULTI_ENDSTOPS
   #endif
+    #if ENABLED(Z_MULTI_ENDSTOPS)
+      #define Z2_USE_ENDSTOP          _XMAX_
+      #define Z2_ENDSTOP_ADJUSTMENT   0
+      #if NUM_Z_STEPPER_DRIVERS >= 3
+        #define Z3_USE_ENDSTOP        _YMAX_
+        #define Z3_ENDSTOP_ADJUSTMENT 0
+      #endif
+      #if NUM_Z_STEPPER_DRIVERS >= 4
+        #define Z4_USE_ENDSTOP        _ZMAX_
+        #define Z4_ENDSTOP_ADJUSTMENT 0
+      #endif
+    #endif
 #endif
 
 /**
@@ -1471,7 +1487,9 @@
  *
  * Warning: Does not respect endstops!
  */
-//#define BABYSTEPPING
+#if ENABLED(KNUTWURST_BLTOUCH)
+    #define BABYSTEPPING
+#endif
 #if ENABLED(BABYSTEPPING)
   //#define INTEGRATED_BABYSTEPPING         // EXPERIMENTAL integration of babystepping into the Stepper ISR
   //#define BABYSTEP_WITHOUT_HOMING
@@ -1520,6 +1538,7 @@
  */
 #define LIN_ADVANCE
 #if ENABLED(LIN_ADVANCE)
+  //#define EXTRA_LIN_ADVANCE_K // Enable for second linear advance constants
   #define LIN_ADVANCE_K 0	  // Unit: mm compression per 1mm/s extruder speed
   //#define LA_DEBUG          // If enabled, this will generate debug information output over USB.
 #endif
@@ -1556,12 +1575,23 @@
  * probe points will follow. This prevents any change from causing
  * the probe to be unable to reach any points.
  */
+#if ENABLED(KNUTWURST_BLTOUCH)
+#if PROBE_SELECTED && !IS_KINEMATIC
+  #define MIN_PROBE_EDGE_LEFT 10
+  #define MIN_PROBE_EDGE_RIGHT 10
+  #define MIN_PROBE_EDGE_FRONT 10
+  #define MIN_PROBE_EDGE_BACK 10
+#endif
+#endif
+
+#if DISABLED(KNUTWURST_BLTOUCH)
 #if PROBE_SELECTED && !IS_KINEMATIC
   //#define MIN_PROBE_EDGE_LEFT MIN_PROBE_EDGE
   //#define MIN_PROBE_EDGE_RIGHT MIN_PROBE_EDGE
   //#define MIN_PROBE_EDGE_FRONT MIN_PROBE_EDGE
   //#define MIN_PROBE_EDGE_BACK MIN_PROBE_EDGE
 #endif
+#endif
 
 #if EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
   // Override the mesh area if the automatic (max) area is too large

Marlin/Version.h

@@ -28,7 +28,7 @@
 /**
  * Marlin release version identifier
  */
-//#define SHORT_BUILD_VERSION "2.0.5.3"
+//#define SHORT_BUILD_VERSION "2.0.5.4"
 
 /**
  * Verbose version identifier which should contain a reference to the location
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2020-01-31"
+//#define STRING_DISTRIBUTION_DATE "2020-07-09"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.

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/core/types.h

@@ -347,14 +347,14 @@ struct XYZval {
   FI XYZval<T>  operator* (const XYZEval<T> &rs)       { XYZval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; ls.z *= rs.z; return ls; }
   FI XYZval<T>  operator/ (const XYZEval<T> &rs) const { XYZval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z; return ls; }
   FI XYZval<T>  operator/ (const XYZEval<T> &rs)       { XYZval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z; return ls; }
-  FI XYZval<T>  operator* (const float &v)       const { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= z;    return ls; }
-  FI XYZval<T>  operator* (const float &v)             { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= z;    return ls; }
-  FI XYZval<T>  operator* (const int &v)         const { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= z;    return ls; }
-  FI XYZval<T>  operator* (const int &v)               { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= z;    return ls; }
-  FI XYZval<T>  operator/ (const float &v)       const { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= z;    return ls; }
-  FI XYZval<T>  operator/ (const float &v)             { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= z;    return ls; }
-  FI XYZval<T>  operator/ (const int &v)         const { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= z;    return ls; }
-  FI XYZval<T>  operator/ (const int &v)               { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= z;    return ls; }
+  FI XYZval<T>  operator* (const float &v)       const { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= v;    return ls; }
+  FI XYZval<T>  operator* (const float &v)             { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= v;    return ls; }
+  FI XYZval<T>  operator* (const int &v)         const { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= v;    return ls; }
+  FI XYZval<T>  operator* (const int &v)               { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= v;    return ls; }
+  FI XYZval<T>  operator/ (const float &v)       const { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= v;    return ls; }
+  FI XYZval<T>  operator/ (const float &v)             { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= v;    return ls; }
+  FI XYZval<T>  operator/ (const int &v)         const { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= v;    return ls; }
+  FI XYZval<T>  operator/ (const int &v)               { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= v;    return ls; }
   FI XYZval<T>  operator>>(const int &v)         const { XYZval<T> ls = *this; _RS(ls.x); _RS(ls.y); _RS(ls.z); return ls; }
   FI XYZval<T>  operator>>(const int &v)               { XYZval<T> ls = *this; _RS(ls.x); _RS(ls.y); _RS(ls.z); return ls; }
   FI XYZval<T>  operator<<(const int &v)         const { XYZval<T> ls = *this; _LS(ls.x); _LS(ls.y); _LS(ls.z); return ls; }

Marlin/src/inc/Version.h

@@ -25,23 +25,26 @@
  * Release version. Leave the Marlin version or apply a custom scheme.
  */
 #ifndef SHORT_BUILD_VERSION
-  #define SHORT_BUILD_VERSION "2.0.5.3"
+  #define SHORT_BUILD_VERSION "2.0.5.4"
 #endif
 
-  /**
-   * Verbose version identifier which should contain a reference to the location
-   * from where the binary was downloaded or the source code was compiled.
-   */
+/**
+ * Verbose version identifier containing a unique identifier, such as the
+ * vendor name, download location, GitHub account, etc.
+ */
+#ifndef DETAILED_BUILD_VERSION
   #define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " (knutwurst, Github)"
+#endif
 
 /**
- * Defines the version of the Marlin build. Not to be confused with
- * Marlin's own build number, e.g. 2.0.x.
+ * The STRING_DISTRIBUTION_DATE represents when the binary file was built,
+ * here we define this default string as the date where the latest release
+ * version was tagged.
  */
- #define CUSTOM_BUILD_VERSION "1.0.5"
+ #define CUSTOM_BUILD_VERSION "1.1.6"
 
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-31"
+  #define STRING_DISTRIBUTION_DATE "2020-09-11"
 #endif
 
 /**
@@ -68,18 +71,21 @@
   #define PROTOCOL_VERSION "1.0"
 #endif
 
-  /**
-   * Defines a generic printer name to be output to the LCD after booting Marlin.
-   */
+/**
+ * Define a generic printer name to be output to the LCD after booting Marlin.
+ */
+#ifndef MACHINE_NAME
   #define MACHINE_NAME "Knutwurst's Anycubic i3 MEGA"
+#endif
 
-  /**
-   * The SOURCE_CODE_URL is the location where users will find the Marlin Source
-   * Code which is installed on the device. In most cases —unless the manufacturer
-   * has a distinct Github fork— the Source Code URL should just be the main
-   * Marlin repository.
-   */
+/**
+ * Website where users can find Marlin source code for the binary installed on the
+ * device. Override this if you provide public source code download. (GPLv3 requires
+ * providing the source code to your customers.)
+ */
+#ifndef SOURCE_CODE_URL
   #define SOURCE_CODE_URL "https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S"
+#endif
 
 /**
  * Default generic printer UUID.

Marlin/src/lcd/HardwareSerial.cpp

@@ -37,6 +37,8 @@
 
 #include "HardwareSerial.h"
 
+millis_t previous_cmd_ms = 0;
+
 // Define constants and variables for buffering incoming serial data.  We're
 // using a ring buffer (I think), in which head is the index of the location
 // to which to write the next incoming character and tail is the index of the

Marlin/src/lcd/anycubic_touchscreen.cpp

@@ -54,11 +54,9 @@ int Temp_Buf_Bed_Temperature = 0;
 unsigned char ResumingFlag = 0;
 #endif
 
-#define MAX_PRINTABLE_FILENAME_LEN 21
-
 void setup_OutageTestPin()
 {
-#if defined(POWER_OUTAGE_TEST)
+#ifdef POWER_OUTAGE_TEST
   pinMode(OUTAGETEST_PIN, INPUT);
   pinMode(OUTAGECON_PIN, OUTPUT);
   WRITE(OUTAGECON_PIN, LOW);
@@ -112,6 +110,7 @@ AnycubicTouchscreenClass::AnycubicTouchscreenClass()
 void AnycubicTouchscreenClass::Setup()
 {
   HardwareSerial.begin(115200);
+  HARDWARE_SERIAL_ENTER();
   HARDWARE_SERIAL_PROTOCOLPGM("J17"); // J17 Main board reset
   HARDWARE_SERIAL_ENTER();
   delay(10);
@@ -122,11 +121,11 @@ void AnycubicTouchscreenClass::Setup()
   pinMode(SD_DETECT_PIN, INPUT);
   WRITE(SD_DETECT_PIN, HIGH);
 #endif
+  pinMode(FILAMENT_RUNOUT_PIN, INPUT);
+  WRITE(FILAMENT_RUNOUT_PIN, HIGH);
 
 #if ENABLED(ANYCUBIC_FILAMENT_RUNOUT_SENSOR)
-  pinMode(19, INPUT);
-  WRITE(19, HIGH);
-  if ((READ(19) == true) && FilamentSensorEnabled)
+  if ((READ(FILAMENT_RUNOUT_PIN) == true) && FilamentSensorEnabled)
   {
     HARDWARE_SERIAL_PROTOCOLPGM("J15"); //J15 FILAMENT LACK
     HARDWARE_SERIAL_ENTER();
@@ -136,9 +135,14 @@ void AnycubicTouchscreenClass::Setup()
   }
 #endif
 
-  SelectedDirectory[0] = 0;
+  currentTouchscreenSelection[0] = 0;
+  currentFileOrDirectory[0] = '\0';
   SpecialMenu = false;
+  MMLMenu = false;
+  FlowMenu = false;
   FilamentSensorEnabled = true;
+  MyFileNrCnt = 0;
+  currentFlowRate = 100;
 
 #ifdef STARTUP_CHIME
   buzzer.tone(100, 554);
@@ -302,19 +306,21 @@ void AnycubicTouchscreenClass::PausePrint()
   TFTstate = ANYCUBIC_TFT_STATE_SDPAUSE_REQ;
 }
 
-void AnycubicTouchscreenClass::StopPrint()
+inline void AnycubicTouchscreenClass::StopPrint()
 {
   // stop print, disable heaters
   wait_for_user = false;
   wait_for_heatup = false;
-  card.endFilePrint();
-  card.closefile();
-#ifdef ANYCUBIC_TFT_DEBUGANYCUBIC_TFT_STATE_SDSTOP_REQ
+  IsParked = false;
+  if(card.isFileOpen) {
+    card.endFilePrint();
+    card.closefile();
+  }
+#ifdef ANYCUBIC_TFT_DEBUG
   SERIAL_ECHOLNPGM("DEBUG: Stopped and cleared");
 #endif
   print_job_timer.stop();
   thermalManager.disable_all_heaters();
-  IsParked = false;
   ai3m_pause_state = 0;
 #ifdef ANYCUBIC_TFT_DEBUG
   SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
@@ -374,6 +380,7 @@ void AnycubicTouchscreenClass::ReheatNozzle()
 
   // enable heaters again
   HOTEND_LOOP()
+  thermalManager.reset_hotend_idle_timer(e);
 #ifdef ANYCUBIC_TFT_DEBUG
   SERIAL_ECHOLNPGM("DEBUG: Clear flags");
 #endif
@@ -409,8 +416,8 @@ void AnycubicTouchscreenClass::ParkAfterStop()
     SERIAL_ECHOLNPGM("DEBUG: SDSTOP: Park XY");
 #endif
   }
-  queue.inject_P(PSTR("M84")); // disable stepper motors
-  queue.inject_P(PSTR("M27")); // force report of SD status
+  queue.enqueue_now_P(PSTR("M84")); // disable stepper motors
+  queue.enqueue_now_P(PSTR("M27")); // force report of SD status
   ai3m_pause_state = 0;
 #ifdef ANYCUBIC_TFT_DEBUG
   SERIAL_ECHOPAIR(" DEBUG: AI3M Pause State: ", ai3m_pause_state);
@@ -431,90 +438,139 @@ bool AnycubicTouchscreenClass::CodeSeen(char code)
 
 void AnycubicTouchscreenClass::HandleSpecialMenu()
 {
-  if (strcmp(SelectedDirectory, "<special menu>") == 0)
+#ifdef ANYCUBIC_TFT_DEBUG
+    SERIAL_ECHOPAIR(" DEBUG: Special Menu Selection: ", currentTouchscreenSelection);
+    SERIAL_EOL();
+#endif
+  if ((strcasestr(currentTouchscreenSelection, SM_SPECIAL_MENU_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_SPECIAL_MENU_S) != NULL))
   {
     SpecialMenu = true;
   }
-  else if (strcmp(SelectedDirectory, "<pid tune hotend>") == 0)
+  else if ((strcasestr(currentTouchscreenSelection, SM_PID_HOTEND_L) != NULL)
+  || (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 (strcmp(SelectedDirectory, "<pid tune ultrabase>") == 0)
+  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 (strcmp(SelectedDirectory, "<save eeprom>") == 0)
+  else if ((strcasestr(currentTouchscreenSelection, SM_SAVE_EEPROM_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_SAVE_EEPROM_S) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: Save EEPROM");
     queue.inject_P(PSTR("M500"));
     buzzer.tone(105, 1108);
     buzzer.tone(210, 1661);
   }
-  else if (strcmp(SelectedDirectory, "<load fw defaults>") == 0)
+  else if ((strcasestr(currentTouchscreenSelection, SM_LOAD_DEFAULTS_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_LOAD_DEFAULTS_S) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: Load FW Defaults");
     queue.inject_P(PSTR("M502"));
     buzzer.tone(105, 1661);
     buzzer.tone(210, 1108);
   }
-  else if (strcmp(SelectedDirectory, "<preheat ultrabase>") == 0)
+  else if ((strcasestr(currentTouchscreenSelection, SM_PREHEAT_BED_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_PREHEAT_BED_S) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: Preheat Ultrabase");
     queue.inject_P(PSTR("M140 S60"));
   }
-  else if (strcmp(SelectedDirectory, "<start mesh leveling>") == 0)
+
+#if DISABLED(KNUTWURST_BLTOUCH)
+  else if ((strcasestr(currentTouchscreenSelection, SM_MESH_MENU_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_MESH_MENU_S) != NULL))
+  {
+    MMLMenu = true;
+  }
+  else if ((strcasestr(currentTouchscreenSelection, SM_MESH_START_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_MESH_START_S) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: Start Mesh Leveling");
     queue.inject_P(PSTR("G29 S1"));
   }
-  else if (strcmp(SelectedDirectory, "<next mesh point>") == 0)
+  else if ((strcasestr(currentTouchscreenSelection, SM_MESH_NEXT_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_MESH_NEXT_S) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: Next Mesh Point");
     queue.inject_P(PSTR("G29 S2"));
   }
-  else if (strcmp(SelectedDirectory, "<z up 0.1>") == 0)
+  else if ((strcasestr(currentTouchscreenSelection, SM_Z_UP_01_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_Z_UP_01_S) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: Z Up 0.1");
     queue.inject_P(PSTR("G91\nG1 Z+0.1\nG90"));
   }
-  else if (strcmp(SelectedDirectory, "<z down 0.1>") == 0)
+  else if ((strcasestr(currentTouchscreenSelection, SM_Z_DN_01_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_Z_DN_01_S) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: Z Down 0.1");
     queue.inject_P(PSTR("G91\nG1 Z-0.1\nG90"));
   }
-  else if (strcmp(SelectedDirectory, "<z up 0.02>") == 0)
+  else if ((strcasestr(currentTouchscreenSelection, SM_Z_UP_002_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_Z_UP_002_S) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: Z Up 0.02");
     queue.inject_P(PSTR("G91\nG1 Z+0.02\nG90"));
   }
-  else if (strcmp(SelectedDirectory, "<z down 0.02>") == 0)
+  else if ((strcasestr(currentTouchscreenSelection, SM_Z_DN_002_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_Z_DN_002_S) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: Z Down 0.02");
     queue.inject_P(PSTR("G91\nG1 Z-0.02\nG90"));
   }
-  else if (strcmp(SelectedDirectory, "<z up 0.01>") == 0)
+  else if ((strcasestr(currentTouchscreenSelection, SM_Z_UP_001_L) != NULL)
+  || (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"));
   }
-  else if (strcmp(SelectedDirectory, "<z down 0.01>") == 0)
+  else if ((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"));
   }
-  else if (strcmp(SelectedDirectory, "<fil. change pause>") == 0)
+#endif
+
+#if ENABLED(KNUTWURST_BLTOUCH)
+  else if ((strcasestr(currentTouchscreenSelection, SM_BLTOUCH_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_BLTOUCH_S) != NULL))
+  {
+    SERIAL_ECHOLNPGM("Special Menu: BLTouch Leveling");
+    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
+
+  else if ((strcasestr(currentTouchscreenSelection, SM_PAUSE_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_PAUSE_L) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: Fil. Change Pause");
     FilamentChangePause();
   }
-  else if (strcmp(SelectedDirectory, "<fil. change resume>") == 0)
+  else if ((strcasestr(currentTouchscreenSelection, SM_RESUME_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_RESUME_S) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: Fil. Change Resume");
     FilamentChangeResume();
   }
-  else if (strcmp(SelectedDirectory, "<disable fil. sensor>") == 0)
+  else if ((strcasestr(currentTouchscreenSelection, SM_DIS_FILSENS_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_DIS_FILSENS_S) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: Disable Filament Sensor");
     FilamentSensorEnabled = false;
@@ -522,94 +578,205 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
     buzzer.tone(105, 1108);
     buzzer.tone(105, 1108);
   }
-  else if (strcmp(SelectedDirectory, "<enable fil. sensor>") == 0)
+  else if ((strcasestr(currentTouchscreenSelection, SM_EN_FILSENS_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_EN_FILSENS_S) != NULL))
   {
     SERIAL_ECHOLNPGM("Special Menu: Enable Filament Sensor");
     FilamentSensorEnabled = true;
     buzzer.tone(105, 1108);
     buzzer.tone(105, 1108);
   }
-  else if (strcmp(SelectedDirectory, "<exit>") == 0)
+  else if ((strcasestr(currentTouchscreenSelection, SM_EXIT_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_EXIT_S) != NULL))
   {
     SpecialMenu = false;
   }
+  else if ((strcasestr(currentTouchscreenSelection, SM_BACK_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_BACK_S) != NULL))
+  {
+    MMLMenu = false;
+  } 
+  else if ((strcasestr(currentTouchscreenSelection, SM_FLOWMENU_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_FLOWMENU_S) != NULL))
+  {
+    SERIAL_ECHOLNPGM("Special Menu: Enter Flow Menu");
+    FlowMenu = true;
+  } 
+  else if ((strcasestr(currentTouchscreenSelection, SM_FLOW_UP_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_FLOW_UP_S) != NULL))
+  {
+    SERIAL_ECHOLNPGM("Special Menu: Flow UP");
+    currentFlowRate = currentFlowRate + 5;
+
+    if(currentFlowRate > 800)
+       currentFlowRate = 800;
+
+    char value[30];
+    sprintf_P(value, PSTR("M221 S%i"), currentFlowRate);
+    queue.enqueue_one_now(value);
+
+  } 
+  else if ((strcasestr(currentTouchscreenSelection, SM_FLOW_DN_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_FLOW_DN_S) != NULL))
+  {
+    SERIAL_ECHOLNPGM("Special Menu: Flow Down");
+    currentFlowRate = currentFlowRate - 5;
+
+    if(currentFlowRate < 5)
+       currentFlowRate = 5;
+
+    char value[30];
+    sprintf_P(value, PSTR("M221 S%i"), currentFlowRate);
+    queue.enqueue_one_now(value);
+  }  
+  else if ((strcasestr(currentTouchscreenSelection, SM_FLOW_EXIT_L) != NULL)
+  || (strcasestr(currentTouchscreenSelection, SM_FLOW_EXIT_S) != NULL))
+  {
+    SERIAL_ECHOLNPGM("Special Menu: Exit Flow Menu");
+    FlowMenu = false;
+  }
 }
 
-void AnycubicTouchscreenClass::AnycubicTouchscreen()
+
+void AnycubicTouchscreenClass::PrintList()
 {
-  if (SpecialMenu)
+  if(MMLMenu)
+  {
+    switch (filenumber)
+    {
+        case 0: // Page 1
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_MESH_START_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_MESH_START_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);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_UP_002_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_Z_UP_002_L);
+        break;
+
+        case 4: // Page 2
+          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);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_MESH_NEXT_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_MESH_NEXT_L);
+          break;
+
+        case 8: // Page 2
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_SAVE_EEPROM_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_SAVE_EEPROM_L);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_BACK_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_BACK_L);
+          break;
+        
+        default:
+        break;
+      }
+  }
+  else if(FlowMenu)
+  {
+    String blah = SM_FLOW_DISP_L;
+    blah.replace("XXX", String(currentFlowRate));
+    
+    switch (filenumber)
+    {
+        case 0: // Page 1
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_FLOW_DISP_S);
+          HARDWARE_SERIAL_PROTOCOLLN(blah);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_FLOW_UP_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_FLOW_UP_L);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_FLOW_DN_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_FLOW_DN_L);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_FLOW_EXIT_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_FLOW_EXIT_L);
+        break;
+
+        default:
+        break;
+      }
+  }
+  else if (SpecialMenu)
   {
     switch (filenumber)
     {
     case 0: // Page 1
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Exit>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Exit>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Preheat Ultrabase>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Preheat Ultrabase>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Fil. Change Pause>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Fil. Change Pause>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Fil. Change Resume>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Fil. Change Resume>");
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_FLOWMENU_S);
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_FLOWMENU_L);
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_PREHEAT_BED_S);
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_PREHEAT_BED_L);
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_PAUSE_S);
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_PAUSE_L);
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_RESUME_S);
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_RESUME_L);
       break;
 
+#if DISABLED(KNUTWURST_BLTOUCH)
     case 4: // Page 2
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Start Mesh Leveling>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Start Mesh Leveling>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Next Mesh Point>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Next Mesh Point>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Z Up 0.1>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Z Up 0.1>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Z Down 0.1>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Z Down 0.1>");
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_MESH_MENU_S);
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_MESH_MENU_L);
+      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);
       break;
 
     case 8: // Page 3
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Z Up 0.02>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Z Up 0.02>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Z Down 0.02>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Z Down 0.02>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Z Up 0.01>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Z Up 0.01>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Z Down 0.01>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Z Down 0.01>");
+      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);
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EN_FILSENS_L);
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EXIT_S);
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EXIT_L);
+      break;
+#endif
+
+#if ENABLED(KNUTWURST_BLTOUCH)
+    case 4: // Page 2
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_BLTOUCH_S);
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_BLTOUCH_L);
+      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_DIS_FILSENS_S);
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_DIS_FILSENS_L);
       break;
 
-    case 12: // Page 4
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<PID Tune Hotend>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<PID Tune Hotend>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<PID Tune Ultrabase>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<PID Tune Ultrabase>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Save EEPROM>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Save EEPROM>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Load FW Defaults>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Load FW Defaults>");
+    case 8: // Page 3
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EN_FILSENS_S);
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EN_FILSENS_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);
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EXIT_S);
+      HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EXIT_L);
       break;
-
-    case 16: // Page 5
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Disable Fil. Sensor>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Disable Fil. Sensor>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Enable Fil. Sensor>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Enable Fil. Sensor>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Exit>");
-      HARDWARE_SERIAL_PROTOCOLLNPGM("<Exit>");
-      break;
-
+#endif
     default:
       break;
     }
   }
-#ifdef SDSUPPORT
+  #ifdef SDSUPPORT
   else if (card.isMounted())
   {
     uint16_t count = filenumber;
     uint16_t max_files;
-    uint16_t dir_files = card.countFilesInWorkDir();
+    uint16_t MyFileNrCnt = card.countFilesInWorkDir();
 
     // What is this shit? What if there are exactely 3 files+folders?
     // TODO: find something better than this crap.
-    if ((dir_files - filenumber) < 4)
+    if ((MyFileNrCnt - filenumber) < 4)
     {
-      max_files = dir_files;
+      max_files = MyFileNrCnt;
     }
     else
     {
@@ -618,21 +785,32 @@ void AnycubicTouchscreenClass::AnycubicTouchscreen()
 
     for (count = filenumber; count <= max_files; count++)
     {
+#ifdef ANYCUBIC_TFT_DEBUG
+      SERIAL_ECHOPGM("filenumber: ");
+      SERIAL_ECHOLN(filenumber);
+      SERIAL_ECHOPGM("max_files: ");
+      SERIAL_ECHOLN(max_files);
+      SERIAL_ECHOPGM("count: ");
+      SERIAL_ECHOLN(count);
+#endif
+
       if (count == 0) // Special Entry
       {
         if (strcmp(card.getWorkDirName(), "/") == 0)
         {
-          HARDWARE_SERIAL_PROTOCOLLNPGM("<Special Menu>");
-          HARDWARE_SERIAL_PROTOCOLLNPGM("<Special Menu>");
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_SPECIAL_MENU_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_SPECIAL_MENU_L);
           SERIAL_ECHO(count);
-          SERIAL_ECHOLNPGM("<Special_Menu>");
+          SERIAL_ECHO(": ");
+          SERIAL_ECHOLNPGM(SM_SPECIAL_MENU_L);
         }
         else
         {
-          HARDWARE_SERIAL_PROTOCOLLNPGM("/..");
-          HARDWARE_SERIAL_PROTOCOLLNPGM("/..");
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_DIR_UP_S);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(SM_DIR_UP_L);
           SERIAL_ECHO(count);
-          SERIAL_ECHOLNPGM("/..");
+          SERIAL_ECHO(": ");
+          SERIAL_ECHOLNPGM(SM_DIR_UP_L);
         }
       }
       else
@@ -645,37 +823,58 @@ void AnycubicTouchscreenClass::AnycubicTouchscreen()
         
         // Cut off too long filenames.
         // They don't fit on the screen anyways.
-        if(fileNameLen > MAX_PRINTABLE_FILENAME_LEN)
-          fileNameLen = MAX_PRINTABLE_FILENAME_LEN;
+        //if(fileNameLen > MAX_PRINTABLE_FILENAME_LEN)
+        //  fileNameLen = MAX_PRINTABLE_FILENAME_LEN;
         
-        char buffer[fileNameLen];
+        char outputString[fileNameLen];
 
-        for (unsigned char i = 0; i < fileNameLen; i++)
+        for (unsigned char i = 0; i <= fileNameLen; i++)
         {
-          buffer[i] = card.longFilename[i];
-          if (!isPrintable(buffer[i]))
+          if(i >= fileNameLen)
           {
-            buffer[i] = '_';
+            outputString[i] = ' ';
+          }
+          else 
+          {
+            outputString[i] = card.longFilename[i];
+            if (!isPrintable(outputString[i]))
+            {
+              outputString[i] = '_';
+            }
           }
         }
-        buffer[fileNameLen] = '\0';
+
+        outputString[fileNameLen] = '\0';        
 
         if (card.flag.filenameIsDir)
         {
+          #if ENABLED(KNUTWURST_DGUS2_TFT)
           HARDWARE_SERIAL_PROTOCOLPGM("/");
-          HARDWARE_SERIAL_PROTOCOLLN(card.filename);
+          HARDWARE_SERIAL_PROTOCOL(card.filename);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(".GCO");
           HARDWARE_SERIAL_PROTOCOLPGM("/");
-          HARDWARE_SERIAL_PROTOCOLLN(buffer);
+          HARDWARE_SERIAL_PROTOCOL(outputString);
+          HARDWARE_SERIAL_PROTOCOLLNPGM(".gcode");
           SERIAL_ECHO(count);
-          SERIAL_ECHOPGM("/");
-          SERIAL_ECHOLN(buffer);
+          SERIAL_ECHOPGM(": /");
+          SERIAL_ECHOLN(outputString);
+          #else
+          HARDWARE_SERIAL_PROTOCOL("/");
+          HARDWARE_SERIAL_PROTOCOLLN(card.filename);
+          HARDWARE_SERIAL_PROTOCOL("/");
+          HARDWARE_SERIAL_PROTOCOLLN(outputString);
+          SERIAL_ECHO(count);
+          SERIAL_ECHOPGM(": /");
+          SERIAL_ECHOLN(outputString);
+          #endif
         }
         else
         {
           HARDWARE_SERIAL_PROTOCOLLN(card.filename);
-          HARDWARE_SERIAL_PROTOCOLLN(buffer);
+          HARDWARE_SERIAL_PROTOCOLLN(outputString);
           SERIAL_ECHO(count);
-          SERIAL_ECHOLN(buffer);
+          SERIAL_ECHOPGM(": ");
+          SERIAL_ECHOLN(outputString);
         }
       }
     }
@@ -683,8 +882,8 @@ void AnycubicTouchscreenClass::AnycubicTouchscreen()
 #endif
   else
   {
-    HARDWARE_SERIAL_PROTOCOLLNPGM("<Special_Menu>");
-    HARDWARE_SERIAL_PROTOCOLLNPGM("<Special_Menu>");
+    HARDWARE_SERIAL_PROTOCOLLNPGM(SM_SPECIAL_MENU_S);
+    HARDWARE_SERIAL_PROTOCOLLNPGM(SM_SPECIAL_MENU_L);
   }
 }
 
@@ -850,7 +1049,7 @@ void AnycubicTouchscreenClass::StateHandler()
     // did we park the hotend already?
     if ((!IsParked) && (!card.isPrinting()) && (!planner.movesplanned()))
     {
-      queue.inject_P(PSTR("G91\nG1 E-1 F1800\nG90")); //retract
+      queue.enqueue_now_P(PSTR("G91\nG1 E-1 F1800\nG90")); //retract
       ParkAfterStop();
       IsParked = true;
     }
@@ -866,7 +1065,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)
     {
@@ -880,8 +1079,8 @@ void AnycubicTouchscreenClass::FilamentRunout()
 #ifdef ANYCUBIC_TFT_DEBUG
         SERIAL_ECHOLNPGM("DEBUG: Set filament trigger time");
 #endif
-        // set the delayed timestamp to 3000ms later
-        fil_delay = fil_ms + 3000UL;
+        // set the delayed timestamp to 5000ms later
+        fil_delay = fil_ms + 5000UL;
         // this doesn't need to run until the filament is recovered again
         FilamentSetMillis = false;
       }
@@ -893,7 +1092,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())
           {
@@ -930,36 +1129,72 @@ void AnycubicTouchscreenClass::FilamentRunout()
   }
 }
 
+
+static boolean TFTcomment_mode = false;
+
 void AnycubicTouchscreenClass::GetCommandFromTFT()
 {
+  
   char *starpos = NULL;
-  while (HardwareSerial.available() > 0 && TFTbuflen < TFTBUFSIZE)
-  {
-    serial3_char = HardwareSerial.read();
-    if (serial3_char == '\n' ||
-        serial3_char == '\r' ||
-        serial3_char == ':' ||
-        serial3_count >= (TFT_MAX_CMD_SIZE - 1))
+  while( HardwareSerial.available() > 0  && TFTbuflen < TFTBUFSIZE)
+  {        
+    serial3_char = HardwareSerial.read();   
+    if(serial3_char == '\n' || serial3_char == '\r' || (serial3_char == ':' && TFTcomment_mode == false) || serial3_count >= (TFT_MAX_CMD_SIZE - 1) )
     {
-      if (!serial3_count)
-      { //if empty line
+        if(!serial3_count) { //if empty line
+        TFTcomment_mode = false; //for new command
         return;
-      }
+    }
+    
+    TFTcmdbuffer[TFTbufindw][serial3_count] = 0; //terminate string
+    if(!TFTcomment_mode)
+    {
+        TFTcomment_mode = false; //for new command
 
-      TFTcmdbuffer[TFTbufindw][serial3_count] = 0; //terminate string
-
-      if ((strchr(TFTcmdbuffer[TFTbufindw], 'A') != NULL))
+        if(strchr(TFTcmdbuffer[TFTbufindw], 'N') != NULL)
+        {
+          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;
+                  HardwareSerial.flush();
+                  HARDWARE_SERIAL_ERROR_START;
+                  HardwareSerial.flush();
+                  serial3_count = 0;
+                  return;
+              }
+            //if no errors, continue parsing
+          }
+          else
+          {
+            HARDWARE_SERIAL_ERROR_START;
+            HardwareSerial.flush();
+            serial3_count = 0;
+            return;
+          }
+       //if no errors, continue parsing
+       }
+       else  // if we don't receive 'N' but still see '*'
+       {
+          if((strchr(TFTcmdbuffer[TFTbufindw], '*') != NULL))
+          {
+              HARDWARE_SERIAL_ERROR_START;
+              serial3_count = 0;
+              return;
+          }
+       }
+      
+      
+      if((strchr(TFTcmdbuffer[TFTbufindw], 'A') != NULL))
       {
-        int16_t a_command;
         TFTstrchr_pointer = strchr(TFTcmdbuffer[TFTbufindw], 'A');
-        a_command = ((int)((strtod(&TFTcmdbuffer[TFTbufindw][TFTstrchr_pointer - TFTcmdbuffer[TFTbufindw] + 1], NULL))));
-
-#ifdef ANYCUBIC_TFT_DEBUG
-        if ((a_command > 7) && (a_command != 20)) // No debugging of status polls, please!
-          SERIAL_ECHOLNPAIR("TFT Serial Command: ", TFTcmdbuffer[TFTbufindw]);
-#endif
-
-        switch (a_command)
+        switch((int)((strtod(&TFTcmdbuffer[TFTbufindw][TFTstrchr_pointer - TFTcmdbuffer[TFTbufindw] + 1], NULL))))
         {
 
         case 0: //A0 GET HOTEND TEMP
@@ -1023,7 +1258,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
             }
             else
             {
-              HARDWARE_SERIAL_PROTOCOLPGM("J02");
+              HARDWARE_SERIAL_PROTOCOLPGM("J02");  // J02 SD Card initilized
             }
           }
           else
@@ -1056,23 +1291,17 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
         }
         case 8: // A8 GET SD LIST
 #ifdef SDSUPPORT
-          SelectedDirectory[0] = 0;
-          if (!IS_SD_INSERTED())
-          {
-            HARDWARE_SERIAL_PROTOCOLPGM("J02");
-            HARDWARE_SERIAL_ENTER();
-          }
-          else
-          {
-            if (CodeSeen('S'))
-              filenumber = CodeValue();
+          currentTouchscreenSelection[0] = 0;
 
-            HARDWARE_SERIAL_PROTOCOLPGM("FN "); // Filelist start
-            HARDWARE_SERIAL_ENTER();
-            AnycubicTouchscreen();
-            HARDWARE_SERIAL_PROTOCOLPGM("END"); // Filelist stop
-            HARDWARE_SERIAL_ENTER();
-          }
+          if (CodeSeen('S'))
+            filenumber = CodeValue();
+            
+          HARDWARE_SERIAL_PROTOCOLPGM("FN "); // Filelist start
+          HARDWARE_SERIAL_ENTER();
+          PrintList();
+          HARDWARE_SERIAL_PROTOCOLPGM("END"); // Filelist stop
+          HARDWARE_SERIAL_ENTER();
+          
 #endif
           break;
         case 9: // A9 pause sd print
@@ -1136,17 +1365,27 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
           if ((TFTstate != ANYCUBIC_TFT_STATE_SDOUTAGE))
           {
             starpos = (strchr(TFTstrchr_pointer + 4, '*'));
+            
             if (TFTstrchr_pointer[4] == '/')
             {
-              strcpy(SelectedDirectory, TFTstrchr_pointer + 5);
+              strcpy(currentTouchscreenSelection, TFTstrchr_pointer + 5);
+
+#ifdef ANYCUBIC_TFT_DEBUG
+            SERIAL_ECHOPAIR(" TFT Serial Debug: currentTouchscreenSelection: ",currentTouchscreenSelection);
+            SERIAL_EOL();
+#endif
             }
             else if (TFTstrchr_pointer[4] == '<')
             {
-              strcpy(SelectedDirectory, TFTstrchr_pointer + 4);
+              strcpy(currentTouchscreenSelection, TFTstrchr_pointer + 4);
             }
             else
             {
-              SelectedDirectory[0] = 0;
+              currentTouchscreenSelection[0] = 0;
+
+#ifdef ANYCUBIC_TFT_DEBUG
+                SERIAL_ECHOLNPGM("TFT Serial Debug: Normal file open path");
+#endif
 
               if (starpos != NULL)
                 *(starpos - 1) = '\0';
@@ -1375,8 +1614,8 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
           {
             if ((current_position[Z_AXIS] < 10))
               queue.inject_P(PSTR("G1 Z10")); // RAISE Z AXIS
-            thermalManager.setTargetBed(50);
-            thermalManager.setTargetHotend(200, 0);
+            thermalManager.setTargetBed(KNUTWURST_PRHEAT_BED_PLA);
+            thermalManager.setTargetHotend(KNUTWURST_PRHEAT_NOZZLE_PLA, 0);
             HARDWARE_SERIAL_SUCC_START;
             HARDWARE_SERIAL_ENTER();
           }
@@ -1386,9 +1625,8 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
           {
             if ((current_position[Z_AXIS] < 10))
               queue.inject_P(PSTR("G1 Z10")); //RAISE Z AXIS
-            thermalManager.setTargetBed(80);
-            thermalManager.setTargetHotend(240, 0);
-
+            thermalManager.setTargetBed(KNUTWURST_PRHEAT_BED_ABS);
+            thermalManager.setTargetHotend(KNUTWURST_PRHEAT_NOZZLE_ABS, 0);
             HARDWARE_SERIAL_SUCC_START;
             HARDWARE_SERIAL_ENTER();
           }
@@ -1407,39 +1645,52 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
           break;
         case 26: // A26 refresh SD
 #ifdef SDSUPPORT
-          if (SelectedDirectory[0] == 0)
+#ifdef ANYCUBIC_TFT_DEBUG
+            SERIAL_ECHOPAIR(" TFT Serial Debug: currentTouchscreenSelection: ",currentTouchscreenSelection);
+            SERIAL_EOL();
+#endif
+          if (currentTouchscreenSelection[0] == 0)
           {
             card.mount();
           }
           else
           {
-            if ((SelectedDirectory[0] == '.') && (SelectedDirectory[1] == '.'))
+            if ((strcasestr(currentTouchscreenSelection, SM_DIR_UP_S) != NULL)
+            ||  (strcasestr(currentTouchscreenSelection, SM_DIR_UP_L) != NULL))
             {
+#ifdef ANYCUBIC_TFT_DEBUG
+            SERIAL_ECHOLNPGM("TFT Serial Debug: Directory UP (cd ..)");
+#endif
               card.cdup();
             }
             else
             {
-              if (SelectedDirectory[0] == '<')
+              if (currentTouchscreenSelection[0] == '<')
               {
+#ifdef ANYCUBIC_TFT_DEBUG
+            SERIAL_ECHOLNPGM("TFT Serial Debug: Enter Special Menu");
+#endif
                 HandleSpecialMenu();
               }
               else
               {
-                card.cd(SelectedDirectory);
+#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
+                card.cd(currentTouchscreenSelection);
+                #endif
               }
             }
           }
 
-          SelectedDirectory[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
-          }
+          currentTouchscreenSelection[0] = 0;
 #endif
           break;
 #ifdef SERVO_ENDSTOPS
@@ -1458,25 +1709,29 @@ 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();
         }
         break;
         default:
           break;
-        }
-      }
-      TFTbufindw = (TFTbufindw + 1) % TFTBUFSIZE;
-      TFTbuflen += 1;
-      serial3_count = 0;
-    }
-    else
-    {
-      TFTcmdbuffer[TFTbufindw][serial3_count++] = serial3_char;
-    }
-  }
+      }   
+       }       
+       TFTbufindw = (TFTbufindw + 1)%TFTBUFSIZE;
+       TFTbuflen += 1;
+     }
+     serial3_count = 0; //clear buffer
+     }
+     else
+     {
+     if(serial3_char == ';') TFTcomment_mode = true;
+     if(!TFTcomment_mode) TFTcmdbuffer[TFTbufindw][serial3_count++] = serial3_char;
+     }     
+   }
 }
 
+
 void AnycubicTouchscreenClass::CommandScan()
 {
   CheckHeaterError();

Marlin/src/lcd/anycubic_touchscreen.h

@@ -33,7 +33,10 @@ char *ftostr32(const float &);
 
 #define TFTBUFSIZE 4
 #define TFT_MAX_CMD_SIZE 96
-#define MSG_MY_VERSION "V116"
+#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
@@ -43,6 +46,129 @@ char *ftostr32(const float &);
 #define ANYCUBIC_TFT_STATE_SDSTOP_REQ 5
 #define ANYCUBIC_TFT_STATE_SDOUTAGE 99
 
+#if DISABLED(KNUTWURST_DGUS2_TFT)
+#define SM_DIR_UP_L           "/.."
+#define SM_DIR_UP_S           ".."
+#define SM_SPECIAL_MENU_L     "<Special Menu>"
+#define SM_SPECIAL_MENU_S     "<SPECM>"
+#define SM_PID_HOTEND_L       "<PID Tune Hotend>"
+#define SM_PID_HOTEND_S       "<PIDHE>"
+#define SM_PID_BED_L          "<PID Tune Ultrabase>"
+#define SM_PID_BED_S          "<PIDUB>"
+#define SM_SAVE_EEPROM_L      "<Save EEPROM>"
+#define SM_SAVE_EEPROM_S      "<SAVEE>"
+#define SM_LOAD_DEFAULTS_L    "<Load FW Defaults>"
+#define SM_LOAD_DEFAULTS_S    "<LDDEF>"
+#define SM_PREHEAT_BED_L      "<Preheat Ultrabase>"
+#define SM_PREHEAT_BED_S      "<PREHE>"
+#define SM_MESH_MENU_L        "<Mesh Leveling>"
+#define SM_MESH_MENU_S        "<MESHL>"
+#define SM_MESH_START_L       "<Start Mesh Leveling>"
+#define SM_MESH_START_S       "<SMESH>"
+#define SM_MESH_NEXT_L        "<Next Mesh Point>"
+#define SM_MESH_NEXT_S        "<NEXTM>"
+#define SM_Z_UP_01_L          "<Z Up 0.1>"
+#define SM_Z_UP_01_S          "<ZUP01>"
+#define SM_Z_DN_01_L          "<Z Down 0.1>"
+#define SM_Z_DN_01_S          "<ZDN01>"
+#define SM_Z_UP_002_L         "<Z Up 0.02>"
+#define SM_Z_UP_002_S         "<ZUP002>"
+#define SM_Z_DN_002_L         "<Z Down 0.02>"
+#define SM_Z_DN_002_S         "<ZDN002>"
+#define SM_Z_UP_001_L         "<Z Up 0.01>"
+#define SM_Z_UP_001_S         "<ZUP001>"
+#define SM_Z_DN_001_L         "<Z Down 0.01>"
+#define SM_Z_DN_001_S         "<ZDN001>"
+#define SM_BLTOUCH_L          "<BLTouch Leveling>"
+#define SM_BLTOUCH_S          "<BLTCH>"
+#define SM_PAUSE_L            "<Fil. Change Pause>"
+#define SM_PAUSE_S            "<PAUSE>"
+#define SM_RESUME_L           "<Fil. Change Resume>"
+#define SM_RESUME_S           "<RESUM>"
+#define SM_DIS_FILSENS_L      "<Disable Fil. Sensor>"
+#define SM_DIS_FILSENS_S      "<DISSEN>"
+#define SM_EN_FILSENS_L       "<Enable Fil. Sensor>"
+#define SM_EN_FILSENS_S       "<ENSEN>"
+#define SM_EXIT_L             "<Exit>"
+#define SM_EXIT_S             "<EXIT>"
+
+#define SM_BACK_L             "<End Mesh Leveling>"
+#define SM_BACK_S             "<BACK>"
+
+#define SM_FLOWMENU_L         "<Set Flowrate>"
+#define SM_FLOWMENU_S         "<SETFLO>"
+#define SM_FLOW_DISP_L        "<Flow is XXX>"
+#define SM_FLOW_DISP_S        "<FLDISP>"
+#define SM_FLOW_UP_L          "<Up>"
+#define SM_FLOW_UP_S          "<UP>"
+#define SM_FLOW_DN_L          "<Down>"
+#define SM_FLOW_DN_S          "<DOWN>"
+#define SM_FLOW_EXIT_L        "<End Flow Settings>"
+#define SM_FLOW_EXIT_S        "<EXTFLW>"
+#endif
+
+#if ENABLED(KNUTWURST_DGUS2_TFT)
+#define SM_DIR_UP_L           "<<< BACK <<<        .gcode"
+#define SM_DIR_UP_S           "DIR_UP~1.GCO"
+#define SM_SPECIAL_MENU_L     "<Special Menu>      .gcode"
+#define SM_SPECIAL_MENU_S     "<SPECI~1.GCO"
+#define SM_PID_HOTEND_L       "<PID Tune Hotend>   .gcode"
+#define SM_PID_HOTEND_S       "<PIDTU~1.GCO"
+#define SM_PID_BED_L          "<PID Tune Ultrabase>.gcode"
+#define SM_PID_BED_S          "<PIDTU~2.GCO"
+#define SM_SAVE_EEPROM_L      "<Save EEPROM>       .gcode"
+#define SM_SAVE_EEPROM_S      "<SAVEE~1.GCO"
+#define SM_LOAD_DEFAULTS_L    "<Load FW Defaults>  .gcode"
+#define SM_LOAD_DEFAULTS_S    "<LOADF~1.GCO"
+#define SM_PREHEAT_BED_L      "<Preheat Ultrabase> .gcode"
+#define SM_PREHEAT_BED_S      "<PREHE~1.GCO"
+#define SM_MESH_MENU_L        "<Mesh Leveling>     .gcode"
+#define SM_MESH_MENU_S        "<MESHL~1.GCO"
+#define SM_MESH_START_L       "<Start MeshLeveling>.gcode"
+#define SM_MESH_START_S       "<START~1.GCO"
+#define SM_MESH_NEXT_L        "<Next Mesh Point>   .gcode"
+#define SM_MESH_NEXT_S        "<NEXTM~1.GCO"
+#define SM_Z_UP_01_L          "<Z Up 0.1>          .gcode"
+#define SM_Z_UP_01_S          "<ZUP01~1.GCO"
+#define SM_Z_DN_01_L          "<Z Down 0.1>        .gcode"
+#define SM_Z_DN_01_S          "<ZDOWN~1.GCO"
+#define SM_Z_UP_002_L         "<Z Up 0.02>         .gcode"
+#define SM_Z_UP_002_S         "<ZUP00~1.GCO"
+#define SM_Z_DN_002_L         "<Z Down 0.02>       .gcode"
+#define SM_Z_DN_002_S         "<ZDOWN~2.GCO"
+#define SM_Z_UP_001_L         "<Z Up 0.01>         .gcode"
+#define SM_Z_UP_001_S         "<ZUP00~2.GCO"
+#define SM_Z_DN_001_L         "<Z Down 0.01>       .gcode"
+#define SM_Z_DN_001_S         "<ZDOWN~3.GCO"
+#define SM_BLTOUCH_L          "<BLTouch Leveling>  .gcode"
+#define SM_BLTOUCH_S          "<BLTOU~1.GCO"
+#define SM_PAUSE_L            "<Fil. Change Pause> .gcode"
+#define SM_PAUSE_S            "<FILCH~2.GCO"
+#define SM_RESUME_L           "<Fil. Change Resume>.gcode"
+#define SM_RESUME_S           "<FILCH~1.GCO"
+#define SM_DIS_FILSENS_L      "<Disable Fil.Sensor>.gcode"
+#define SM_DIS_FILSENS_S      "<DISAB~1.GCO"
+#define SM_EN_FILSENS_L       "<Enable Fil. Sensor>.gcode"
+#define SM_EN_FILSENS_S       "<ENABL~1.GCO"
+#define SM_EXIT_L             "<Exit>              .gcode"
+#define SM_EXIT_S             "<EXIT_~1.GCO"
+
+#define SM_BACK_L             "<End Mesh Leveling> .gcode"
+#define SM_BACK_S             "<BACK_~1.GCO"
+
+#define SM_FLOWMENU_L         "<Set Flowrate>      .gcode"
+#define SM_FLOWMENU_S         "<SETFLO1.GCO"
+#define SM_FLOW_DISP_L        "<Flow is XXX%>      .gcode"
+#define SM_FLOW_DISP_S        "<FLDISPL.GCO"
+#define SM_FLOW_UP_L          "<Up>                .gcode"
+#define SM_FLOW_UP_S          "<UPFLOW1.GCO"
+#define SM_FLOW_DN_L          "<Down>              .gcode"
+#define SM_FLOW_DN_S          "<DWNFLOW.GCO"
+#define SM_FLOW_EXIT_L        "<End Flow Settings> .gcode"
+#define SM_FLOW_EXIT_S        "<EXTFLW1.GCO"
+#endif
+
+
 class AnycubicTouchscreenClass
 {
 public:
@@ -85,6 +211,7 @@ private:
   char LastSDstatus = 0;
   uint16_t HeaterCheckCount = 0;
   bool IsParked = false;
+  int currentFlowRate = 0;
 
 #if defined(POWER_OUTAGE_TEST)
   struct OutageDataStruct
@@ -101,7 +228,7 @@ private:
 
   float CodeValue();
   bool CodeSeen(char);
-  void AnycubicTouchscreen();
+  void PrintList();
   void StartPrint();
   void PausePrint();
   void StopPrint();
@@ -115,10 +242,15 @@ private:
   void ReheatNozzle();
   void ParkAfterStop();
 
-  char SelectedDirectory[30];
-  uint8_t SpecialMenu = false;
+  char currentTouchscreenSelection[64];
+  char currentFileOrDirectory[64];
+  uint16_t MyFileNrCnt = 0;
   uint8_t FilamentSensorEnabled = true;
 
+  uint8_t SpecialMenu = false;
+  uint8_t MMLMenu = false;
+  uint8_t FlowMenu = false;  
+
 #if ENABLED(ANYCUBIC_FILAMENT_RUNOUT_SENSOR)
   char FilamentTestStatus = false;
   char FilamentTestLastStatus = false;

Marlin/src/module/temperature.cpp

@@ -835,7 +835,7 @@ void Temperature::min_temp_error(const heater_ind_t heater) {
 
 #if HOTENDS
   #if ENABLED(PID_DEBUG)
-    extern bool PID_Debug_Flag;
+    extern bool pid_debug_flag;
   #endif
 
   float Temperature::get_pid_output_hotend(const uint8_t E_NAME) {
@@ -918,7 +918,7 @@ void Temperature::min_temp_error(const heater_ind_t heater) {
       #endif // PID_OPENLOOP
 
       #if ENABLED(PID_DEBUG)
-        if (ee == active_extruder && PID_Debug_Flag) {
+        if (ee == active_extruder && pid_debug_flag) {
           SERIAL_ECHO_START();
           SERIAL_ECHOPAIR(STR_PID_DEBUG, ee, STR_PID_DEBUG_INPUT, temp_hotend[ee].celsius, STR_PID_DEBUG_OUTPUT, pid_output);
           #if DISABLED(PID_OPENLOOP)

README.md

@@ -1,26 +1,57 @@
-# Knutwurst's i3 MEGA S Firmware (based on Marlin 2.0.5.3)
+# Knutwurst's i3 MEGA (M/S/P/X) Firmware <br>(based on Marlin 2.0.x)
 
 <span style="color: red;">(BITTE GENAU DURCHLESEN! / PLEASE READ CAREFULLY!)</span>
 
-## Readme - German (english below)
+### Wenn dir gefällt, was ich mache, kannst du mir hier einen Kaffee spendieren*: [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/oliverkoester)
+<sub>*Es muss jetzt keine großzügige Spende sein. Ein paar Cent reichen um mir zu zeigen, wer überhaupt Interesse daran hat und wem die Weiterentwicklung wichtig ist. So bleibt die Motivation da und ich weiß einfach, dass ich nicht für die Tonne programmiere ;)<sub>
 
-Diese Firmwarekonfiguration aktiviert viele neue erweitere Funktionen der Marlin Firmware:
 
- * Mesh-Bed Kalibrierung
+### Wenn du Fragen hast, schaue gern in der offiziellen [Facebook-Gruppe](https://www.facebook.com/groups/3094090037303577/) vorbei.
+
+### WARNUNG: Der Mega Pro / Mega P Support befindet sich noch in der Entwicklung. Aktuell wird der Laser noch nicht unterstützt, ebensowenig wie das Piezo-Leveling! 
+
+# Inhaltsverzeichnis (Deutsch)
+- [Funktionen](#funktionen)
+   - [Was ist besser?](#besser-im-vergleich-zu-anderen-firmwares-bugfixes)
+- [Häufig gestellte Fragen (FAQ)](https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/wiki/FAQ-(deutsch))
+- [Fotos / Bilder](https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/wiki/Pictures)
+- [Downloads](#downloads)
+
+
+### WARNING: The Mega Pro / Mega P support is still under development. The laser is currently not supported, nor is piezo leveling!
+
+# Table of Contets (english)
+- [Features](#features)
+   - [What's better?](#whats-better-in-coparison-to-other-firmwares-bug-fixes)
+- [Frequently asked questions (FAQ)](https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/wiki/FAQ-(english))
+- [Photos / Pictures](https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/wiki/Pictures)
+- [Download](#download)
+
+
+# Readme - German
+
+## Funktionen
+
+ * 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
- * Spannung vom Bauteillüfter von 8V auf 12V
+ * Volle Unterstützung aller [Anycubic Touchscreens](https://github.com/knutwurst/Marlin-2-0-x-Anycubic-i3-MEGA-S/wiki/Types-of-Anycubic-Touchscreens)
+ * Bauteilkühler läuft nun auf 100% statt maximal 70%
  * Pause & Filamentwechselfunktion
  * Automatische EEPROM Initialisierung
- * Filament Runout Sensor kann im Menü deaktiviert werden
+ * Filament Runout Sensor kann im Menü temporär deaktiviert werden
  * Wiederaufnahme des Drucks nach Stromausfall (WiP)
+ * [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):
+
+## Besser im Vergleich zu anderen Firmwares (Bugfixes):
  * Aufgeräumtes Special-Menü
  * Drucker hängt sich nicht auf, wenn man Dateien mit Sonderzeichen (Umlaute, Chinesisch etc.) auf der SD Karte hat
  * Kein dummes "wackeln" der Düse nach Stoppen eines Druckvorgangs
@@ -29,99 +60,69 @@ Besser im Vergleich zu anderen Firmwares (Bugfixes):
  * Fehler "Melodie" bei Thermal Runaway Protection
  * Kein Aufhängen, wenn SD Karte + USB gleichzeitig genutzt wird
  * Kein Aufhängen wenn man Pause drückt
- * Kein Aufhängen, wenn das Filament leer ist.
-
-Bekannte Bugs:
- * Filament Runout Sensor wird bei jedem Neustart wieder aktiviert
- * Wiederaufnahme nach Stromausfall funktioniert nur sehr unzuverlässig
+ * 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
 
 ---
 
-### FAQ:
+# Downloads
 
->Knutwurst, wieso machst du auch noch so eine Firmware? Es gibt doch schon so viele?
+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).
 
-Weil ich bisher keine gesehen habe, die nicht die blöden Bugs enthält, wie z.B. dass sie abstürzt, wenn man Dateien mit Sonderzeichen auf der SD Karte hat.
+Um es übersichtlich zu gestalten, beinhalten die Dateinamen die einzelnen Features.
 
->Wieso ist mein Drucker plötzlich lauter als vorher?
+`_1G` steht für die erste Generation des i3 Mega mit nur einem Z Endstop. Diese Firmware ist nicht für den normalen i3 Mega geeignet!
 
-Dein Bauteillüfter läuft jetzt mit voller Drehzahl, was er vorher nicht tat. Stelle im Slicer (z.B. Cura) die Geschwindigkeit einfach auf 70% und schon hast du die alte Lautstärke wieder. Diese Modifikation ist notwendig, falls man den Lüfter tauschen möchte und viele Lüfter mit den originalen 8V nicht oder nur unzureichend laufen.
+`_S` steht für den Mega S mit dem Titan Extruder.
 
->Ist deine Firmware besser als andere?
+`_P` steht für den Mega P mit dem BMG Extruder.
 
-Nein. Aber sicher auch nicht schlechter.
+`_X` steht für den Mega X.
 
->Wo sind die Downloads?
+`_TMC` steht für Trinamic TMC Motortreiber. Hierbei wird auch die Drehrichtung der Motoren invertiert.
 
-Weiter unten.
+`_DGUS` steht für das "neue" blau/gelbe DGUS II Display, welches sonst kein Special-Menü anzeigen kann.
 
->Muss ich bei TMC Treibern die Stecker drehen?
+`_BLT` steht für die BL-Touch Version mit Autoleveling-Sensor. Das manuelle Mesh-Leveling ist hier deaktiviert.
 
-Nö. Lade dir einfach die korrekte Version herunter.
+`_10` steht für das Trigorilla_14 v1.0 Mainboard, welches normalerweise der Standard sein sollte.
 
->Welche TMC2208 Motortreiber sollte ich kaufen? Lieber die V2 oder die Bigtreetech V3?
+`_11` steht für das Trigorilla_14 v1.1 Mainboard, bei welchem sich die Pinbelegung für den Server-Port geändert hat.
 
-Weder noch! Es gibt keine "V2" oder "V3". Die offizielle letzte Version von Trinamic ist v1.2 und die beiden großen primären Hersteller für die echten SilentStepSticks sind FYSETC und WATTERROTT. Lass bloß die Finger von Bigtreetech.
 
->Ich habe die Stecker bei meinen Motoren schon gedreht, als ich die TMC Treiber eingebaut habe. Muss ich jetzt trotzdem die TMC Version flashen?
-
-Nein. Benutze einfach die Nicht-TMC Version, da sonst die Motoren wieder in die falsche Richtung laufen.
-
->Als ich die Treiber eingebaut habe, qualmte mein Mainboard in der Mitte rechts. Ist das normal?
-
-Nein. Du hast die Treiber falsch herum eingebaut. Jetzt ist die Z-Diode (733A) verbrannt. Tausche sie aus und alles funktioniert wieder. Deine falsch gesteckten Treiber kannst du aber vermutlich wegschmeißen.
-
->Muss ich wie bei anderen Firmwares noch die E-Steps einstellen, wenn ich einen Mega S besitze?
-
-Nein, lade dir einfach die korrekte Version herunter. Trotzdem solltest du die Steps noch kalibrieren.
+Für (fast) jede Kombination gibt es eine passende Firmware im Download-Bereich. ;)
 
 ---
 
-### Bilder
+### 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>
 
-![Manual Mesh Bed Leveling](images/Mesh_Level.jpg)
+# Readme - English
 
-![Ultra Fine mesh tuning](images/Fine_Tuning.jpg)
+## Features:
 
-![Enable or Disable Filament Runout Sensor](images/Filament_Sensor_on_off.jpg)
-
----
-
-### Download
-
-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.
-
--> `i3_Mega.hex` ist für den unmodifizierten originalen Anycubic i3 MEGA (ohne S).
-
--> `i3_Mega_TMC.hex` hat Optimierungen und invertierte Ausgänge für TMC2100 and TMC2208 Motortreiber.
-
--> `i3_Mega_S.hex` wird verwendet, wenn du den neuere "S" Version mit Titan-Extruder verwendest.
-
--> `i3_Mega_S_TMC.hex` benutzt du, wenn du sowohl die "S" Version mit Titan-Extruder und TMC Motortreiber verwendest.
-
-
----
-
-## Readme - English
-
-
-
-This firmware configuration activates many new features of the Marlin firmware:
-
- * Mesh bed calibration
+ * 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)
- * Baby stepping during printing
+ * "Linear Pressure Control v1.5" activated (can be configured with M900)
+ * 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)
+ * Part cooling fan now runs at 100% instead of 70%
  * Pause & filament change function
  * Automatic EEPROM initialization
- * Filament Runout Sensor can be deactivated in the menu
- * Power outage support
+ * Filament runout sensor can be temporarily deactivated in the menu
+ * Resumption of printing after a power failure (WiP)
+ * [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' 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):
+### What's better in coparison to other firmwares (bug fixes):
  * Tidy special menu
  * Printer does not freeze if you have files with special characters (umlauts, Chinese..) on your SD card
  * No stupid "wobble" of the nozzle after stopping printing
@@ -131,73 +132,39 @@ What's better in coparison to other firmwares (bug fixes):
  * No freezing when SD card + USB is used at the same time
  * No freezing when you press pause and try to resume
  * No freezing when the filament is empty
+ * No need for a "special" BLTouch firmware. In this firmware is everything included
+ * Configuration made easy via feature toggles
 
-Known bugs:
- * Filament Runout Sensor is reactivated with every reboot
- * Power outage support does not work reliably
 
 ---
 
-### FAQ:
+# Download
 
-> Knutwurst, why are you still doing such a firmware? Aren't there already so many?
+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.
 
-Because I've never seen one that doesn't contain the stupid bugs like the crashes when you have files with special characters on the SD card.
+In order to make it clear, the file names contain the individual features.
 
->Why is my printer so much louder than before?
+`_1G` stands for the firt generation i3 Mega with only one Z endstop. Do NOT use this Firmware on the regular i3 Mega!
 
-Your component fan is now running at full speed, which it did no before. Simply set the speed to 70% in the slicer (e.g. Cura) and you will have the old speed again. This modification is necessary if you want to replace the fan. Many aftermarket fans do not run properly or at all with the original 8V.
+`_S` stands for the Mega S with the titan extruder.
 
-> Is your firmware better than others?
+`_P` stands for the Mega P with the BMG extruder.
 
-No. But certainly not worse either.
+`_X` stands for the Mega X.
 
-> Where are the downloads?
+`_TMC` stands for Trinamic TMC motor driver. The direction of rotation of the motors is also inverted.
 
-Further down.
+`_DGUS` stands for the "new" blue / yellow DGUS II display, which otherwise cannot show a special menu.
 
-> Do I have to turn the plugs for TMC drivers?
+`_BLT` stands for the BL-Touch version with auto-leveling sensor. Manual mesh leveling is deactivated here.
 
-Nope, just download the correct version.
+`_10` stands for the Trigorilla_14 v1.0 mainboard, which should normally be the standard.
 
-> Which TMC2208 motor drivers should I buy? The V2 or the Bigtreetech V3?
-
-Neither! There is no "V2" or "V3". The official last version of Trinamic is v1.2 and the two major primary manufacturers for the real SilentStepSticks are FYSETC and WATTERROTT. Just stay away from Bigtreetech.
-
-> I already turned the plugs on my motors when I installed the TMC drivers. Do I still have to flash the TMC version?
-
-No. Just use the non-TMC version, otherwise the motors will turn in the wrong direction again.
-
-> When I installed the drivers, my mainboard gave me the "magic smoke". Is that normal?
-
-No. You installed the drivers the wrong way round. Now the Zener diode (733A) is burned. Exchange it and everything works again. You can probably throw away your wrongly inserted drivers.
-
-> As with other firmwares, do I still have to set the E-Steps if I have a Mega S?
-
-No, just download the correct version. Nevertheless, you should still calibrate the e-steps.
-
----
-
-### Pictures
-
-![Manual Mesh Bed Leveling](images/Mesh_Level.jpg)
-
-![Ultra Fine mesh tuning](images/Fine_Tuning.jpg)
-
-![Enable or Disable Filament Runout Sensor](images/Filament_Sensor_on_off.jpg)
-
----
-
-### 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.
-
--> `i3_Mega.hex` is for the unmodified original Anycubic i3 MEGA (without S).
-
--> `i3_Mega_TMC.hex` has optimizations and inverted outputs for TMC2100 and TMC2208 motor drivers.
-
--> `i3_Mega_S.hex` is used if you use the newer "S" version with titan extruder.
-
--> `i3_Mega_S_TMC.hex` you use if you use both the "S" version with titan extruder and TMC motor driver.
+`_11` stands for the Trigorilla_14 v1.1 mainboard, on which the pin assignment for the server port has changed.
 
 
+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

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+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"
+
+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/*/
+do
+    dir=${dir%*/}
+    echo ${dir##*/}
+    cp ${dir##*/}/firmware.hex /$OUTPUT_FOLDER/$CUSTOM_BUILD_VERSION/${dir##*/}_v$CUSTOM_BUILD_VERSION.hex
+done

i3_mega_envs.ini

@@ -0,0 +1,388 @@
+#
+#  i3 Mega (First generation with only one endstop)
+#
+
+[env:MEGA_1G]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_ONE_Z_ENDSTOP
+build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
+
+[env:MEGA_1G_TMC]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_TMC -DKNUTWURST_ONE_Z_ENDSTOP
+build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_BLTOUCH
+
+[env:MEGA_1G_BLT_10]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_BLTOUCH -DKNUTWURST_ONE_Z_ENDSTOP
+build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC
+
+[env:MEGA_1G_BLT_11]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA -DKNUTWURST_BLTOUCH -DKNUTWURST_ONE_Z_ENDSTOP
+build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC
+
+[env:MEGA_1G_TMC_BLT_10]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH -DKNUTWURST_ONE_Z_ENDSTOP
+build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT
+
+[env:MEGA_1G_TMC_BLT_11]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH -DKNUTWURST_ONE_Z_ENDSTOP
+build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT
+
+
+#
+#  i3 Mega (normal Version)
+#
+
+[env:MEGA]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA
+build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
+
+[env:MEGA_TMC]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+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
+
+[env:MEGA_BLT_10]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC
+
+[env:MEGA_BLT_11]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC
+
+[env:MEGA_TMC_BLT_10]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT
+
+[env:MEGA_TMC_BLT_11]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+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_MEGA_P -DKNUTWURST_DGUS2_TFT
+
+
+
+#
+#  i3 Mega S
+#
+[env:MEGA_S]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
+
+[env:MEGA_S_TMC]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+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
+
+[env:MEGA_S_BLT_10]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC
+
+[env:MEGA_S_BLT_11]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_S -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT -DKNUTWURST_TMC
+
+[env:MEGA_S_TMC_BLT_10]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT
+
+[env:MEGA_S_TMC_BLT_11]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+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_MEGA_P -DKNUTWURST_DGUS2_TFT
+
+
+
+#
+#  i3 Mega S (new TFT)
+#
+[env:MEGA_S_DGUS]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_S -DKNUTWURST_DGUS2_TFT
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_X -DKNUTWURST_MEGA_P -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
+
+[env:MEGA_S_DGUS_TMC]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+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_MEGA_P -DKNUTWURST_BLTOUCH
+
+[env:MEGA_S_DGUS_BLT_10]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+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_MEGA_P -DKNUTWURST_TMC
+
+[env:MEGA_S_DGUS_BLT_11]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+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_MEGA_P -DKNUTWURST_TMC
+
+[env:MEGA_S_DGUS_TMC_BLT_10]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+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 -DKNUTWURST_MEGA_P
+
+[env:MEGA_S_DGUS_TMC_BLT_11]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+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 -DKNUTWURST_MEGA_P
+
+
+
+#
+#  i3 Mega X
+#
+[env:MEGA_X]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT
+
+[env:MEGA_X_TMC]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_TMC
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT
+
+[env:MEGA_X_BLT_10]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_TMC -DKNUTWURST_DGUS2_TFT
+
+[env:MEGA_X_BLT_11]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_X -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_TMC -DKNUTWURST_DGUS2_TFT
+
+[env:MEGA_X_TMC_BLT_10]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT
+
+[env:MEGA_X_TMC_BLT_11]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_P -DKNUTWURST_DGUS2_TFT
+
+
+
+#
+#  i3 Mega P
+#
+[env:MEGA_P]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_P -DKNUTWURST_BMG -DKNUTWURST_DGUS2_TFT
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH
+
+[env:MEGA_P_TMC]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_P -DKNUTWURST_TMC -DKNUTWURST_BMG -DKNUTWURST_DGUS2_TFT
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_BLTOUCH
+
+[env:MEGA_P_BLT_10]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_P -DKNUTWURST_BMG -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_TMC 
+
+[env:MEGA_P_BLT_11]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_P -DKNUTWURST_BMG -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X -DKNUTWURST_TMC 
+
+[env:MEGA_P_TMC_BLT_10]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14 -DKNUTWURST_MEGA_P -DKNUTWURST_BMG -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X
+
+[env:MEGA_P_TMC_BLT_11]
+platform          = atmelavr
+board             = megaatmega2560
+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>
+build_flags       = ${common.build_flags} -DMOTHERBOARD=BOARD_TRIGORILLA_14_11 -DKNUTWURST_MEGA_P -DKNUTWURST_BMG -DKNUTWURST_TMC -DKNUTWURST_BLTOUCH -DKNUTWURST_DGUS2_TFT 
+build_unflags     = -DKNUTWURST_MEGA -DKNUTWURST_MEGA_S -DKNUTWURST_MEGA_X

platformio.ini

@@ -15,26 +15,86 @@
 # 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 = mega2560
+extra_configs = i3_mega_envs.ini
+default_envs =
+  MEGA_1G
+  MEGA_1G_TMC
+#  MEGA_1G_BLT_10
+#  MEGA_1G_BLT_11
+#  MEGA_1G_TMC_BLT_10
+#  MEGA_1G_TMC_BLT_11
+  MEGA
+  MEGA_TMC
+  MEGA_BLT_10
+  MEGA_BLT_11
+  MEGA_TMC_BLT_10
+  MEGA_TMC_BLT_11
+  MEGA_S
+  MEGA_S_TMC
+  MEGA_S_BLT_10
+  MEGA_S_BLT_11
+  MEGA_S_TMC_BLT_10
+  MEGA_S_TMC_BLT_11
+  MEGA_S_DGUS
+  MEGA_S_DGUS_TMC
+  MEGA_S_DGUS_BLT_10
+  MEGA_S_DGUS_BLT_11
+  MEGA_S_DGUS_TMC_BLT_10
+  MEGA_S_DGUS_TMC_BLT_11
+  MEGA_X
+  MEGA_X_TMC
+  MEGA_X_BLT_10
+  MEGA_X_BLT_11
+  MEGA_X_TMC_BLT_10
+  MEGA_X_TMC_BLT_11
+#  MEGA_P
+#  MEGA_P_TMC
+#  MEGA_P_BLT_10
+#  MEGA_P_BLT_11
+#  MEGA_P_TMC_BLT_10
+#  MEGA_P_TMC_BLT_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>
 extra_scripts = pre:buildroot/share/PlatformIO/scripts/common-cxxflags.py
 build_flags = -fmax-errors=5 -g -D__MARLIN_FIRMWARE__ -fmerge-all-constants
 lib_deps =
-  LiquidCrystal
-  TMCStepper@>=0.6.2,<1.0.0
-  Adafruit NeoPixel
-  U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
-  Adafruit_MAX31865=https://github.com/adafruit/Adafruit_MAX31865/archive/master.zip
-  LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip
-  Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/0.8.0.zip
+  LiquidCrystal@1.5.0
+  TMCStepper@~0.7.1
+  Adafruit NeoPixel@1.5.0
+  U8glib-HAL@0.4.1
+  Adafruit MAX31865 library@~1.1.0
+  LiquidTWI2@1.2.7
+  Arduino-L6470@0.8.0
+  SlowSoftI2CMaster
   SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
   SailfishRGB_LED=https://github.com/mikeshub/SailfishRGB_LED/archive/master.zip
-  SlowSoftI2CMaster=https://github.com/mikeshub/SlowSoftI2CMaster/archive/master.zip
 
 # Globally defined properties
 # inherited by all environments
@@ -221,10 +281,10 @@ lib_compat_mode   = strict
 extra_scripts     = Marlin/src/HAL/LPC1768/upload_extra_script.py
 src_filter        = ${common.default_src_filter} +<src/HAL/LPC1768>
 lib_deps          = Servo
-  LiquidCrystal
-  U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
-  TMCStepper@>=0.6.1,<1.0.0
-  Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/release.zip
+  LiquidCrystal@1.0.0
+  U8glib-HAL@0.4.1
+  TMCStepper@~0.7.1
+  Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip
   SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
 
 [env:LPC1769]
@@ -239,17 +299,17 @@ lib_compat_mode   = strict
 extra_scripts     = Marlin/src/HAL/LPC1768/upload_extra_script.py
 src_filter        = ${common.default_src_filter} +<src/HAL/LPC1768>
 lib_deps          = Servo
-  LiquidCrystal
-  U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
-  TMCStepper@>=0.6.1,<1.0.0
-  Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/release.zip
+  LiquidCrystal@1.0.0
+  U8glib-HAL@0.4.1
+  TMCStepper@~0.7.1
+  Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip
   SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
 
 #
 # STM32F103RC
 #
 [env:STM32F103RC]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -265,7 +325,7 @@ monitor_speed     = 115200
 # STM32F103RC_fysetc
 #
 [env:STM32F103RC_fysetc]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RC
 #board_build.core = maple
 platform_packages = tool-stm32duino
@@ -291,7 +351,7 @@ upload_protocol   = serial
 #
 
 [env:STM32F103RC_btt]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -306,7 +366,7 @@ lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
 [env:STM32F103RC_btt_USB]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -321,7 +381,7 @@ lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
 [env:STM32F103RC_btt_512K]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RC
 board_upload.maximum_size=524288
 platform_packages = tool-stm32duino
@@ -337,7 +397,7 @@ lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
 [env:STM32F103RC_btt_512K_USB]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RC
 board_upload.maximum_size=524288
 platform_packages = tool-stm32duino
@@ -356,7 +416,7 @@ monitor_speed     = 115200
 # STM32F103RE
 #
 [env:STM32F103RE]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RE
 platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -373,7 +433,7 @@ monitor_speed     = 115200
 #   STM32F103RE_btt_USB ......... RET6 (USB mass storage)
 #
 [env:STM32F103RE_btt]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RE
 platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -389,7 +449,7 @@ upload_protocol   = stlink
 monitor_speed     = 115200
 
 [env:STM32F103RE_btt_USB]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RE
 platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -408,7 +468,7 @@ monitor_speed     = 115200
 # STM32F4 with STM32GENERIC
 #
 [env:STM32F4]
-platform      = ststm32
+platform      = ststm32@<6.2.0
 board         = disco_f407vg
 build_flags   = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F4 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
 lib_ignore    = Adafruit NeoPixel, TMCStepper
@@ -418,7 +478,7 @@ src_filter    = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/ST
 # STM32F7 with STM32GENERIC
 #
 [env:STM32F7]
-platform      = ststm32
+platform      = ststm32@<6.2.0
 board         = remram_v1
 build_flags   = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F7 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
 lib_ignore    = Adafruit NeoPixel, TMCStepper
@@ -428,7 +488,7 @@ src_filter    = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/ST
 # ARMED (STM32)
 #
 [env:ARMED]
-platform      = ststm32
+platform      = ststm32@<6.2.0
 board         = armed_v1
 build_flags   = ${common.build_flags}
   -DUSBCON -DUSBD_VID=0x0483 '-DUSB_MANUFACTURER="Unknown"' '-DUSB_PRODUCT="ARMED_V1"' -DUSBD_USE_CDC
@@ -441,7 +501,7 @@ src_filter    = ${common.default_src_filter} +<src/HAL/STM32>
 # Geeetech GTM32 (STM32F103VET6)
 #
 [env:STM32F103VE_GTM32]
-platform        = ststm32
+platform        = ststm32@<6.2.0
 board           = genericSTM32F103VE
 build_flags     = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=DEBUG_NONE -std=gnu++14 -MMD -ffunction-sections -fdata-sections -nostdlib
@@ -456,7 +516,7 @@ upload_protocol = serial
 # Longer 3D board in Alfawise U20 (STM32F103VET6)
 #
 [env:STM32F103VE_longer]
-platform      = ststm32
+platform      = ststm32@<6.2.0
 board         = genericSTM32F103VE
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -USERIAL_USB
@@ -470,7 +530,7 @@ lib_ignore    = Adafruit NeoPixel, LiquidTWI2, SPI
 # MKS Robin Mini (STM32F103VET6)
 #
 [env:mks_robin_mini]
-platform      = ststm32
+platform      = ststm32@<6.2.0
 board         = genericSTM32F103VE
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
@@ -483,7 +543,7 @@ lib_ignore    = Adafruit NeoPixel, SPI
 # MKS Robin Nano (STM32F103VET6)
 #
 [env:mks_robin_nano]
-platform      = ststm32
+platform      = ststm32@<6.2.0
 board         = genericSTM32F103VE
 platform_packages = tool-stm32duino
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -499,7 +559,7 @@ lib_ignore    = Adafruit NeoPixel, SPI
 # MKS Robin (STM32F103ZET6)
 #
 [env:mks_robin]
-platform      = ststm32
+platform      = ststm32@<6.2.0
 board         = genericSTM32F103ZE
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_XL_DENSITY
@@ -514,7 +574,7 @@ lib_ignore    = Adafruit NeoPixel, SPI
 # MKS Robin Pro (STM32F103ZET6)
 #
 [env:mks_robin_pro]
-platform      = ststm32
+platform      = ststm32@<6.2.0
 board         = genericSTM32F103ZE
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_pro.py
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -528,7 +588,7 @@ lib_ignore    = Adafruit NeoPixel, SPI, TMCStepper
 # MKS Robin Lite/Lite2 (STM32F103RCT6)
 #
 [env:mks_robin_lite]
-platform      = ststm32
+platform      = ststm32@<6.2.0
 board         = genericSTM32F103RC
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
@@ -541,7 +601,7 @@ lib_ignore    = Adafruit NeoPixel, SPI
 # MKS ROBIN LITE3 (STM32F103RCT6)
 #
 [env:mks_robin_lite3]
-platform      = ststm32
+platform      = ststm32@<6.2.0
 board         = genericSTM32F103RC
 extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
@@ -555,7 +615,7 @@ lib_ignore    = Adafruit NeoPixel, SPI
 # JGAurora A5S A1 (STM32F103ZET6)
 #
 [env:jgaurora_a5s_a1]
-platform      = ststm32
+platform      = ststm32@<6.2.0
 board         = genericSTM32F103ZE
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
@@ -568,7 +628,7 @@ lib_ignore    = Adafruit NeoPixel, SPI
 # Malyan M200 (STM32F103CB)
 #
 [env:STM32F103CB_malyan]
-platform    = ststm32
+platform    = ststm32@<6.2.0
 board       = malyanM200
 build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py -DMCU_STM32F103CB -D __STM32F1__=1 -std=c++1y -D MOTHERBOARD="BOARD_MALYAN_M200" -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections
   -DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__
@@ -579,7 +639,7 @@ lib_ignore  = Adafruit NeoPixel, LiquidCrystal, LiquidTWI2, TMCStepper, U8glib-H
 # Chitu boards like Tronxy X5s (STM32F103ZET6)
 #
 [env:chitu_f103]
-platform      = ststm32
+platform      = ststm32@<6.2.0
 board         = genericSTM32F103ZE
 build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
@@ -593,7 +653,7 @@ lib_ignore    = Adafruit NeoPixel
 # 'STEVAL-3DP001V1' STM32F401VE board - https://www.st.com/en/evaluation-tools/steval-3dp001v1.html
 #
 [env:STM32F401VE_STEVAL]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = STEVAL_STM32F401VE
 platform_packages = framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
@@ -611,7 +671,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 # FLYF407ZG
 #
 [env:FLYF407ZG]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = FLYF407ZG
 platform_packages = framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
@@ -628,7 +688,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 # FYSETC S6 (STM32F446VET6 ARM Cortex-M4)
 #
 [env:FYSETC_S6]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = fysetc_s6
 platform_packages =
    tool-stm32duino
@@ -651,7 +711,7 @@ upload_protocol   = serial
 # Shield - https://github.com/jmz52/Hardware
 #
 [env:STM32F407VE_black]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = blackSTM32F407VET6
 platform_packages = framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
@@ -667,7 +727,7 @@ src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 # BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4)
 #
 [env:BIGTREE_SKR_PRO]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = BigTree_SKR_Pro
 platform_packages = framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
@@ -687,7 +747,7 @@ debug_init_break  =
 # Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4)
 #
 [env:BIGTREE_GTR_V1_0]
-platform          = ststm32@>=5.7.0
+platform          = ststm32@>=5.7.0,<6.2.0
 framework         = arduino
 platform_packages = framework-arduinoststm32@>=3.107,<4
 board             = BigTree_SKR_Pro
@@ -697,12 +757,12 @@ build_flags       = ${common.build_flags}
   -DTARGET_STM32F4 -DSTM32F407IX -DVECT_TAB_OFFSET=0x8000
   -IMarlin/src/HAL/STM32
 lib_deps          =
-  U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
-  LiquidCrystal
-  TMCStepper@>=0.5.2,<1.0.0
-  Adafruit NeoPixel
-  LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip
-  Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/0.7.0.zip
+  U8glib-HAL@0.4.1
+  LiquidCrystal@1.5.0
+  TMCStepper@~0.7.1
+  Adafruit NeoPixel@1.5.0
+  LiquidTWI2@1.2.7
+  Arduino-L6470@0.8.0
 lib_ignore        = SoftwareSerial, SoftwareSerialM
 src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
 monitor_speed     = 250000
@@ -799,7 +859,7 @@ debug_tool     = jlink
 # RUMBA32
 #
 [env:rumba32_f446ve]
-platform      = ststm32
+platform      = ststm32@<6.2.0
 board         = rumba32_f446ve
 build_flags   = ${common.build_flags}
   -DSTM32F4xx
@@ -825,7 +885,7 @@ upload_protocol = dfu
 # MKS RUMBA32 (adds TMC2208/2209 UART interface and AUX-1)
 #
 [env:rumba32_mks]
-platform      = ststm32
+platform      = ststm32@<6.2.0
 board         = rumba32_f446ve
 build_flags   = ${common.build_flags}
  -DSTM32F4xx -DARDUINO_RUMBA32_F446VE -DARDUINO_ARCH_STM32 "-DBOARD_NAME=\"RUMBA32_F446VE\""