Merge remote-tracking branch 'upstream/2.0.x' into 2.0.x_cr30

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -110,6 +110,18 @@ body:
       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

.github/workflows/bump-date.yml

@@ -28,6 +28,7 @@ jobs:
         # 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" && \
+        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 . && \

.github/workflows/check-pr.yml

@@ -6,7 +6,8 @@
 name: PR Bad Target
 
 on:
-  pull_request:
+  pull_request_target:
+    types: [opened]
     branches:
     - 1.0.x
     - 1.1.x

.github/workflows/test-builds.yml

@@ -58,15 +58,16 @@ jobs:
 
         #- STM32F103RC_btt_maple
         - STM32F103RC_btt_USB_maple
-        - STM32F103RC_fysetc
+        - STM32F103RC_fysetc_maple
         - STM32F103RC_meeb
-        - jgaurora_a5s_a1
-        - STM32F103VE_longer
+        - jgaurora_a5s_a1_maple
+        - STM32F103VE_longer_maple
         #- mks_robin_maple
-        - mks_robin_lite
-        - mks_robin_pro
+        - mks_robin_lite_maple
+        - mks_robin_pro_maple
         #- mks_robin_nano35_maple
         #- STM32F103RET6_creality_maple
+        - STM32F103VE_ZM3E4V2_USB_maple
 
         # STM32 (ST) Environments
 
@@ -75,6 +76,7 @@ jobs:
         - STM32F103RE_btt
         - STM32F103RE_btt_USB
         - STM32F103RET6_creality
+        - STM32F103VE_longer
         - STM32F407VE_black
         - STM32F401VE_STEVAL
         - BIGTREE_BTT002
@@ -95,6 +97,7 @@ jobs:
         - REMRAM_V1
         - BTT_SKR_SE_BX
         - chitu_f103
+        - Index_Mobo_Rev03
 
         # Put lengthy tests last
 

.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
@@ -137,16 +141,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
 
-# cmake
+#Simulation
+imgui.ini
+eeprom.dat
+spi_flash.bin
+
+#cmake
 CMakeLists.txt
 src/CMakeLists.txt
 CMakeListsPrivate.txt
+build/
 
 # CLion
 cmake-build-*
@@ -163,7 +170,3 @@ __pycache__
 
 # IOLogger logs
 *_log.csv
-
-# Simulation / Native
-eeprom.dat
-imgui.ini

.vscode/extensions.json

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