Skip to content

Commit 15b93f2

Browse files
Merge remote-tracking branch 'MarlinFW/2.0.x' into 2.0.x
2 parents 43b3daa + 00722c3 commit 15b93f2

File tree

1,705 files changed

+85807
-51114
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,705 files changed

+85807
-51114
lines changed

.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ root = true
44
[{*.patch,syntax_test_*}]
55
trim_trailing_whitespace = false
66

7-
[{*.c,*.cpp,*.h}]
7+
[{*.c,*.cpp,*.h,*.ino}]
88
charset = utf-8
99

10-
[{*.c,*.cpp,*.h,Makefile}]
10+
[{*.c,*.cpp,*.h,*.ino,Makefile}]
1111
trim_trailing_whitespace = true
1212
insert_final_newline = true
1313
end_of_line = lf

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@
1717
*.png binary
1818
*.jpg binary
1919
*.fon binary
20+
*.bin binary
21+
*.woff binary

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: 🪲 Report a bug
22
description: Create a bug report to help improve Marlin Firmware
33
title: "[BUG] (bug summary)"
4-
issue_body: true
54
body:
65
- type: markdown
76
attributes:
@@ -152,3 +151,7 @@ body:
152151
If you've made any other modifications to the firmware, please describe them in detail in the space provided.
153152
154153
When pasting formatted text into the box below don't forget to put ` ``` ` (on its own line) before and after to make it readable.
154+
155+
- type: textarea
156+
attributes:
157+
label: Additional information & file uploads

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: ✨ Request a feature
22
description: Request a new Marlin Firmware feature
33
title: "[FR] (feature summary)"
44
labels: 'T: Feature Request'
5-
issue_body: true
65
body:
76
- type: markdown
87
attributes:
@@ -39,9 +38,7 @@ body:
3938
validations:
4039
required: true
4140

42-
- type: markdown
41+
- type: textarea
4342
attributes:
44-
value: >
45-
**Additional context**
46-
47-
Add any other context or screenshots about the feature request here.
43+
label: Additional context
44+
description: Add any other context or screenshots about the feature request here.

.github/issue_template.md

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,35 @@
1-
# NO SUPPORT REQUESTS PLEASE
1+
<!--
22
3-
Do you want to ask a question? Are you looking for support? Please don't post here. Support Requests posted here will be automatically closed!
3+
Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.0.x/.github/code_of_conduct.md
44
5-
Instead use one of the following options:
5+
Do you want to ask a question? Are you looking for support? Please don't post here. Instead use one of the following options:
66
77
- The Marlin Firmware forum at https://reprap.org/forum/list.php?415
88
- The MarlinFirmware Facebook Group at https://www.facebook.com/groups/1049718498464482/
99
- The MarlinFirmware Discord Server at https://discord.gg/n5NJ59y.
1010
1111
Before filing an issue be sure to test the latest "bugfix" branch to see whether the issue is already addressed.
12+
13+
-->
14+
15+
### Description
16+
17+
<!-- Description of the bug or requested feature -->
18+
19+
### Steps to Reproduce
20+
21+
<!-- If this is a Bug Report, please describe the steps needed to reproduce the issue -->
22+
23+
1. [First Step]
24+
2. [Second Step]
25+
3. [and so on...]
26+
27+
**Expected behavior:** [What you expect to happen]
28+
29+
**Actual behavior:** [What actually happens]
30+
31+
#### Additional Information
32+
33+
* Include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.
34+
* Provide pictures or links to videos that clearly demonstrate the issue.
35+
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.

.github/workflows/check-pr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
steps:
2323
- uses: peter-evans/close-pull@v1
2424
with:
25+
token: ${{ github.token }}
2526
delete-branch: false
2627
comment: >
2728
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.

.gitignore

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
# along with this program. If not, see <https://www.gnu.org/licenses/>.
2020
#
2121

22-
# Our automatic versioning scheme generates the following file
23-
# NEVER put it in the repository
22+
# Generated files
2423
_Version.h
24+
bdf2u8g
2525

2626
#
2727
# OS
@@ -77,7 +77,6 @@ tags
7777
*.out
7878
*.app
7979

80-
8180
#
8281
# C
8382
#
@@ -123,33 +122,10 @@ tags
123122
.gcc-flags.json
124123
/lib/
125124

126-
# Workaround for Deviot+platformio quirks
127-
Marlin/lib
128-
Marlin/platformio.ini
129-
Marlin/*/platformio.ini
130-
Marlin/*/*/platformio.ini
131-
Marlin/*/*/*/platformio.ini
132-
Marlin/*/*/*/*/platformio.ini
133-
Marlin/.travis.yml
134-
Marlin/*/.travis.yml
135-
Marlin/*/*/.travis.yml
136-
Marlin/*/*/*/.travis.yml
137-
Marlin/*/*/*/*/.travis.yml
138-
Marlin/.gitignore
139-
Marlin/*/.gitignore
140-
Marlin/*/*/.gitignore
141-
Marlin/*/*/*/.gitignore
142-
Marlin/*/*/*/*/.gitignore
143-
Marlin/readme.txt
144-
Marlin/*/readme.txt
145-
Marlin/*/*/readme.txt
146-
Marlin/*/*/*/readme.txt
147-
Marlin/*/*/*/*/readme.txt
148-
149125
# Secure Credentials
150126
Configuration_Secure.h
151127

152-
#Visual Studio
128+
# Visual Studio
153129
*.sln
154130
*.vcxproj
155131
*.vcxproj.user
@@ -160,27 +136,34 @@ __vm/
160136
.vs/
161137
vc-fileutils.settings
162138

163-
#Visual Studio Code
139+
# Visual Studio Code
164140
.vscode
165141
.vscode/.browse.c_cpp.db*
166142
.vscode/c_cpp_properties.json
167143
.vscode/launch.json
168144
.vscode/*.db
169145

170-
#cmake
146+
# cmake
171147
CMakeLists.txt
172148
src/CMakeLists.txt
173149
CMakeListsPrivate.txt
174150

175-
#CLion
151+
# CLion
176152
cmake-build-*
177153

178-
#Eclipse
154+
# Eclipse
179155
.project
180156
.cproject
181157
.pydevproject
182158
.settings
183159
.classpath
184160

185-
#Python
161+
# Python
186162
__pycache__
163+
164+
# IOLogger logs
165+
*_log.csv
166+
167+
# Simulation / Native
168+
eeprom.dat
169+
imgui.ini

Makefile

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
help:
2+
@echo "Tasks for local development:"
3+
@echo "* tests-single-ci: Run a single test from inside the CI"
4+
@echo "* tests-single-local: Run a single test locally"
5+
@echo "* tests-single-local-docker: Run a single test locally, using docker-compose"
6+
@echo "* tests-all-local: Run all tests locally"
7+
@echo "* tests-all-local-docker: Run all tests locally, using docker-compose"
8+
@echo "* setup-local-docker: Setup local docker-compose"
9+
@echo ""
10+
@echo "Options for testing:"
11+
@echo " TEST_TARGET Set when running tests-single-*, to select the"
12+
@echo " test. If you set it to ALL it will run all "
13+
@echo " tests, but some of them are broken: use "
14+
@echo " tests-all-* instead to run only the ones that "
15+
@echo " run on GitHub CI"
16+
@echo " ONLY_TEST Limit tests to only those that contain this, or"
17+
@echo " the index of the test (1-based)"
18+
@echo " VERBOSE_PLATFORMIO If you want the full PIO output, set any value"
19+
@echo " GIT_RESET_HARD Used by CI: reset all local changes. WARNING:"
20+
@echo " THIS WILL UNDO ANY CHANGES YOU'VE MADE!"
21+
.PHONY: help
22+
23+
tests-single-ci:
24+
export GIT_RESET_HARD=true
25+
$(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET)
26+
.PHONY: tests-single-ci
27+
28+
tests-single-local:
29+
@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-all-local" ; return 1; fi
30+
export PATH=./buildroot/bin/:./buildroot/tests/:${PATH} \
31+
&& export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \
32+
&& run_tests . $(TEST_TARGET) "$(ONLY_TEST)"
33+
.PHONY: tests-single-local
34+
35+
tests-single-local-docker:
36+
@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-all-local-docker" ; return 1; fi
37+
docker-compose run --rm marlin $(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET) VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD) ONLY_TEST="$(ONLY_TEST)"
38+
.PHONY: tests-single-local-docker
39+
40+
tests-all-local:
41+
export PATH=./buildroot/bin/:./buildroot/tests/:${PATH} \
42+
&& export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \
43+
&& for TEST_TARGET in $$(./get_test_targets.py) ; do echo "Running tests for $$TEST_TARGET" ; run_tests . $$TEST_TARGET ; done
44+
.PHONY: tests-all-local
45+
46+
tests-all-local-docker:
47+
docker-compose run --rm marlin $(MAKE) tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD)
48+
.PHONY: tests-all-local-docker
49+
50+
setup-local-docker:
51+
docker-compose build
52+
.PHONY: setup-local-docker

0 commit comments

Comments
 (0)