Skip to content

Commit e35500a

Browse files
committed
20220816 What's new in MID-YEAR Maintenance release I
- Advanced Settings menu reorganization - Custom G-code C10 to mark a G-code file as a configuration file to avoid confirm to print and print done dialogs. - Custom G-code C851 Mn ; Set Multiple Probing - Fix bug: forbid multiple probing = 1 - Custom G-code C851 can be used to change the manual Z-offset for versions without probe - De-bounce rotary encoder when a parameter is edited - Allows to set the Z height after Z home for Manual Mesh version. - Re-enabled ADAPTIVE_STEP_SMOOTHING - Media Update (auto-mount) Enable/Disable menu item - Support up to 6 Preheat settings (needs own compile) - Support for Model predictive temperature control "MPC" (needs own compile) - Refactoring Print File menu for performance and stability - Enhanced Active mesh leveling indicator - Fix drawing bug in select file menu: #241 - Fix: Z at right edge out of mesh border is being overcompensated if UBL is active From Last Marlin bugfix 2.1.x - Optimize Planner calculations - Arc/Planner optimization follow-up - Update MPCTEMP G-Code M306 T - Fix, improve Linear Advance with stand-alone stepper driver support
1 parent 6ceba36 commit e35500a

File tree

1,535 files changed

+1443194
-83
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,535 files changed

+1443194
-83
lines changed

.editorconfig

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# editorconfig.org
2+
root = true
3+
4+
[{*.patch,syntax_test_*}]
5+
trim_trailing_whitespace = false
6+
7+
[{*.c,*.cpp,*.h,*.ino}]
8+
charset = utf-8
9+
10+
[{*.c,*.cpp,*.h,*.ino,Makefile}]
11+
trim_trailing_whitespace = true
12+
insert_final_newline = true
13+
end_of_line = lf
14+
indent_style = space
15+
indent_size = 2
16+
17+
[{*.py,*.conf,*.sublime-project}]
18+
indent_style = tab
19+
indent_size = 4

.gitattributes

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Set the default behavior, in case people don't have core.autocrlf set.
2+
* text=auto
3+
4+
# Files with Unix line endings
5+
*.c text eol=lf
6+
*.cpp text eol=lf
7+
*.h text eol=lf
8+
*.ino text eol=lf
9+
*.py text eol=lf
10+
*.sh text eol=lf
11+
*.scad text eol=lf
12+
13+
# Files with native line endings
14+
# *.sln text
15+
16+
# Binary files
17+
*.png binary
18+
*.jpg binary
19+
*.fon binary
20+
*.bin binary
21+
*.woff binary

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: 📖 Professional Firmware Documentation
4+
url: https://github.com/mriscoc/Ender3V2S1/wiki
5+
about: Lots of documentation about firmware settings and features.
6+
- name: 📖 Marlin Documentation
7+
url: https://marlinfw.org/
8+
about: Lots of documentation on installing and using Marlin.
9+
- name: 👤 Professional Firmware Facebook group
10+
url: https://www.facebook.com/groups/513889302986197
11+
about: Please ask and answer questions here.
12+
- name: 💸 Want to donate?
13+
url: https://www.paypal.com/paypalme/mriscoc
14+
about: Your contribution to this project is always welcome!

.github/contributing.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,11 @@ This project and everyone participating in it is governed by the [Marlin Code of
3434
3535
We have a Message Board and a Facebook group where our knowledgable user community can provide helpful advice if you have questions.
3636

37-
* [Marlin RepRap forum](https://reprap.org/forum/list.php?415)
38-
* [MarlinFirmware on Facebook](https://www.facebook.com/groups/1049718498464482/)
37+
- [Marlin Documentation](https://marlinfw.org) - Official Marlin documentation
38+
- Facebook Group ["Marlin Firmware"](https://www.facebook.com/groups/1049718498464482/)
39+
- RepRap.org [Marlin Forum](https://forums.reprap.org/list.php?415)
40+
- Facebook Group ["Marlin Firmware for 3D Printers"](https://www.facebook.com/groups/3Dtechtalk/)
41+
- [Marlin Configuration](https://www.youtube.com/results?search_query=marlin+configuration) on YouTube
3942

4043
If chat is more your speed, you can join the MarlinFirmware Discord server:
4144

@@ -50,13 +53,13 @@ If chat is more your speed, you can join the MarlinFirmware Discord server:
5053

5154
This section guides you through submitting a Bug Report for Marlin. Following these guidelines helps maintainers and the community understand your report, reproduce the behavior, and find related reports.
5255

53-
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.md), the information it asks for helps us resolve issues faster.
56+
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.
5457

5558
> **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.
5659
5760
#### How Do I Submit A (Good) Bug Report?
5861

59-
Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/). Use the New Issue button to create an issue and provide the following information by filling in [the template](issue_template.md).
62+
Bugs are tracked as [GitHub issues](https://guides.github.com/features/issues/). Use the New Issue button to create an issue and provide the following information by filling in [the template](ISSUE_TEMPLATE/bug_report.yml).
6063

6164
Explain the problem and include additional details to help maintainers reproduce the problem:
6265

@@ -88,12 +91,12 @@ Include details about your configuration and environment:
8891

8992
This section guides you through submitting a suggestion for Marlin, including completely new features and minor improvements to existing functionality. Following these guidelines helps maintainers and the community understand your suggestion and find related suggestions.
9093

91-
Before creating a suggestion, please check [this list](#before-submitting-a-suggestion) as you might find out that you don't need to create one. When you are creating an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-a-good-enhancement-suggestion). Fill in [the template](issue_template.md), including the steps that you imagine you would take if the feature you're requesting existed.
94+
Before creating a suggestion, please check [this list](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aopen+is%3Aissue+label%3A%22T%3A+Feature+Request%22) as you might find out that you don't need to create one. When you are creating an enhancement suggestion, please [include as many details as possible](#how-do-i-submit-a-good-feature-request). Fill in [the template](ISSUE_TEMPLATE/feature_request.yml), including the steps that you imagine you would take if the feature you're requesting existed.
9295

9396
#### Before Submitting a Feature Request
9497

9598
* **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).
96-
* **Perform a [cursory search](https://github.com/MarlinFirmware/Marlin/issues?q=is%3Aissue)** 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.
99+
* **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.
97100

98101
#### How Do I Submit A (Good) Feature Request?
99102

@@ -116,7 +119,7 @@ Unsure where to begin contributing to Marlin? You can start by looking through t
116119

117120
### Pull Requests
118121

119-
Pull Requests should always be targeted to working branches (e.g., `bugfix-1.1.x` and/or `bugfix-2.0.x`) and never to release branches (e.g., `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.
122+
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.
120123

121124
* Fill in [the required template](pull_request_template.md).
122125
* Don't include issue numbers in the PR title.

.github/issue_template.md

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/pull_request_template.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,33 @@
1-
### Requirements
1+
<!--
2+
3+
Submitting a Pull Request
4+
5+
- Please fill out all sections of this form. You can delete the helpful comments.
6+
- Pull Requests without clear information will take longer and may even be rejected.
7+
- We get a high volume of submissions so please be patient during review.
28
3-
* Filling out this template is required. Pull Requests without a clear description may be closed at the maintainers' discretion.
9+
-->
410

511
### Description
612

713
<!--
814
9-
We must be able to understand your proposed change from this description. If we can't understand what the code will do from this description, the Pull Request may be closed at the maintainers' discretion. Keep in mind that the maintainer reviewing this PR may not be familiar with or have worked with the code recently, so please walk us through the concepts.
15+
Clearly describe the submitted changes with lots of details. Include images where helpful. Initial reviewers may not be familiar with the subject, so be as thorough as possible. You can use MarkDown syntax to improve readability with bullet lists, code blocks, and so on. PREVIEW and fix up formatting before submitting.
1016
1117
-->
1218

19+
### Requirements
20+
21+
<!-- Does this PR require a specific board, LCD, etc.? -->
22+
1323
### Benefits
1424

15-
<!-- What does this fix or improve? -->
25+
<!-- What does this PR fix or improve? -->
1626

1727
### Configurations
1828

19-
<!-- Attach any Configuration.h, Configuration_adv.h, or platformio.ini files needed to compile/test your Pull Request. -->
29+
<!-- Attach Configurations ZIP and any other files needed to test this PR. -->
2030

2131
### Related Issues
2232

23-
<!-- Whether this fixes a bug or fulfills a feature request, please list any related Issues here. -->
33+
<!-- Does this PR fix a bug or fulfill a Feature Request? Link related Issues here. -->

.github/workflows/bump-date.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
#
2+
# bump-date.yml
3+
# Bump the distribution date once per day
4+
#
5+
6+
name: Bump Distribution Date
7+
8+
on:
9+
schedule:
10+
- cron: '0 */6 * * *'
11+
12+
jobs:
13+
bump_date:
14+
name: Bump Distribution Date
15+
if: github.repository == 'MarlinFirmware/Marlin'
16+
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
21+
- name: Check out bugfix-2.1.x
22+
uses: actions/checkout@v2
23+
with:
24+
ref: bugfix-2.1.x
25+
26+
- name: Bump Date (bugfix-2.0.x)
27+
run: |
28+
# Inline Bump Script
29+
if [[ ! "$( git log -1 --pretty=%B )" =~ ^\[cron\] ]]; then
30+
DIST=$( date +"%Y-%m-%d" )
31+
eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \
32+
eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/Version.h" && \
33+
git config user.name "${GITHUB_ACTOR}" && \
34+
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && \
35+
git add . && \
36+
git commit -m "[cron] Bump distribution date ($DIST)" && \
37+
git push
38+
fi
39+
exit 0
40+
41+
- name: Check out bugfix-2.1.x
42+
uses: actions/checkout@v2
43+
with:
44+
ref: bugfix-2.1.x
45+
46+
- name: Bump Date (bugfix-2.1.x)
47+
run: |
48+
# Inline Bump Script
49+
if [[ ! "$( git log -1 --pretty=%B )" =~ ^\[cron\] ]]; then
50+
DIST=$( date +"%Y-%m-%d" )
51+
eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \
52+
eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/Version.h" && \
53+
git config user.name "${GITHUB_ACTOR}" && \
54+
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && \
55+
git add . && \
56+
git commit -m "[cron] Bump distribution date ($DIST)" && \
57+
git push
58+
fi
59+
exit 0

.github/workflows/check-pr.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#
2+
# check-pr.yml
3+
# Close PRs directed at release branches
4+
#
5+
6+
name: PR Bad Target
7+
8+
on:
9+
pull_request_target:
10+
types: [opened]
11+
branches:
12+
- 1.0.x
13+
- 1.1.x
14+
- 2.0.x
15+
- 2.1.x
16+
17+
jobs:
18+
bad_target:
19+
name: PR Bad Target
20+
if: github.repository == 'MarlinFirmware/Marlin'
21+
22+
runs-on: ubuntu-latest
23+
24+
steps:
25+
- uses: superbrothers/close-pull-request@v3
26+
with:
27+
comment: >
28+
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.
29+
30+
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.
31+
32+
It may help to set your fork's default branch to `bugfix-2.0.x`.
33+
34+
See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.

.github/workflows/clean-closed.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
#
2+
# clean-closed.yml
3+
# Remove obsolete labels when an Issue or PR is closed
4+
#
5+
6+
name: Clean Closed
7+
8+
on:
9+
pull_request:
10+
types: [closed]
11+
issues:
12+
types: [closed]
13+
14+
jobs:
15+
remove_label:
16+
runs-on: ubuntu-latest
17+
18+
strategy:
19+
matrix:
20+
label:
21+
- "S: Don't Merge"
22+
- "S: Hold for 2.1"
23+
- "S: Please Merge"
24+
- "S: Please Test"
25+
- "help wanted"
26+
- "Needs: Discussion"
27+
- "Needs: Documentation"
28+
- "Needs: More Data"
29+
- "Needs: Patch"
30+
- "Needs: Testing"
31+
- "Needs: Work"
32+
33+
steps:
34+
- uses: actions/checkout@v2
35+
- name: Remove Labels
36+
uses: actions-ecosystem/action-remove-labels@v1
37+
with:
38+
github_token: ${{ github.token }}
39+
labels: ${{ matrix.label }}

.github/workflows/close-stale.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#
2+
# close-stale.yml
3+
# Close open issues after a period of inactivity
4+
#
5+
6+
name: Close Stale Issues
7+
8+
on:
9+
schedule:
10+
- cron: "22 1 * * *"
11+
12+
jobs:
13+
stale:
14+
name: Close Stale Issues
15+
if: github.repository == 'MarlinFirmware/Marlin'
16+
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- uses: actions/stale@v3
21+
with:
22+
repo-token: ${{ secrets.GITHUB_TOKEN }}
23+
stale-issue-message: 'This issue has had no activity in the last 60 days. Please add a reply if you want to keep this issue active, otherwise it will be automatically closed within 10 days.'
24+
days-before-stale: 60
25+
days-before-close: 10
26+
stale-issue-label: 'stale-closing-soon'
27+
exempt-all-assignees: true
28+
exempt-issue-labels: 'Bug: Confirmed !,T: Feature Request,Needs: More Data,Needs: Discussion,Needs: Documentation,Needs: Patch,Needs: Work,Needs: Testing,help wanted,no-locking'

0 commit comments

Comments
 (0)