Merge branch 'bugfix-2.0.x' into TMSX4_2.0_Bleeding

.editorconfig

@@ -4,10 +4,10 @@ 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

.github/workflows/test-builds.yml

@@ -56,33 +56,28 @@ jobs:
 
         # STM32F1 (Maple) Environments
 
-        #- STM32F103RC_btt_maple
+        - STM32F103RC_btt
-        - STM32F103RC_btt_USB_maple
+        - STM32F103RC_btt_USB
-        - STM32F103RC_fysetc_maple
+        - STM32F103RE_btt
+        - STM32F103RE_btt_USB
+        - STM32F103RC_fysetc
         - STM32F103RC_meeb
-        - jgaurora_a5s_a1_maple
+        - jgaurora_a5s_a1
-        - STM32F103VE_longer_maple
+        - STM32F103VE_longer
-        #- mks_robin_maple
+        - mks_robin
-        - mks_robin_lite_maple
+        - mks_robin_lite
-        - mks_robin_pro_maple
+        - mks_robin_pro
-        #- mks_robin_nano35_maple
+        - STM32F103RET6_creality
-        #- STM32F103RE_creality_maple
+        - mks_robin_nano35
-        - STM32F103VE_ZM3E4V2_USB_maple
 
         # STM32 (ST) Environments
 
-        - STM32F103RC_btt
-        #- STM32F103RC_btt_USB
-        - STM32F103RE_btt
-        - STM32F103RE_btt_USB
-        - STM32F103RE_creality
-        - 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
@@ -91,13 +86,9 @@ jobs:
         - FLYF407ZG
         - rumba32
         - LERDGEX
-        - LERDGEK
+        - mks_robin_nano35_stm32
-        - mks_robin_nano35
         - NUCLEO_F767ZI
         - REMRAM_V1
-        - BTT_SKR_SE_BX
-        - chitu_f103
-        - Index_Mobo_Rev03
 
         # Put lengthy tests last
 
@@ -107,30 +98,12 @@ jobs:
         # Non-working environment tests
         #- at90usb1286_cdc
         #- STM32F103CB_malyan
-        #- STM32F103RE
         #- mks_robin_mini
 
     steps:
 
-    - name: Check out the PR
-      uses: actions/checkout@v2
-
-    - name: Cache pip
-      uses: actions/cache@v2
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
-    - name: Cache PlatformIO
-      uses: actions/cache@v2
-      with:
-        path: ~/.platformio
-        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
-
     - name: Select Python 3.7
-      uses: actions/setup-python@v2
+      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
@@ -140,6 +113,9 @@ jobs:
         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 }}

.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
@@ -111,6 +108,7 @@ tags
 *.app
 *.i*86
 *.x86_64
+*.hex
 
 # Debug files
 *.dSYM/
@@ -124,6 +122,29 @@ 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
 
@@ -139,19 +160,16 @@ __vm/
 vc-fileutils.settings
 
 # Visual Studio Code
-.vscode/*
+.vscode
-!.vscode/extensions.json
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/*.db
 
-#Simulation
+# cmake
-imgui.ini
-eeprom.dat
-spi_flash.bin
-
-#cmake
 CMakeLists.txt
 src/CMakeLists.txt
 CMakeListsPrivate.txt
-build/
 
 # CLion
 cmake-build-*
@@ -168,3 +186,7 @@ __pycache__
 
 # IOLogger logs
 *_log.csv
+
+# Simulation / Native
+eeprom.dat
+imgui.ini

.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"
-    ]
-}