Merge branch 'bugfix-2.1.x' into mike-config

* bugfix-2.1.x: (77 commits) [cron] Bump distribution date (2023-12-14) ✨ MARKFORGED_INVERSE (MarlinFirmware#26516) [cron] Bump distribution date (2023-12-13) ✨ EDITABLE_DISPLAY_TIMEOUT (MarlinFirmware#26517) [cron] Bump distribution date (2023-12-12) 🐛 Fix MKS TS35 with BTT SKR 1.3/1.4 (MarlinFirmware#26176) ✨ SERIAL_DMA (for some STM32Fx) (MarlinFirmware#26328) [cron] Bump distribution date (2023-12-10) 🚸 Adjust Progress / Completion (MarlinFirmware#26466) 🚸 Encoder improvements (MarlinFirmware#26501) 🩹 Fix UBL debug output [cron] Bump distribution date (2023-12-09) ⚡️ Use strlcpy with buffer size (MarlinFirmware#26513) [cron] Bump distribution date (2023-12-08) 🔨 Use PIO versioning (including HC32) (MarlinFirmware#26512) [cron] Bump distribution date (2023-12-06) ✨ Voxelab Aquila N32 (via Maple) (MarlinFirmware#26470) 🐛 Fix tool-change E prime (MarlinFirmware#26494) [cron] Bump distribution date (2023-12-05) 🐛 Fix thermistor 14 & 60 constexprness (MarlinFirmware#26499) ... # Conflicts: # .github/workflows/check-pr.yml # .github/workflows/clean-closed.yml
mikezs · Dec 14, 2023 · 99b5eb1 · 99b5eb1
2 parents 2a5aec1 + 8bce9de
commit 99b5eb1
Show file tree

Hide file tree

Showing 263 changed files with 8,792 additions and 2,145 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,7 @@
 name: 🪲 Report a bug
 description: Create a bug report to help improve Marlin Firmware
 title: "[BUG] (bug summary)"
+labels: ["Bug: Potential ?"]
 body:
  - type: markdown
  attributes:

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,7 +1,7 @@
 name: ✨ Request a feature
 description: Request a new Marlin Firmware feature
 title: "[FR] (feature summary)"
-labels: 'T: Feature Request'
+labels: ["T: Feature Request"]
 body:
  - type: markdown
  attributes:

diff --git a/.github/code_of_conduct.md b/.github/code_of_conduct.md
@@ -30,7 +30,7 @@ Project maintainers have the right and responsibility to remove, edit, or reject
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by messaging @MarlinFirmware/moderators on the relevant issue, [or privately](//github.com/orgs/MarlinFirmware/teams/moderators). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by following GitHub's [reporting abuse or spam article](https://docs.github.com/en/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
 
 ## Attribution
 

diff --git a/.github/contributing.md b/.github/contributing.md
@@ -26,11 +26,12 @@ The following is a set of guidelines for contributing to Marlin, hosted by the [
 
 ## Code of Conduct
 
-This project and everyone participating in it is governed by the [Marlin Code of Conduct](code_of_conduct.md). By participating, you are expected to uphold this code. Please report unacceptable behavior by messaging @MarlinFirmware/moderators on the relevant issue, [or privately](//github.com/orgs/MarlinFirmware/teams/moderators).
+This project and everyone participating in it is governed by the [Marlin Code of Conduct](code_of_conduct.md). By participating, you are expected to uphold this code. Please report unacceptable behavior by following GitHub's [reporting abuse or spam article](https://docs.github.com/en/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam).
 
 ## I don't want to read this whole thing I just have a question!!!
 
-> **Note:** Please don't file an issue to ask a question. You'll get faster results by using the resources below.
+> [!NOTE]
+> Please don't file an issue to ask a question. You'll get faster results by using the resources below.
 
 We have a Message Board and a Facebook group where our knowledgable user community can provide helpful advice if you have questions.
 
@@ -55,7 +56,8 @@ This section guides you through submitting a Bug Report for Marlin. Following th
 
 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.
 
-> **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.
+> [!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?
 

diff --git a/.github/workflows/auto-label.yml b/.github/workflows/auto-label.yml
@@ -0,0 +1,41 @@
+#
+# auto-label.yml
+# - Find all open issues without a label and a title containing "[BUG]".
+# - Apply the label "Bug: Potential ?" to these issues.
+#
+
+name: Label Old Bugs
+
+on:
+ schedule:
+ - cron: "30 8 * * *"
+
+jobs:
+ autolabel:
+ name: Auto Label
+ if: github.repository == 'MarlinFirmware/Marlin'
+ runs-on: ubuntu-latest
+ steps:
+ - name: Auto Label for [BUG]
+ uses: actions/github-script@v7
+ with:
+ script: |
+ // Get all open issues in this repository
+ const issueList = await github.rest.issues.listForRepo({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ state: 'open'
+ });
+ // Filter issues without labels that have a title containing '[BUG]'.
+ const matchingIssues = issueList.data.filter(
+ issue => issue.title.includes('[BUG]') && issue.labels.length === 0
+ );
+ // Process the first 50
+ for (const issue of matchingIssues.slice(0, 50)) {
+ await github.rest.issues.addLabels({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ issue_number: issue.number,
+ labels: ['Bug: Potential ?']
+ });
+ }
diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml
@@ -0,0 +1,33 @@
+#
+# 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
+
+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.1.x`.
+
+ See [this page](https://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.
diff --git a/.github/workflows/clean-closed.yml b/.github/workflows/clean-closed.yml
@@ -0,0 +1,40 @@
+#
+# 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"
+ - "Bug: Potential ?"
+ - "Needs: Discussion"
+ - "Needs: Documentation"
+ - "Needs: More Data"
+ - "Needs: Patch"
+ - "Needs: Testing"
+ - "Needs: Work"
+
+ steps:
+ - uses: actions/checkout@v3
+ - name: Remove Labels
+ uses: actions-ecosystem/action-remove-labels@v1
+ with:
+ github_token: ${{ github.token }}
+ labels: ${{ matrix.label }}
diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml
@@ -17,7 +17,7 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/stale@v3
+ - uses: actions/stale@v8
  with:
  repo-token: ${{ secrets.GITHUB_TOKEN }}
  stale-issue-message: |

diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
@@ -9,6 +9,7 @@ on:
  pull_request:
  branches:
  - bugfix-2.1.x
+ - 2.1.x
  paths-ignore:
  - config/**
  - data/**
@@ -17,6 +18,7 @@ on:
  push:
  branches:
  - bugfix-2.1.x
+ - 2.1.x
  paths-ignore:
  - config/**
  - data/**
@@ -137,14 +139,17 @@ jobs:
  # STM32G0
  - STM32G0B1RE_btt
 
+ # HC32
+ - HC32F460C_aquila_101
+
  # LPC176x - Lengthy tests
  - LPC1768
  - LPC1769
 
  steps:
 
  - name: Check out the PR
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Cache pip
  uses: actions/cache@v3
@@ -160,11 +165,11 @@ jobs:
  path: ~/.platformio
  key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
 
- - name: Select Python 3.7
- uses: actions/setup-python@v3
+ - name: Select Python 3.9
+ uses: actions/setup-python@v4
  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
+ python-version: '3.9'
+ architecture: 'x64'
 
  - name: Install PlatformIO
  run: |

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -517,10 +517,10 @@
  * ================================================================
  * SPI RTD/Thermocouple Boards
  * ================================================================
- * -5 : MAX31865 with Pt100/Pt1000, 2, 3, or 4-wire (only for sensors 0-1)
+ * -5 : MAX31865 with Pt100/Pt1000, 2, 3, or 4-wire (only for sensors 0-2 and bed)
  * NOTE: You must uncomment/set the MAX31865_*_OHMS_n defines below.
- * -3 : MAX31855 with Thermocouple, -200°C to +700°C (only for sensors 0-1)
- * -2 : MAX6675 with Thermocouple, 0°C to +700°C (only for sensors 0-1)
+ * -3 : MAX31855 with Thermocouple, -200°C to +700°C (only for sensors 0-2 and bed)
+ * -2 : MAX6675 with Thermocouple, 0°C to +700°C (only for sensors 0-2 and bed)
  *
  * NOTE: Ensure TEMP_n_CS_PIN is set in your pins file for each TEMP_SENSOR_n using an SPI Thermocouple. By default,
  * Hardware SPI on the default serial bus is used. If you have also set TEMP_n_SCK_PIN and TEMP_n_MISO_PIN,
@@ -897,8 +897,16 @@
 //#define COREYX
 //#define COREZX
 //#define COREZY
-//#define MARKFORGED_XY // MarkForged. See https://reprap.org/forum/read.php?152,504042
+
+//
+// MarkForged Kinematics
+// See https://reprap.org/forum/read.php?152,504042
+//
+//#define MARKFORGED_XY
 //#define MARKFORGED_YX
+#if ANY(MARKFORGED_XY, MARKFORGED_YX)
+ //#define MARKFORGED_INVERSE // Enable for an inverted Markforged kinematics belt path
+#endif
 
 // Enable for a belt style printer with endless "Z" motion
 //#define BELTPRINTER
@@ -1435,6 +1443,9 @@
  * Uses I2C port, so it requires I2C library markyue/Panda_SoftMasterI2C.
  */
 //#define BD_SENSOR
+#if ENABLED(BD_SENSOR)
+ //#define BD_SENSOR_PROBE_NO_STOP // Probe bed without stopping at each probe point
+#endif
 
 // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN)
 //#define SOLENOID_PROBE
@@ -1760,10 +1771,13 @@
  */
 //#define Z_IDLE_HEIGHT Z_HOME_POS
 
-//#define Z_CLEARANCE_FOR_HOMING 4 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
- // Be sure to have this much clearance over your Z_MAX_POS to prevent grinding.
+//#define Z_CLEARANCE_FOR_HOMING 4 // (mm) Minimal Z height before homing (G28) for Z clearance above the bed, clamps, ...
+ // You'll need this much clearance above Z_MAX_POS to avoid grinding.
+
+//#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing (if Z was homed)
+//#define XY_AFTER_HOMING { 10, 10 } // (mm) Move to an XY position after homing (and raising Z)
 
-//#define Z_AFTER_HOMING 10 // (mm) Height to move to after homing (if Z was homed)
+//#define EVENT_GCODE_AFTER_HOMING "M300 P440 S200" // Commands to run after G28 (and move to XY_AFTER_HOMING)
 
 // Direction of endstops when homing; 1=MAX, -1=MIN
 // :[-1,1]
@@ -2248,8 +2262,8 @@
 #define Z_SAFE_HOMING
 
 #if ENABLED(Z_SAFE_HOMING)
- #define Z_SAFE_HOMING_X_POINT X_CENTER // X point for Z homing
- #define Z_SAFE_HOMING_Y_POINT Y_CENTER // Y point for Z homing
+ #define Z_SAFE_HOMING_X_POINT X_CENTER // (mm) X point for Z homing
+ #define Z_SAFE_HOMING_Y_POINT Y_CENTER // (mm) Y point for Z homing
  //#define Z_SAFE_HOMING_POINT_ABSOLUTE // Ignore home offsets (M206) for Z homing position
 #endif