Merge branch 'bugfix-2.0.x' into pr/22721

.github/workflows/test-builds.yml

@@ -66,7 +66,7 @@ jobs:
         - mks_robin_lite_maple
         - mks_robin_pro_maple
         #- mks_robin_nano35_maple
-        #- STM32F103RET6_creality_maple
+        #- STM32F103RE_creality_maple
         - STM32F103VE_ZM3E4V2_USB_maple
 
         # STM32 (ST) Environments
@@ -75,7 +75,7 @@ jobs:
         #- STM32F103RC_btt_USB
         - STM32F103RE_btt
         - STM32F103RE_btt_USB
-        - STM32F103RET6_creality
+        - STM32F103RE_creality
         - STM32F103VE_longer
         - STM32F407VE_black
         - STM32F401VE_STEVAL
@@ -113,24 +113,24 @@ jobs:
     steps:
 
     - name: Check out the PR
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Cache pip
-      uses: actions/cache@v2
+      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@v2
+      uses: actions/cache@v3
       with:
         path: ~/.platformio
         key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
 
     - name: Select Python 3.7
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       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

.gitignore

@@ -22,12 +22,16 @@
 # Generated files
 _Version.h
 bdf2u8g
+marlin_config.json
+mczip.h
+*.gen
+*.sublime-workspace
 
 #
 # OS
 #
 applet/
-*.DS_Store
+.DS_Store
 
 #
 # Misc
@@ -37,7 +41,6 @@ applet/
 *.rej
 *.bak
 *.idea
-*.s
 *.i
 *.ii
 *.swp
@@ -137,20 +140,19 @@ __vm/
 vc-fileutils.settings
 
 # Visual Studio Code
-.vscode
-.vscode/.browse.c_cpp.db*
-.vscode/c_cpp_properties.json
-.vscode/launch.json
-.vscode/*.db
+.vscode/*
+!.vscode/extensions.json
 
 #Simulation
 imgui.ini
 eeprom.dat
+spi_flash.bin
 
 #cmake
 CMakeLists.txt
 src/CMakeLists.txt
 CMakeListsPrivate.txt
+build/
 
 # CLion
 cmake-build-*
@@ -167,7 +169,3 @@ __pycache__
 
 # IOLogger logs
 *_log.csv
-
-# Simulation / Native
-eeprom.dat
-imgui.ini

.vscode/extensions.json

@@ -0,0 +1,11 @@
+{
+    // 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"
+    ]
+}