Skip to content

Commit 3d3d796

Browse files
committed
Merge branch 'bugfix-2.1.x' into pr/26839
2 parents 0fb7e35 + a6a5be0 commit 3d3d796

File tree

1,429 files changed

+54598
-76749
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,429 files changed

+54598
-76749
lines changed

.devcontainer/devcontainer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
"platformio.platformio-ide",
3939
"marlinfirmware.auto-build",
4040
"editorconfig.editorconfig"
41-
],
41+
]
4242

4343
// Use 'forwardPorts' to make a list of ports inside the container available locally.
44-
// "forwardPorts": [],
44+
// , "forwardPorts": []
4545

4646
// Use 'postCreateCommand' to run commands after the container is created.
47-
// "postCreateCommand": "pip3 install --user -r requirements.txt",
47+
// , "postCreateCommand": "pip3 install --user -r requirements.txt"
4848

4949
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
50-
// "remoteUser": "vscode"
50+
// , "remoteUser": "vscode"
5151
}

.github/code_of_conduct.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo
88

99
Examples of behavior that contributes to creating a positive environment include:
1010

11-
* Using welcoming and inclusive language
12-
* Being respectful of differing viewpoints and experiences
13-
* Gracefully accepting constructive criticism
14-
* Focusing on what is best for the community
15-
* Showing empathy towards other community members
11+
- Using welcoming and inclusive language
12+
- Being respectful of differing viewpoints and experiences
13+
- Gracefully accepting constructive criticism
14+
- Focusing on what is best for the community
15+
- Showing empathy towards other community members
1616

1717
Examples of unacceptable behavior by participants include:
1818

19-
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20-
* Trolling, insulting/derogatory comments, and personal or political attacks
21-
* Public or private harassment
22-
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23-
* Other conduct which could reasonably be considered inappropriate in a professional setting
19+
- The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
- Trolling, insulting/derogatory comments, and personal or political attacks
21+
- Public or private harassment
22+
- Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
- Other conduct which could reasonably be considered inappropriate in a professional setting
2424

2525
## Our Responsibilities
2626

.github/contributing.md

Lines changed: 58 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,21 @@ The following is a set of guidelines for contributing to Marlin, hosted by the [
1111
[I don't want to read this whole thing, I just have a question!!!](#i-dont-want-to-read-this-whole-thing-i-just-have-a-question)
1212

1313
[How Can I Contribute?](#how-can-i-contribute)
14-
* [Reporting Bugs](#reporting-bugs)
15-
* [Suggesting Features or Changes](#suggesting-features-or-changes)
16-
* [Your First Code Contribution](#your-first-code-contribution)
17-
* [Pull Requests](#pull-requests)
14+
15+
- [Reporting Bugs](#reporting-bugs)
16+
- [Suggesting Features or Changes](#suggesting-features-or-changes)
17+
- [Your First Code Contribution](#your-first-code-contribution)
18+
- [Pull Requests](#pull-requests)
1819

1920
[Styleguides](#styleguides)
20-
* [Git Commit Messages](#git-commit-messages)
21-
* [C++ Coding Standards](#c++-coding-standards)
22-
* [Documentation Styleguide](#documentation)
21+
22+
- [Git Commit Messages](#git-commit-messages)
23+
- [C++ Coding Standards](#c++-coding-standards)
24+
- [Documentation Styleguide](#documentation)
2325

2426
[Additional Notes](#additional-notes)
25-
* [Issue and Pull Request Labels](#issue-and-pull-request-labels)
27+
28+
- [Issue and Pull Request Labels](#issue-and-pull-request-labels)
2629

2730
## Code of Conduct
2831

@@ -31,6 +34,7 @@ This project and everyone participating in it is governed by the [Marlin Code of
3134
## I don't want to read this whole thing I just have a question!!!
3235

3336
> [!NOTE]
37+
>
3438
> Please don't file an issue to ask a question. You'll get faster results by using the resources below.
3539
3640
We have a Message Board and a Facebook group where our knowledgable user community can provide helpful advice if you have questions.
@@ -43,10 +47,10 @@ We have a Message Board and a Facebook group where our knowledgable user communi
4347

4448
If chat is more your speed, you can join the MarlinFirmware Discord server:
4549

46-
* Use the link https://discord.com/servers/marlin-firmware-461605380783472640 to join up as a General User.
47-
* Even though our Discord is pretty active, it may take a while for community members to respond — please be patient!
48-
* Use the `#general` channel for general questions or discussion about Marlin.
49-
* Other channels exist for certain topics or are limited to Patrons. Check the channel list.
50+
- Use the link https://discord.com/servers/marlin-firmware-461605380783472640 to join up as a General User.
51+
- Even though our Discord is pretty active, it may take a while for community members to respond — please be patient!
52+
- Use the `#general` channel for general questions or discussion about Marlin.
53+
- Other channels exist for certain topics or are limited to Patrons. Check the channel list.
5054

5155
## How Can I Contribute?
5256

@@ -57,6 +61,7 @@ This section guides you through submitting a Bug Report for Marlin. Following th
5761
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.
5862

5963
> [!NOTE]
64+
>
6065
> 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.
6166
6267
#### How Do I Submit A (Good) Bug Report?
@@ -65,29 +70,29 @@ Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/).
6570

6671
Explain the problem and include additional details to help maintainers reproduce the problem:
6772

68-
* **Use a clear and descriptive title** for the issue to identify the problem.
69-
* **Describe the exact steps which reproduce the problem** in as many details as possible. For example, start by explaining how you started Marlin, e.g. which command exactly you used in the terminal, or how you started Marlin otherwise. When listing steps, **don't just say what you did, but explain how you did it**. For example, if you moved the cursor to the end of a line, explain if you used the mouse, or a keyboard shortcut or an Marlin command, and if so which one?
70-
* **Provide specific examples to demonstrate the steps**. Include links to files or GitHub projects, or copy/pasteable snippets, which you use in those examples. If you're providing snippets or log output in the issue, use [Markdown code blocks](https://help.github.com/articles/markdown-basics/#multiple-lines).
71-
* **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
72-
* **Explain which behavior you expected to see instead and why.**
73-
* **Include detailed log output** especially for probing and leveling. See below for usage of `DEBUG_LEVELING_FEATURE`.
74-
* **Include screenshots, links to videos, etc.** which clearly demonstrate the problem.
75-
* **Include G-code** (if relevant) that reliably causes the problem to show itself.
76-
* **If the problem wasn't triggered by a specific action**, describe what you were doing before the problem happened and share more information using the guidelines below.
73+
- **Use a clear and descriptive title** for the issue to identify the problem.
74+
- **Describe the exact steps which reproduce the problem** in as many details as possible. For example, start by explaining how you started Marlin, e.g. which command exactly you used in the terminal, or how you started Marlin otherwise. When listing steps, **don't just say what you did, but explain how you did it**. For example, if you moved the cursor to the end of a line, explain if you used the mouse, or a keyboard shortcut or an Marlin command, and if so which one?
75+
- **Provide specific examples to demonstrate the steps**. Include links to files or GitHub projects, or copy/pasteable snippets, which you use in those examples. If you're providing snippets or log output in the issue, use [Markdown code blocks](https://help.github.com/articles/markdown-basics/#multiple-lines).
76+
- **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
77+
- **Explain which behavior you expected to see instead and why.**
78+
- **Include detailed log output** especially for probing and leveling. See below for usage of `DEBUG_LEVELING_FEATURE`.
79+
- **Include screenshots, links to videos, etc.** which clearly demonstrate the problem.
80+
- **Include G-code** (if relevant) that reliably causes the problem to show itself.
81+
- **If the problem wasn't triggered by a specific action**, describe what you were doing before the problem happened and share more information using the guidelines below.
7782

7883
Provide more context:
7984

80-
* **Can you reproduce the problem with a minimum of options enabled?**
81-
* **Did the problem start happening recently** (e.g. after updating to a new version of Marlin) or was this always a problem?
82-
* If the problem started happening recently, **can you reproduce the problem in an older version of Marlin?** What's the most recent version in which the problem doesn't happen? You can download older versions of Marlin from [the releases page](https://github.com/MarlinFirmware/Marlin/releases).
83-
* **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.
85+
- **Can you reproduce the problem with a minimum of options enabled?**
86+
- **Did the problem start happening recently** (e.g. after updating to a new version of Marlin) or was this always a problem?
87+
- If the problem started happening recently, **can you reproduce the problem in an older version of Marlin?** What's the most recent version in which the problem doesn't happen? You can download older versions of Marlin from [the releases page](https://github.com/MarlinFirmware/Marlin/releases).
88+
- **Can you reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens.
8489

8590
Include details about your configuration and environment:
8691

87-
* **Which version of Marlin are you using?** Marlin's exact version and build date can be seen in the startup message when a host connects to Marlin, or in the LCD Info menu (if enabled).
88-
* **What kind of 3D Printer and electronics are you using**?
89-
* **What kind of add-ons (probe, filament sensor) do you have**?
90-
* **Include your Configuration files.** Make a ZIP file containing `Configuration.h` and `Configuration_adv.h` and drop it on your reply.
92+
- **Which version of Marlin are you using?** Marlin's exact version and build date can be seen in the startup message when a host connects to Marlin, or in the LCD Info menu (if enabled).
93+
- **What kind of 3D Printer and electronics are you using**?
94+
- **What kind of add-ons (probe, filament sensor) do you have**?
95+
- **Include your Configuration files.** Make a ZIP file containing `Configuration.h` and `Configuration_adv.h` and drop it on your reply.
9196

9297
### Suggesting Features or Changes
9398

@@ -97,52 +102,52 @@ Before creating a suggestion, please check [this list](https://github.com/Marlin
97102

98103
#### Before Submitting a Feature Request
99104

100-
* **Check the [Marlin website](https://marlinfw.org/)** for tips — you might discover that the feature is already included. Most importantly, check if you're using [the latest version of Marlin](https://github.com/MarlinFirmware/Marlin/releases) and if you can get the desired behavior by changing [Marlin's config settings](https://marlinfw.org/docs/configuration/configuration.html).
101-
* **Perform a [cursory search](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aopen+is%3Aissue+label%3A%22T%3A+Feature+Request%22)** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
105+
- **Check the [Marlin website](https://marlinfw.org/)** for tips — you might discover that the feature is already included. Most importantly, check if you're using [the latest version of Marlin](https://github.com/MarlinFirmware/Marlin/releases) and if you can get the desired behavior by changing [Marlin's config settings](https://marlinfw.org/docs/configuration/configuration.html).
106+
- **Perform a [cursory search](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aopen+is%3Aissue+label%3A%22T%3A+Feature+Request%22)** to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
102107

103108
#### How Do I Submit A (Good) Feature Request?
104109

105110
Feature Requests are tracked as [GitHub issues](https://guides.github.com/features/issues/). Please follow these guidelines in your request:
106111

107-
* **Use a clear and descriptive title** for the issue to identify the suggestion.
108-
* **Provide a step-by-step description of the requested feature** in as much detail as possible.
109-
* **Provide specific examples to demonstrate the steps**.
110-
* **Describe the current behavior** and **explain which behavior you expected to see instead** and why.
111-
* **Include screenshots and links to videos** which demonstrate the feature or point out the part of Marlin to which the request is related.
112-
* **Explain why this feature would be useful** to most Marlin users.
113-
* **Name other firmwares that have this feature, if any.**
112+
- **Use a clear and descriptive title** for the issue to identify the suggestion.
113+
- **Provide a step-by-step description of the requested feature** in as much detail as possible.
114+
- **Provide specific examples to demonstrate the steps**.
115+
- **Describe the current behavior** and **explain which behavior you expected to see instead** and why.
116+
- **Include screenshots and links to videos** which demonstrate the feature or point out the part of Marlin to which the request is related.
117+
- **Explain why this feature would be useful** to most Marlin users.
118+
- **Name other firmwares that have this feature, if any.**
114119

115120
### Your First Code Contribution
116121

117122
Unsure where to begin contributing to Marlin? You can start by looking through these `good-first-issue` and `help-wanted` issues:
118123

119-
* [Beginner issues][good-first-issue] - issues which should only require a few lines of code, and a test or two.
120-
* [Help Wanted issues][help-wanted] - issues which should be a bit more involved than `beginner` issues.
124+
- [Beginner issues][good-first-issue] - issues which should only require a few lines of code, and a test or two.
125+
- [Help Wanted issues][help-wanted] - issues which should be a bit more involved than `beginner` issues.
121126

122127
### Pull Requests
123128

124-
Pull Requests should always be targeted to working branches (e.g., `bugfix-2.1.x` and/or `bugfix-1.1.x`) and never to release branches (e.g., `2.0.x` and/or `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](https://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
129+
Pull Requests should always be targeted to working branches (e.g., `bugfix-2.1.x` and/or `bugfix-1.1.x`) and never to release branches (e.g., `2.0.x` and/or `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](https://marlinfw.org/docs/development/getting_started_pull_requests.html) and GitHub's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
125130

126-
* Fill in [the required template](pull_request_template.md).
127-
* Don't include issue numbers in the PR title.
128-
* Include pictures, diagrams, and links to videos in your Pull Request to demonstrate your changes, if needed.
129-
* Follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) posted on our website.
130-
* Document new code with clear and concise comments.
131-
* End all files with a newline.
131+
- Fill in [the required template](pull_request_template.md).
132+
- Don't include issue numbers in the PR title.
133+
- Include pictures, diagrams, and links to videos in your Pull Request to demonstrate your changes, if needed.
134+
- Follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) posted on our website.
135+
- Document new code with clear and concise comments.
136+
- End all files with a newline.
132137

133138
## Styleguides
134139

135140
### Git Commit Messages
136141

137-
* Use the present tense ("Add feature" not "Added feature").
138-
* Use the imperative mood ("Move cursor to..." not "Moves cursor to...").
139-
* Limit the first line to 72 characters or fewer.
140-
* Reference issues and Pull Requests liberally after the first line.
142+
- Use the present tense ("Add feature" not "Added feature").
143+
- Use the imperative mood ("Move cursor to..." not "Moves cursor to...").
144+
- Limit the first line to 72 characters or fewer.
145+
- Reference issues and Pull Requests liberally after the first line.
141146

142147
### C++ Coding Standards
143148

144-
* Please read and follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) posted on our website. Failure to follow these guidelines will delay evaluation and acceptance of Pull Requests.
149+
- Please read and follow the [Coding Standards](https://marlinfw.org/docs/development/coding_standards.html) posted on our website. Failure to follow these guidelines will delay evaluation and acceptance of Pull Requests.
145150

146151
### Documentation
147152

148-
* Guidelines for documentation are still under development. In-general, be clear, concise, and to-the-point.
153+
- Guidelines for documentation are still under development. In-general, be clear, concise, and to-the-point.

.github/workflows/ci-build-tests.yml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ on:
2121
branches:
2222
- bugfix-2.1.x
2323
- 2.1.x
24+
- release-*
2425
paths-ignore:
2526
- config/**
2627
- data/**
@@ -36,6 +37,9 @@ jobs:
3637

3738
runs-on: ubuntu-22.04
3839

40+
env:
41+
CONFIG_BRANCH: ${{ github.base_ref || github.ref_name }}
42+
3943
strategy:
4044
fail-fast: true
4145
matrix:
@@ -54,7 +58,7 @@ jobs:
5458
- at90usb1286_dfu
5559

5660
# AVR Extended
57-
- FYSETC_F6
61+
- mega2560ext
5862
- melzi_optiboot
5963
- rambo
6064
- sanguino1284p
@@ -113,7 +117,7 @@ jobs:
113117
- BTT_GTR_V1_0
114118
- BTT_SKR_PRO
115119
- FLYF407ZG
116-
- FYSETC_S6
120+
- STM32F446VE_fysetc
117121
- LERDGEK
118122
- LERDGEX
119123
- mks_robin_pro2
@@ -151,6 +155,12 @@ jobs:
151155
# HC32
152156
- HC32F460C_aquila_101
153157

158+
# GD32F3
159+
- GD32F303RE_creality_mfl
160+
161+
# GD32F1
162+
- GD32F103RC_aquila_mfl
163+
154164
# LPC176x - Lengthy tests
155165
- LPC1768
156166
- LPC1769
@@ -164,15 +174,20 @@ jobs:
164174
uses: actions/cache@v4
165175
with:
166176
path: ~/.cache/pip
167-
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
177+
key: ${{ runner.os }}-pip-build-v1
168178
restore-keys: |
169-
${{ runner.os }}-pip-
179+
${{ runner.os }}-pip-build-
170180
171181
- name: Cache PlatformIO
172182
uses: actions/cache@v4
173183
with:
174-
path: ~/.platformio
175-
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
184+
path: |
185+
~/.platformio
186+
.pio/build
187+
.pio/libdeps
188+
key: ${{ runner.os }}-pio-build-v1
189+
restore-keys: |
190+
${{ runner.os }}-pio-build-
176191
177192
- name: Select Python 3.9
178193
uses: actions/setup-python@v5
@@ -188,6 +203,7 @@ jobs:
188203
189204
- name: Install Simulator dependencies
190205
run: |
206+
sudo apt-get update
191207
sudo apt-get install build-essential
192208
sudo apt-get install libsdl2-dev
193209
sudo apt-get install libsdl2-net-dev

0 commit comments

Comments
 (0)