Skip to content

Commit 6df7347

Browse files
Squashed commit of the following:
commit 5170d27 Author: Jordan Stocker <[email protected]> Date: Thu Mar 28 06:14:03 2024 +1030 🔨 Fix binary upload firmware path (MarlinFirmware#26909) commit 3f3d1f0 Author: Ikko Eltociear Ashimine <[email protected]> Date: Mon Mar 25 03:49:25 2024 +0900 📝 Fix Cutter.md typo (MarlinFirmware#26901) commit 7616d0e Author: John Robertson <[email protected]> Date: Sat Mar 23 00:57:23 2024 +0000 🐛 Fix ESP32 laser M4 exception (MarlinFirmware#26884) commit e81b3fe Author: Sophist <[email protected]> Date: Sat Mar 23 00:27:13 2024 +0000 🚸 Hide auto-run as needed (MarlinFirmware#26853) commit cb62e14 Author: Holger Mößinger <[email protected]> Date: Fri Mar 22 22:36:42 2024 +0100 ✏️ Fix stepper MS pin typos (MarlinFirmware#26891) commit 7efc5cb Author: Scott Lahteine <[email protected]> Date: Sat Mar 16 15:40:45 2024 -0500 👷 Minor signature.py adjustments commit 11ea940 Author: Sophist <[email protected]> Date: Sat Mar 16 20:00:16 2024 +0000 📝 Fix M201 typos (MarlinFirmware#26854) commit 2378a7f Author: janenen <[email protected]> Date: Sat Mar 16 20:52:14 2024 +0100 🐛 Fix DETECT_BROKEN_ENDSTOP on IDEX (MarlinFirmware#26790) Co-authored-by: Scott Lahteine <[email protected]> commit 9755d8e Author: Keith Bennett <[email protected]> Date: Sat Mar 16 11:34:02 2024 -0700 📝 Remove Flattr Link (MarlinFirmware#26796) commit b691178 Author: Scott Lahteine <[email protected]> Date: Wed Feb 7 21:11:55 2024 -0600 🔖 Version 2.1.2.2 commit af6dac3 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 18:36:32 2024 -0600 🧑‍💻 Other code patches commit 108f0b0 Author: Scott Lahteine <[email protected]> Date: Mon Jan 29 22:31:49 2024 -0600 🧑‍💻 LCD Code patches commit 6b65665 Author: Scott Lahteine <[email protected]> Date: Mon Dec 18 19:12:10 2023 -0600 🧑‍💻 SD card commit 8753015 Author: Scott Lahteine <[email protected]> Date: Sat Dec 16 02:40:51 2023 -0600 🧑‍💻 HAL Patches commit 550a303 Author: Scott Lahteine <[email protected]> Date: Fri Dec 15 18:47:34 2023 -0600 🔨 Better build, envs, tests commit a53ad3b Author: Scott Lahteine <[email protected]> Date: Sat Dec 16 23:52:22 2023 -0600 🧑‍💻 Pins updates commit cbaff4b Author: Scott Lahteine <[email protected]> Date: Wed Feb 7 21:11:33 2024 -0600 🔧 Config updates commit a18045a Author: Scott Lahteine <[email protected]> Date: Fri Dec 15 17:37:36 2023 -0600 🧑‍💻 Support files updates commit 5f84e7f Author: Scott Lahteine <[email protected]> Date: Mon Feb 5 23:34:27 2024 -0600 🚸 Fix Filament Change item position commit 580a35b Author: Scott Lahteine <[email protected]> Date: Thu Mar 30 15:12:56 2023 -0500 🎨 Misc. probe-related cleanup commit 39e42eb Author: Scott Lahteine <[email protected]> Date: Sat Dec 16 23:22:38 2023 -0600 🎨 Cosmetic and comments commit a3101a0 Author: InsanityAutomation <[email protected]> Date: Wed Jan 31 20:24:08 2024 -0500 🚸 Fix repeating "Power Off" message (MarlinFirmware#26755) commit 6f00f4e Author: Keith Bennett <[email protected]> Date: Tue Jan 30 21:00:02 2024 -0800 🐛 Fix I/J/K chopper timing (MarlinFirmware#26736) Followup to MarlinFirmware#19112 commit 5ef8ccc Author: Keith Bennett <[email protected]> Date: Tue Jan 30 20:58:06 2024 -0800 📝 Biqu => BIQU (MarlinFirmware#26735) commit 4a0b539 Author: Scott Lahteine <[email protected]> Date: Sun Mar 26 17:24:40 2023 -0500 🔧 Clarify axis disable / timeout (MarlinFirmware#25571) commit ee08814 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 22:19:06 2024 -0600 ♻️ Remove LOOP macros commit 244c257 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 22:07:06 2024 -0600 🚸 Thermistor updates commit 20ee8dd Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 21:57:20 2024 -0600 ♻️ FOLDER_SORTING => SDSORT_FOLDERS commit 73ed511 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 21:51:08 2024 -0600 ♻️ BTT_MINI_12864_V1 => BTT_MINI_12864 commit 41d78a2 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 19:38:57 2024 -0600 ♻️ TMC_SW_* => TMC_SPI_* commit 5febc39 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 19:33:27 2024 -0600 ♻️ BTT_MANTA_M4P_V1_0 => BTT_MANTA_M4P_V2_1 commit 1b406a3 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 19:30:23 2024 -0600 🔥 Remove VAkE 403D commit d0fbc94 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 19:08:57 2024 -0600 ♻️ FAN_PIN => FAN0_PIN commit 5e8c7b3 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 18:44:30 2024 -0600 ♻️ LCD_PINS_ENABLE => LCD_PINS_EN commit d403352 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 17:42:33 2024 -0600 ♻️ SDSUPPORT => HAS_MEDIA commit 2e4b037 Author: Scott Lahteine <[email protected]> Date: Tue Jan 30 17:16:33 2024 -0600 ♻️ EITHER/BOTH => ANY/ALL commit fa85e9e Author: Scott Lahteine <[email protected]> Date: Sat Jan 27 12:30:18 2024 -0600 🐛 Fix G38_PROBE_TARGET commit 631f719 Author: Scott Lahteine <[email protected]> Date: Mon Dec 11 15:20:31 2023 -0600 🩹 Fix LONG_FILENAME_WRITE_SUPPORT typo commit 4f21ace Author: Scott Lahteine <[email protected]> Date: Fri Dec 8 21:31:07 2023 -0600 🔨 Specify versions in INI commit 7a653f9 Author: Scott Lahteine <[email protected]> Date: Tue Nov 21 21:41:33 2023 -0600 🩹 Fix ProUI compile commit 60cd1ec Author: Scott Lahteine <[email protected]> Date: Sat Oct 7 01:08:19 2023 -0500 🩹 Fix G33 output See MarlinFirmware#26299
1 parent 1d8ec3b commit 6df7347

File tree

1,365 files changed

+42215
-31641
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,365 files changed

+42215
-31641
lines changed

.editorconfig

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,29 @@
11
# editorconfig.org
22
root = true
33

4+
[*]
5+
trim_trailing_whitespace = true
6+
insert_final_newline = true
7+
48
[{*.patch,syntax_test_*}]
59
trim_trailing_whitespace = false
610

11+
[{*.c,*.cpp,*.h,*.ino,*.py,Makefile}]
12+
end_of_line = lf
13+
714
[{*.c,*.cpp,*.h,*.ino}]
815
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
1416
indent_style = space
1517
indent_size = 2
1618

19+
[{Makefile}]
20+
indent_style = tab
21+
indent_size = 2
22+
23+
[*.md]
24+
# Two spaces at the end of the line means newline in Markdown
25+
trim_trailing_whitespace = false
26+
1727
[{*.py}]
1828
indent_style = space
1929
indent_size = 4

.github/code_of_conduct.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,9 @@ Project maintainers are responsible for clarifying the standards of acceptable b
2828

2929
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
3030

31-
## Scope
32-
33-
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
34-
3531
## Enforcement
3632

37-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [[email protected]](mailto:[email protected]). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
38-
39-
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
33+
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.
4034

4135
## Attribution
4236

.github/contributing.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@ The following is a set of guidelines for contributing to Marlin, hosted by the [
2626

2727
## Code of Conduct
2828

29-
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 to [[email protected]](mailto:marlinfirmware@github.com).
29+
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).
3030

3131
## I don't want to read this whole thing I just have a question!!!
3232

33-
> **Note:** Please don't file an issue to ask a question. You'll get faster results by using the resources below.
33+
> [!NOTE]
34+
> Please don't file an issue to ask a question. You'll get faster results by using the resources below.
3435
3536
We have a Message Board and a Facebook group where our knowledgable user community can provide helpful advice if you have questions.
3637

@@ -55,7 +56,8 @@ This section guides you through submitting a Bug Report for Marlin. Following th
5556

5657
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.
5758

58-
> **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.
59+
> [!NOTE]
60+
> 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.
5961
6062
#### How Do I Submit A (Good) Bug Report?
6163

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ bdf2u8g.exe
2525
genpages.exe
2626
marlin_config.json
2727
mczip.h
28+
language*.csv
29+
out-csv/
30+
out-language/
2831
*.gen
2932
*.sublime-workspace
3033

@@ -130,7 +133,9 @@ spi_flash.bin
130133
fs.img
131134

132135
# CMake
136+
buildroot/share/cmake/*
133137
CMakeLists.txt
138+
!buildroot/share/cmake/CMakeLists.txt
134139
src/CMakeLists.txt
135140
CMakeListsPrivate.txt
136141
build/

.vscode/extensions.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"platformio.platformio-ide"
77
],
88
"unwantedRecommendations": [
9+
"ms-vscode-remote.remote-containers",
910
"ms-vscode.cpptools-extension-pack"
1011
]
1112
}

Makefile

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ CONTAINER_IMAGE := marlin-dev
55

66
help:
77
@echo "Tasks for local development:"
8-
@echo "* tests-single-ci: Run a single test from inside the CI"
9-
@echo "* tests-single-local: Run a single test locally"
10-
@echo "* tests-single-local-docker: Run a single test locally, using docker"
11-
@echo "* tests-all-local: Run all tests locally"
12-
@echo "* tests-all-local-docker: Run all tests locally, using docker"
13-
@echo "* setup-local-docker: Build the local docker image"
8+
@echo "make marlin : Build marlin for the configured board"
9+
@echo "make format-pins : Reformat all pins files"
10+
@echo "make tests-single-ci : Run a single test from inside the CI"
11+
@echo "make tests-single-local : Run a single test locally"
12+
@echo "make tests-single-local-docker : Run a single test locally, using docker"
13+
@echo "make tests-all-local : Run all tests locally"
14+
@echo "make tests-all-local-docker : Run all tests locally, using docker"
15+
@echo "make setup-local-docker : Build the local docker image"
1416
@echo ""
1517
@echo "Options for testing:"
1618
@echo " TEST_TARGET Set when running tests-single-*, to select the"
@@ -23,37 +25,41 @@ help:
2325
@echo " VERBOSE_PLATFORMIO If you want the full PIO output, set any value"
2426
@echo " GIT_RESET_HARD Used by CI: reset all local changes. WARNING:"
2527
@echo " THIS WILL UNDO ANY CHANGES YOU'VE MADE!"
26-
.PHONY: help
28+
29+
marlin:
30+
./buildroot/bin/mftest -a
31+
.PHONY: marlin
2732

2833
tests-single-ci:
2934
export GIT_RESET_HARD=true
30-
$(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET)
31-
.PHONY: tests-single-ci
35+
$(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET) PLATFORMIO_BUILD_FLAGS=-DGITHUB_ACTION
3236

3337
tests-single-local:
3438
@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-all-local" ; return 1; fi
3539
export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \
3640
&& export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \
3741
&& run_tests . $(TEST_TARGET) "$(ONLY_TEST)"
38-
.PHONY: tests-single-local
3942

4043
tests-single-local-docker:
4144
@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-all-local-docker" ; return 1; fi
4245
@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
4346
$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) $(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET) VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD) ONLY_TEST="$(ONLY_TEST)"
44-
.PHONY: tests-single-local-docker
4547

4648
tests-all-local:
4749
export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \
4850
&& export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \
4951
&& for TEST_TARGET in $$($(SCRIPTS_DIR)/get_test_targets.py) ; do echo "Running tests for $$TEST_TARGET" ; run_tests . $$TEST_TARGET ; done
50-
.PHONY: tests-all-local
5152

5253
tests-all-local-docker:
5354
@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
5455
$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) $(MAKE) tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD)
55-
.PHONY: tests-all-local-docker
5656

5757
setup-local-docker:
5858
$(CONTAINER_RT_BIN) build -t $(CONTAINER_IMAGE) -f docker/Dockerfile .
59-
.PHONY: setup-local-docker
59+
60+
PINS := $(shell find Marlin/src/pins -mindepth 2 -name '*.h')
61+
62+
$(PINS): %:
63+
@echo "Formatting $@" && node $(SCRIPTS_DIR)/pinsformat.js $@
64+
65+
format-pins: $(PINS)

0 commit comments

Comments
 (0)