Merge pull request #168 from DrDMoney/patch-1

Update Configuration.h

.editorconfig

@@ -4,20 +4,16 @@ root = true
 [{*.patch,syntax_test_*}]
 trim_trailing_whitespace = false
 
-[{*.c,*.cpp,*.h,*.ino}]
+[{*.c,*.cpp,*.h}]
 charset = utf-8
 
-[{*.c,*.cpp,*.h,*.ino,Makefile}]
+[{*.c,*.cpp,*.h,Makefile}]
 trim_trailing_whitespace = true
 insert_final_newline = true
 end_of_line = lf
 indent_style = space
 indent_size = 2
 
-[{*.py}]
-indent_style = space
-indent_size = 4
-
-[{*.conf,*.sublime-project}]
+[{*.py,*.conf,*.sublime-project}]
 indent_style = tab
 indent_size = 4

.gitattributes

@@ -17,5 +17,3 @@
 *.png binary
 *.jpg binary
 *.fon binary
-*.bin binary
-*.woff binary

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,178 +0,0 @@
-name: 🪲 Report a bug
-description: Create a bug report to help improve Marlin Firmware
-title: "[BUG] (bug summary)"
-body:
-  - type: markdown
-    attributes:
-      value: >
-        Do you want to ask a question? Are you looking for support? Please use one of the [support links](https://github.com/MarlinFirmware/Marlin/issues/new/choose).
-
-  - type: markdown
-    attributes:
-      value: |
-        **Thank you for reporting a bug in Marlin Firmware!**
-
-        ## Before Reporting a Bug
-
-        - Read and understand Marlin's [Code of Conduct](https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.1.x/.github/code_of_conduct.md). You are expected to comply with it, including treating everyone with respect.
-
-        - Test with the [`bugfix-2.1.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.1.x.zip) to see whether the issue still exists.
-
-        ## Instructions
-
-        Please follow the instructions below. Failure to do so may result in your issue being closed. See [Contributing to Marlin](https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.1.x/.github/contributing.md) for additional guidelines.
-
-        1. Provide a good title starting with [BUG].
-        2. Fill out all sections of this bug report form.
-        3. Always attach configuration files so we can build and test your setup.
-
-  - type: dropdown
-    attributes:
-      label: Did you test the latest `bugfix-2.1.x` code?
-      description: >-
-        Always try the latest code to make sure the issue you are reporting is not already fixed. To download
-        the latest code just [click this link](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.1.x.zip).
-      options:
-        - Yes, and the problem still exists.
-        - No, but I will test it now!
-    validations:
-      required: true
-
-  - type: markdown
-    attributes:
-      value: |
-        # Bug Details
-
-  - type: textarea
-    attributes:
-      label: Bug Description
-      description: >-
-        Describe the bug in this section. Tell us what you were trying to do and what
-        happened that you did not expect. Provide a clear and concise description of the
-        problem and include as many details as possible.
-
-        When pasting formatted text don't forget to put ` ``` ` (on its own line) before and after to make it readable.
-      placeholder: |
-        Marlin doesn't work.
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: Bug Timeline
-      description: Is this a new bug or an old issue? When did it first start?
-
-  - type: textarea
-    attributes:
-      label: Expected behavior
-      description: >-
-        What did you expect to happen?
-      placeholder: I expected it to move left.
-
-  - type: textarea
-    attributes:
-      label: Actual behavior
-      description: What actually happened instead?
-      placeholder: It moved right instead of left.
-
-  - type: textarea
-    attributes:
-      label: Steps to Reproduce
-      description: >-
-        Please describe the steps needed to reproduce the issue.
-      placeholder: |
-        1. [First Step] ...
-        2. [Second Step] ...
-        3. [and so on] ...
-
-  - type: markdown
-    attributes:
-      value: |
-        # Your Setup
-
-  - type: input
-    attributes:
-      label: Version of Marlin Firmware
-      description: "See the About Menu on the LCD or the output of `M115`. NOTE: For older releases we only patch critical bugs."
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: Printer model
-      description: Creality Ender 3, Prusa mini, or Kossel Delta?
-
-  - type: input
-    attributes:
-      label: Electronics
-      description: Stock electronics, upgrade board, or something else?
-
-  - type: input
-    attributes:
-      label: Add-ons
-      description: Please list any hardware add-ons that could be involved.
-
-  - type: dropdown
-    attributes:
-      label: Bed Leveling
-      description: What kind of bed leveling compensation are you using?
-      options:
-        - UBL Bilinear mesh
-        - ABL Bilinear mesh
-        - ABL Linear grid
-        - ABL 3-point
-        - MBL Manual Bed Leveling
-        - No Bed Leveling
-
-  - type: dropdown
-    attributes:
-      label: Your Slicer
-      description: Do you use Slic3r, Prusa Slicer, Simplify3D, IdeaMaker...?
-      options:
-        - Slic3r
-        - Simplify3D
-        - Prusa Slicer
-        - IdeaMaker
-        - Cura
-        - Other (explain below)
-
-  - type: dropdown
-    attributes:
-      label: Host Software
-      description: Do you use OctoPrint, Repetier Host, Pronterface...?
-      options:
-        - SD Card (headless)
-        - Repetier Host
-        - OctoPrint
-        - Pronterface
-        - Cura
-        - Same as my slicer
-        - Other (explain below)
-
-  - type: markdown
-    attributes:
-      value: |
-        # Attachments
-
-  - type: checkboxes
-    attributes:
-      label: Don't forget to include
-      options:
-        - label: A ZIP file containing your `Configuration.h` and `Configuration_adv.h`.
-          required: true
-
-  - type: markdown
-    attributes:
-      value: |
-        ### Optional items to include:
-        - 'Log output from the host. (`M111 S247` for maximum logging.)'
-        - Images or videos demonstrating the problem, if it helps to make it clear.
-        - A G-Code file that exposes the problem, if not affecting _all_ G-code.
-
-  - type: textarea
-    attributes:
-      label: Additional information & file uploads
-      description: >-
-        If you've made any other modifications to the firmware, please describe them in detail.
-
-        When pasting formatted text don't forget to put ` ``` ` (on its own line) before and after to make it readable.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,20 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: 📖 Marlin Documentation
-    url: https://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: https://reprap.org/forum/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!
-  - name: 💸 Want to donate?
-    url: https://www.thinkyhead.com/donate-to-marlin
-    about: Please take a look at the various options to support Marlin Firmware's development financially!

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,44 +0,0 @@
-name: ✨ Request a feature
-description: Request a new Marlin Firmware feature
-title: "[FR] (feature summary)"
-labels: 'T: Feature Request'
-body:
-  - type: markdown
-    attributes:
-      value: >
-        Do you want to ask a question? Are you looking for support? Please use one of the [support links](https://github.com/MarlinFirmware/Marlin/issues/new/choose).
-
-  - type: markdown
-    attributes:
-      value: >
-        **Thank you for requesting a new Marlin Firmware feature!**
-
-        ## Before Requesting a Feature
-
-        - Read and understand Marlin's [Code of Conduct](https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md). You are expected to comply with it, including treating everyone with respect.
-
-        - Check the latest [`bugfix-2.1.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.1.x.zip) to see if the feature already exists.
-
-        - Before you proceed with your request, please consider if it is necessary to make it into a firmware feature, or if it may be better suited for a slicer or host feature.
-
-  - type: textarea
-    attributes:
-      label: Is your feature request related to a problem? Please describe.
-      description: A clear description of the problem (e.g., "I need X but Marlin can't do it [...]").
-
-  - type: textarea
-    attributes:
-      label: Are you looking for hardware support?
-      description: Tell us the printer, board, or peripheral that needs support.
-
-  - type: textarea
-    attributes:
-      label: Describe the feature you want
-      description: A clear description of the feature and how you think it should work.
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: Add any other context or screenshots about the feature request here.

.github/contributing.md

@@ -34,11 +34,8 @@ This project and everyone participating in it is governed by the [Marlin Code of
 
 We have a Message Board and a Facebook group where our knowledgable user community can provide helpful advice if you have questions.
 
-- [Marlin Documentation](https://marlinfw.org) - Official Marlin documentation
-- Facebook Group ["Marlin Firmware"](https://www.facebook.com/groups/1049718498464482/)
-- RepRap.org [Marlin Forum](https://forums.reprap.org/list.php?415)
-- Facebook Group ["Marlin Firmware for 3D Printers"](https://www.facebook.com/groups/3Dtechtalk/)
-- [Marlin Configuration](https://www.youtube.com/results?search_query=marlin+configuration) on YouTube
+* [Marlin RepRap forum](https://reprap.org/forum/list.php?415)
+* [MarlinFirmware on Facebook](https://www.facebook.com/groups/1049718498464482/)
 
 If chat is more your speed, you can join the MarlinFirmware Discord server:
 
@@ -53,13 +50,13 @@ If chat is more your speed, you can join the MarlinFirmware Discord server:
 
 This section guides you through submitting a Bug Report for Marlin. Following these guidelines helps maintainers and the community understand your report, reproduce the behavior, and find related reports.
 
-Before creating a Bug Report, please test the "nightly" development branch, as you might find out that you don't need to create one. When you are creating a Bug Report, please [include as many details as possible](#how-do-i-submit-a-good-bug-report). Fill out [the required template](ISSUE_TEMPLATE/bug_report.yml), the information it asks for helps us resolve issues faster.
+Before creating a Bug Report, please test the "nightly" development branch, as you might find out that you don't need to create one. When you are creating a Bug Report, please [include as many details as possible](#how-do-i-submit-a-good-bug-report). Fill out [the required template](issue_template.md), the information it asks for helps us resolve issues faster.
 
 > **Note:** Regressions can happen. If you find a **Closed** issue that seems like your issue, go ahead and open a new issue and include a link to the original issue in the body of your new one. All you need to create a link is the issue number, preceded by #. For example, #8888.
 
 #### How Do I Submit A (Good) Bug Report?
 
-Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/). Use the New Issue button to create an issue and provide the following information by filling in [the template](ISSUE_TEMPLATE/bug_report.yml).
+Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/). Use the New Issue button to create an issue and provide the following information by filling in [the template](issue_template.md).
 
 Explain the problem and include additional details to help maintainers reproduce the problem:
 
@@ -91,12 +88,12 @@ Include details about your configuration and environment:
 
 This section guides you through submitting a suggestion for Marlin, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion and find related suggestions.
 
-Before creating a suggestion, please check [this list](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aopen+is%3Aissue+label%3A%22T%3A+Feature+Request%22) as you might find out that you don't need to create one. When you are creating an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-a-good-feature-request). Fill in [the template](ISSUE_TEMPLATE/feature_request.yml), including the steps that you imagine you would take if the feature you're requesting existed.
+Before creating a suggestion, please check [this list](#before-submitting-a-suggestion) as you might find out that you don't need to create one. When you are creating an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-a-good-enhancement-suggestion). Fill in [the template](issue_template.md), including the steps that you imagine you would take if the feature you're requesting existed.
 
 #### Before Submitting a Feature Request
 
 * **Check the [Marlin website](https://marlinfw.org/)** for tips — you might discover that the feature is already included. Most importantly, check if you're using [the latest version of Marlin](https://github.com/MarlinFirmware/Marlin/releases) and if you can get the desired behavior by changing [Marlin's config settings](https://marlinfw.org/docs/configuration/configuration.html).
-* **Perform a [cursory search](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aopen+is%3Aissue+label%3A%22T%3A+Feature+Request%22)** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
+* **Perform a [cursory search](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aissue)** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
 
 #### How Do I Submit A (Good) Feature Request?
 
@@ -119,7 +116,7 @@ Unsure where to begin contributing to Marlin? You can start by looking through t
 
 ### Pull Requests
 
-Pull Requests should always be targeted to working branches (e.g., `bugfix-2.1.x` and/or `bugfix-1.1.x`) and never to release branches (e.g., `2.0.x` and/or `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](https://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
+Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x` and/or `bugfix-2.0.x`) and never to release branches (e.g., `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](https://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
 
 * Fill in [the required template](pull_request_template.md).
 * Don't include issue numbers in the PR title.

.github/issue_template.md

@@ -0,0 +1,35 @@
+<!--
+
+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/bugfix-2.0.x/.github/code_of_conduct.md
+
+Do you want to ask a question? Are you looking for support? Please don't post here. 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.
+
+-->
+
+### Description
+
+<!-- Description of the bug or requested feature -->
+
+### Steps to Reproduce
+
+<!-- If this is a Bug Report, 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
+
+* Include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.
+* Provide pictures or links to videos that clearly demonstrate the issue.
+* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.

.github/pull_request_template.md

@@ -1,33 +1,23 @@
-<!--
+### Requirements
 
-Submitting a Pull Request
-
-- Please fill out all sections of this form. You can delete the helpful comments.
-- Pull Requests without clear information will take longer and may even be rejected.
-- We get a high volume of submissions so please be patient during review.
-
--->
+* Filling out this template is required. Pull Requests without a clear description may be closed at the maintainers' discretion.
 
 ### Description
 
 <!--
 
-Clearly describe the submitted changes with lots of details. Include images where helpful. Initial reviewers may not be familiar with the subject, so be as thorough as possible. You can use MarkDown syntax to improve readability with bullet lists, code blocks, and so on. PREVIEW and fix up formatting before submitting.
+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.
 
 -->
 
-### Requirements
-
-<!-- Does this PR require a specific board, LCD, etc.? -->
-
 ### Benefits
 
-<!-- What does this PR fix or improve? -->
+<!-- What does this fix or improve? -->
 
 ### Configurations
 
-<!-- Attach Configurations ZIP and any other files needed to test this PR. -->
+<!-- Attach any Configuration.h, Configuration_adv.h, or platformio.ini files needed to compile/test your Pull Request. -->
 
 ### Related Issues
 
-<!-- Does this PR fix a bug or fulfill a Feature Request? Link related Issues here. -->
+<!-- Whether this fixes a bug or fulfills a feature request, please list any related Issues here. -->

.github/workflows/bump-date.yml

@@ -1,59 +0,0 @@
-#
-# bump-date.yml
-# Bump the distribution date once per day
-#
-
-name: Bump Distribution Date
-
-on:
-  schedule:
-    - cron: '0 */6 * * *'
-
-jobs:
-  bump_date:
-    name: Bump Distribution Date
-    if: github.repository == 'MarlinFirmware/Marlin'
-
-    runs-on: ubuntu-latest
-
-    steps:
-
-    - name: Check out bugfix-2.1.x
-      uses: actions/checkout@v2
-      with:
-        ref: bugfix-2.1.x
-
-    - name: Bump Date (bugfix-2.0.x)
-      run: |
-        # Inline Bump Script
-        if [[ ! "$( git log -1 --pretty=%B )" =~ ^\[cron\] ]]; then
-          DIST=$( date +"%Y-%m-%d" )
-          eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \
-          eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/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
-        fi
-        exit 0
-
-    - name: Check out bugfix-2.1.x
-      uses: actions/checkout@v2
-      with:
-        ref: bugfix-2.1.x
-
-    - name: Bump Date (bugfix-2.1.x)
-      run: |
-        # Inline Bump Script
-        if [[ ! "$( git log -1 --pretty=%B )" =~ ^\[cron\] ]]; then
-          DIST=$( date +"%Y-%m-%d" )
-          eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \
-          eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/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
-        fi
-        exit 0

.github/workflows/check-pr.yml

@@ -1,34 +0,0 @@
-#
-# check-pr.yml
-# Close PRs directed at release branches
-#
-
-name: PR Bad Target
-
-on:
-  pull_request_target:
-    types: [opened]
-    branches:
-    - 1.0.x
-    - 1.1.x
-    - 2.0.x
-    - 2.1.x
-
-jobs:
-  bad_target:
-    name: PR Bad Target
-    if: github.repository == 'MarlinFirmware/Marlin'
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: superbrothers/close-pull-request@v3
-      with:
-        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.1.x` branch and be careful to target `bugfix-2.1.x` when resubmitting the PR. Patches may also target `bugfix-2.0.x` if they are specifically for 2.0.9.x.
-
-          It may help to set your fork's default branch to `bugfix-2.0.x`.
-
-          See [this page](https://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.

.github/workflows/clean-closed.yml

@@ -1,39 +0,0 @@
-#
-# clean-closed.yml
-# Remove obsolete labels when an Issue or PR is closed
-#
-
-name: Clean Closed
-
-on:
-  pull_request:
-    types: [closed]
-  issues:
-    types: [closed]
-
-jobs:
-  remove_label:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        label:
-          - "S: Don't Merge"
-          - "S: Hold for 2.1"
-          - "S: Please Merge"
-          - "S: Please Test"
-          - "help wanted"
-          - "Needs: Discussion"
-          - "Needs: Documentation"
-          - "Needs: More Data"
-          - "Needs: Patch"
-          - "Needs: Testing"
-          - "Needs: Work"
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Remove Labels
-        uses: actions-ecosystem/action-remove-labels@v1
-        with:
-          github_token: ${{ github.token }}
-          labels: ${{ matrix.label }}

.github/workflows/close-stale.yml

@@ -1,28 +0,0 @@
-#
-# 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 == 'MarlinFirmware/Marlin'
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/stale@v3
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'This issue has had no activity in the last 60 days. Please add a reply if you want to keep this issue active, otherwise it will be automatically closed within 10 days.'
-        days-before-stale: 60
-        days-before-close: 10
-        stale-issue-label: 'stale-closing-soon'
-        exempt-all-assignees: true
-        exempt-issue-labels: 'Bug: Confirmed !,T: Feature Request,Needs: More Data,Needs: Discussion,Needs: Documentation,Needs: Patch,Needs: Work,Needs: Testing,help wanted,no-locking'

.github/workflows/lock-closed.yml

@@ -1,32 +0,0 @@
-#
-# 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 == 'MarlinFirmware/Marlin'
-
-    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/test-builds.yml

@@ -8,7 +8,7 @@ name: CI
 on:
   pull_request:
     branches:
-    - bugfix-2.1.x
+    - bugfix-2.0.x
     paths-ignore:
     - config/**
     - data/**
@@ -16,7 +16,7 @@ on:
     - '**/*.md'
   push:
     branches:
-    - bugfix-2.1.x
+    - bugfix-2.0.x
     paths-ignore:
     - config/**
     - data/**
@@ -36,117 +36,86 @@ jobs:
         # Base Environments
 
         - DUE
-        - DUE_archim
         - esp32
         - linux_native
         - mega2560
-        - at90usb1286_dfu
         - teensy31
         - teensy35
-        - teensy41
         - SAMD51_grandcentral_m4
-        - PANDA_PI_V29
 
         # Extended AVR Environments
 
-        - FYSETC_F6
+        - FYSETC_F6_13
         - mega1280
         - rambo
         - sanguino1284p
         - sanguino644p
 
-        # STM32F1 (Maple) Environments
-
-        #- STM32F103RC_btt_maple
-        - STM32F103RC_btt_USB_maple
-        - STM32F103RC_fysetc_maple
-        - STM32F103RC_meeb_maple
-        - jgaurora_a5s_a1_maple
-        - STM32F103VE_longer_maple
-        #- mks_robin_maple
-        - mks_robin_lite_maple
-        - mks_robin_pro_maple
-        #- mks_robin_nano_v1v2_maple
-        #- STM32F103RE_creality_maple
-        - STM32F103VE_ZM3E4V2_USB_maple
-
-        # STM32 (ST) Environments
+        # Extended STM32 Environments
 
         - STM32F103RC_btt
-        #- STM32F103RC_btt_USB
+        - STM32F103RC_btt_USB
         - STM32F103RE_btt
         - STM32F103RE_btt_USB
-        - STM32F103RE_creality
-        - STM32F401RC_creality
+        - STM32F103RC_fysetc
+        - STM32F103RC_meeb
+        - jgaurora_a5s_a1
         - STM32F103VE_longer
         - STM32F407VE_black
+        - STM32F401VE_STEVAL
         - BIGTREE_BTT002
         - BIGTREE_SKR_PRO
         - BIGTREE_GTR_V1_0
         - mks_robin
+        - mks_robin_stm32
         - ARMED
         - FYSETC_S6
-        - STM32F070CB_malyan
         - STM32F070RB_malyan
         - malyan_M300
+        - mks_robin_lite
         - FLYF407ZG
         - rumba32
+        - mks_robin_pro
+        - STM32F103RET6_creality
         - LERDGEX
-        - LERDGEK
-        - mks_robin_nano_v1v2
-        #- mks_robin_nano_v1v2_usbmod
-        #- mks_robin_nano_v1_3_f4_usbmod
-        - NUCLEO_F767ZI
-        - REMRAM_V1
-        - BTT_SKR_SE_BX
-        - chitu_f103
-        - Opulo_Lumen_REV3
-
-        # ESP32 environments
-        - mks_tinybee
+        - mks_robin_nano35
 
         # Put lengthy tests last
 
         - LPC1768
         - LPC1769
 
+        # STM32 with non-STM framework. both broken for now. they should use HAL_STM32 which is working.
+
+        #- STM32F4
+        #- STM32F7
+
         # Non-working environment tests
         #- at90usb1286_cdc
+        #- at90usb1286_dfu
         #- STM32F103CB_malyan
-        #- STM32F103RE
         #- mks_robin_mini
 
     steps:
 
-    - name: Check out the PR
-      uses: actions/checkout@v3
-
-    - name: Cache pip
-      uses: actions/cache@v3
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache PlatformIO
-      uses: actions/cache@v3
-      with:
-        path: ~/.platformio
-        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
-
     - name: Select Python 3.7
-      uses: actions/setup-python@v3
+      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 platformio
-        pio upgrade --dev
-        pio pkg update --global
+        pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
+        platformio update
+
+    - name: Check out the PR
+      uses: actions/checkout@v2
 
     - name: Run ${{ matrix.test-platform }} Tests
       run: |
-        make tests-single-ci TEST_TARGET=${{ matrix.test-platform }}
+        # Inline tests script
+        chmod +x buildroot/bin/*
+        chmod +x buildroot/tests/*
+        export PATH=./buildroot/bin/:./buildroot/tests/:${PATH}
+        run_tests . ${{ matrix.test-platform }}

.github/workflows/unlock-reopened.yml

@@ -1,22 +0,0 @@
-#
-# 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 == 'MarlinFirmware/Marlin'
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: OSDKDev/unlock-issues@v1.1
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"

.gitignore

@@ -19,19 +19,15 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-# Generated files
+# Our automatic versioning scheme generates the following file
+# NEVER put it in the repository
 _Version.h
-bdf2u8g
-marlin_config.json
-mczip.h
-*.gen
-*.sublime-workspace
 
 #
 # OS
 #
 applet/
-.DS_Store
+*.DS_Store
 
 #
 # Misc
@@ -41,6 +37,7 @@ applet/
 *.rej
 *.bak
 *.idea
+*.s
 *.i
 *.ii
 *.swp
@@ -80,6 +77,7 @@ tags
 *.out
 *.app
 
+
 #
 # C
 #
@@ -125,10 +123,33 @@ tags
 .gcc-flags.json
 /lib/
 
+# Workaround for Deviot+platformio quirks
+Marlin/lib
+Marlin/platformio.ini
+Marlin/*/platformio.ini
+Marlin/*/*/platformio.ini
+Marlin/*/*/*/platformio.ini
+Marlin/*/*/*/*/platformio.ini
+Marlin/.travis.yml
+Marlin/*/.travis.yml
+Marlin/*/*/.travis.yml
+Marlin/*/*/*/.travis.yml
+Marlin/*/*/*/*/.travis.yml
+Marlin/.gitignore
+Marlin/*/.gitignore
+Marlin/*/*/.gitignore
+Marlin/*/*/*/.gitignore
+Marlin/*/*/*/*/.gitignore
+Marlin/readme.txt
+Marlin/*/readme.txt
+Marlin/*/*/readme.txt
+Marlin/*/*/*/readme.txt
+Marlin/*/*/*/*/readme.txt
+
 # Secure Credentials
 Configuration_Secure.h
 
-# Visual Studio
+#Visual Studio
 *.sln
 *.vcxproj
 *.vcxproj.user
@@ -139,34 +160,27 @@ __vm/
 .vs/
 vc-fileutils.settings
 
-# Visual Studio Code
-.vscode/*
-!.vscode/extensions.json
-
-#Simulation
-imgui.ini
-eeprom.dat
-spi_flash.bin
-fs.img
+#Visual Studio Code
+.vscode
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/*.db
 
 #cmake
 CMakeLists.txt
 src/CMakeLists.txt
 CMakeListsPrivate.txt
-build/
 
-# CLion
+#CLion
 cmake-build-*
 
-# Eclipse
+#Eclipse
 .project
 .cproject
 .pydevproject
 .settings
 .classpath
 
-# Python
+#Python
 __pycache__
-
-# IOLogger logs
-*_log.csv

.vscode/extensions.json

@@ -1,11 +0,0 @@
-{
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
-    "recommendations": [
-        "marlinfirmware.auto-build",
-        "platformio.platformio-ide"
-    ],
-    "unwantedRecommendations": [
-        "ms-vscode.cpptools-extension-pack"
-    ]
-}