forked from MarlinFirmware/Marlin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/2.0.x' into ENDER3V2
* upstream/2.0.x: (2979 commits) π¨ MKS Hardware Test followup (MarlinFirmware#22414) β»οΈ Refactor STM32 ini files (MarlinFirmware#22377) β¨ Chitu3D V9 board (MarlinFirmware#22401) π Fix Longer3D build environment (MarlinFirmware#22378) π¨ More HAL/STM32 targets (MarlinFirmware#22358, MarlinFirmware#22369) π Fix STATUS_COMBINE_HEATERS compile (MarlinFirmware#22405) π Fix Ammeter display on DOGM (MarlinFirmware#22384) π¨ Prefer DELAY_NS over DELAY_CYCLES (MarlinFirmware#22382) π¨ Add MMU2 enabled() accessor π Fix G2/G3 angular motion calculation (MarlinFirmware#22407) π©Ή Init var to suppress invalid warning (MarlinFirmware#22396) π Ensure Software SPI pins for Max Thermocouple (MarlinFirmware#22389) π Change font for selected language (MarlinFirmware#22381) π Fix UBL G29 J - Vector3 regression π Fix BTC_SAMPLE_RES sanity check (MarlinFirmware#22394) π¨ Fix unused lambda warning (MarlinFirmware#22399) π Fix MKS UI compile (MarlinFirmware#22388, MarlinFirmware#22395) π Fix M913 typos (MarlinFirmware#22385) π No translated serial strings β¨ MKS Mini12864 v3 for Robin E3/E3D (MarlinFirmware#22368) ...
- Loading branch information
Showing
1,954 changed files
with
112,180 additions
and
66,619 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,3 +17,5 @@ | |
*.png binary | ||
*.jpg binary | ||
*.fon binary | ||
*.bin binary | ||
*.woff binary |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,35 @@ | ||
# NO SUPPORT REQUESTS PLEASE | ||
<!-- | ||
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! | ||
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 | ||
Instead use one of the following options: | ||
Do you want to ask a question? Are you looking for support? Please don't post here. Instead use one of the following options: | ||
- The Marlin Firmware forum at https://reprap.org/forum/list.php?415 | ||
- The MarlinFirmware Facebook Group at https://www.facebook.com/groups/1049718498464482/ | ||
- The MarlinFirmware Discord Server at https://discord.gg/n5NJ59y. | ||
Before filing an issue be sure to test the latest "bugfix" branch to see whether the issue is already addressed. | ||
--> | ||
|
||
### Description | ||
|
||
<!-- Description of the bug or requested feature --> | ||
|
||
### Steps to Reproduce | ||
|
||
<!-- If this is a Bug Report, please describe the steps needed to reproduce the issue --> | ||
|
||
1. [First Step] | ||
2. [Second Step] | ||
3. [and so on...] | ||
|
||
**Expected behavior:** [What you expect to happen] | ||
|
||
**Actual behavior:** [What actually happens] | ||
|
||
#### Additional Information | ||
|
||
* Include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files. | ||
* Provide pictures or links to videos that clearly demonstrate the issue. | ||
* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
help: | ||
@echo "Tasks for local development:" | ||
@echo "* tests-single-ci: Run a single test from inside the CI" | ||
@echo "* tests-single-local: Run a single test locally" | ||
@echo "* tests-single-local-docker: Run a single test locally, using docker-compose" | ||
@echo "* tests-all-local: Run all tests locally" | ||
@echo "* tests-all-local-docker: Run all tests locally, using docker-compose" | ||
@echo "* setup-local-docker: Setup local docker-compose" | ||
@echo "" | ||
@echo "Options for testing:" | ||
@echo " TEST_TARGET Set when running tests-single-*, to select the" | ||
@echo " test. If you set it to ALL it will run all " | ||
@echo " tests, but some of them are broken: use " | ||
@echo " tests-all-* instead to run only the ones that " | ||
@echo " run on GitHub CI" | ||
@echo " ONLY_TEST Limit tests to only those that contain this, or" | ||
@echo " the index of the test (1-based)" | ||
@echo " VERBOSE_PLATFORMIO If you want the full PIO output, set any value" | ||
@echo " GIT_RESET_HARD Used by CI: reset all local changes. WARNING:" | ||
@echo " THIS WILL UNDO ANY CHANGES YOU'VE MADE!" | ||
.PHONY: help | ||
|
||
tests-single-ci: | ||
export GIT_RESET_HARD=true | ||
$(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET) | ||
.PHONY: tests-single-ci | ||
|
||
tests-single-local: | ||
@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-all-local" ; return 1; fi | ||
export PATH=./buildroot/bin/:./buildroot/tests/:${PATH} \ | ||
&& export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \ | ||
&& run_tests . $(TEST_TARGET) "$(ONLY_TEST)" | ||
.PHONY: tests-single-local | ||
|
||
tests-single-local-docker: | ||
@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-all-local-docker" ; return 1; fi | ||
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)" | ||
.PHONY: tests-single-local-docker | ||
|
||
tests-all-local: | ||
export PATH=./buildroot/bin/:./buildroot/tests/:${PATH} \ | ||
&& export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \ | ||
&& for TEST_TARGET in $$(./get_test_targets.py) ; do echo "Running tests for $$TEST_TARGET" ; run_tests . $$TEST_TARGET ; done | ||
.PHONY: tests-all-local | ||
|
||
tests-all-local-docker: | ||
docker-compose run --rm marlin $(MAKE) tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD) | ||
.PHONY: tests-all-local-docker | ||
|
||
setup-local-docker: | ||
docker-compose build | ||
.PHONY: setup-local-docker |
Oops, something went wrong.