Merge branch 'bugfix-2.0.x' into ArtilleryX1_2.0_Devel

See #20649

.github/workflows/test-builds.yml

@@ -66,7 +66,7 @@ jobs:
         - mks_robin_lite_maple
         - mks_robin_pro_maple
         #- mks_robin_nano35_maple
-        #- STM32F103RE_creality_maple
+        #- STM32F103RET6_creality_maple
         - STM32F103VE_ZM3E4V2_USB_maple
 
         # STM32 (ST) Environments
@@ -75,8 +75,7 @@ jobs:
         #- STM32F103RC_btt_USB
         - STM32F103RE_btt
         - STM32F103RE_btt_USB
-        - STM32F103RE_creality
-        - STM32F401RC_creality
+        - STM32F103RET6_creality
         - STM32F103VE_longer
         - STM32F407VE_black
         - STM32F401VE_STEVAL
@@ -98,7 +97,6 @@ jobs:
         - REMRAM_V1
         - BTT_SKR_SE_BX
         - chitu_f103
-        - Index_Mobo_Rev03
 
         # Put lengthy tests last
 
@@ -114,10 +112,10 @@ jobs:
     steps:
 
     - name: Check out the PR
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
 
     - name: Cache pip
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
@@ -125,20 +123,20 @@ jobs:
           ${{ runner.os }}-pip-
 
     - name: Cache PlatformIO
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: ~/.platformio
         key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
 
     - name: Select Python 3.7
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v2
       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/v5.2.5.zip
+        pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
         platformio update
 
     - name: Run ${{ matrix.test-platform }} Tests

.gitignore

@@ -22,16 +22,12 @@
 # Generated files
 _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,7 +108,7 @@ tags
 *.app
 *.i*86
 *.x86_64
-
+*.hex
 
 # Debug files
 *.dSYM/
@@ -140,19 +137,20 @@ __vm/
 vc-fileutils.settings
 
 # Visual Studio Code
-.vscode/*
-!.vscode/extensions.json
+.vscode
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/*.db
 
 #Simulation
 imgui.ini
 eeprom.dat
-spi_flash.bin
 
 #cmake
 CMakeLists.txt
 src/CMakeLists.txt
 CMakeListsPrivate.txt
-build/
 
 # CLion
 cmake-build-*
@@ -169,4 +167,7 @@ __pycache__
 
 # IOLogger logs
 *_log.csv
-.vscode/extensions.json
+
+# 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"
-    ]
-}