-
-
Notifications
You must be signed in to change notification settings - Fork 371
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
What's new in ANNIVERSARY 2023 (20231202) AML2.0 Edition
* Arbitrary rectangular NxM mesh leveling density (AML2.0) * Mesh size and mesh density are also saved in UBL slots (AML2.0) * Adds Custom g-code C29 M for maximize and C29 C for center mesh area (AML2.0) * Larger font for numeric values in bed tramming wizard * Run-out icon blink is disabled if run-out sensor is disabled * Mesh viewer is now able to show a mesh with NAN points * Disables UBL_SAVE_ACTIVE_ON_M500 and ZOFFSET_SAVE_SETTINGS for AML2.0 compatibility * Define PREHEAT_TIME_HOTEND_MS 7500 for compatibility with high temperature thermistors **New in source code:** * ProUI extension support for Monochrome LCD displays (CR10 Type, TFT MarlinUI, etc) * ProUI extension support for MarlinUI touch screens * C104 support can be removed for better special temperature sensor compatibility * Allows to use bed tramming wizard without a leveling system * Bed tramming wizard can be disabled for reduce program memory size * Allows compile without a bed probe or leveling system * Fix sound on encoder tick when SPEAKER is enabled * Fix sound alarm on thermal runaway when SPEAKER is enabled * Increased board support (Octopus Pro) * Moved some text strings to language files for better translation * New menu system with better memory allocation * Code optimization to reduce program memory size **From Marlin Bugfix** * Automatic minimum planner junction speed (#26198) * Nonlinear Extrusion Control (M592) (#26127) * More precision in G30 output (#26255) * Allow arbitrary BLOCK_BUFFER_SIZE * Fixes for G2/G3 arcs (#26170) * Reversible file alpha sorting (#26130) * And many other Bug fixes and improvements from the Marlin bugfix branch Demo firmwares are restricted to a print time of one hour.
- Loading branch information
Showing
3,143 changed files
with
1,761,855 additions
and
11 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
# Set the default behavior, in case people don't have core.autocrlf set. | ||
* text=auto | ||
|
||
# Files with Unix line endings | ||
*.c text eol=lf | ||
*.cpp text eol=lf | ||
*.h text eol=lf | ||
*.ino text eol=lf | ||
*.py text eol=lf | ||
*.sh text eol=lf | ||
*.scad text eol=lf | ||
|
||
# Files with native line endings | ||
# *.sln text | ||
|
||
# Binary files | ||
*.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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,15 +28,9 @@ Project maintainers are responsible for clarifying the standards of acceptable b | |
|
||
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. | ||
|
||
## Scope | ||
|
||
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. | ||
|
||
## Enforcement | ||
|
||
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. | ||
|
||
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. | ||
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by messaging @MarlinFirmware/moderators on the relevant issue, [or privately](//github.com/orgs/MarlinFirmware/teams/moderators). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. | ||
|
||
## Attribution | ||
|
||
|
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 |
---|---|---|
|
@@ -26,7 +26,7 @@ The following is a set of guidelines for contributing to Marlin, hosted by the [ | |
|
||
## Code of Conduct | ||
|
||
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). | ||
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 messaging @MarlinFirmware/moderators on the relevant issue, [or privately](//github.com/orgs/MarlinFirmware/teams/moderators). | ||
|
||
## I don't want to read this whole thing I just have a question!!! | ||
|
||
|
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,172 @@ | ||
# | ||
# Marlin 3D Printer Firmware | ||
# Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] | ||
# | ||
# Based on Sprinter and grbl. | ||
# Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm | ||
# | ||
# This program is free software: you can redistribute it and/or modify | ||
# it under the terms of the GNU General Public License as published by | ||
# the Free Software Foundation, either version 3 of the License, or | ||
# (at your option) any later version. | ||
# | ||
# This program is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
# GNU General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU General Public License | ||
# along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
# | ||
|
||
# Generated files | ||
_Version.h | ||
bdf2u8g.exe | ||
genpages.exe | ||
marlin_config.json | ||
mczip.h | ||
language*.csv | ||
out-csv/ | ||
out-language/ | ||
*.gen | ||
*.sublime-workspace | ||
|
||
# OS | ||
applet/ | ||
.DS_Store | ||
|
||
# Compiled C++ Object files | ||
*.slo | ||
*.lo | ||
*.o | ||
*.obj | ||
*.ino.cpp | ||
|
||
# Precompiled Headers | ||
*.gch | ||
*.pch | ||
|
||
# Compiled Dynamic libraries | ||
*.so | ||
*.dylib | ||
*.dll | ||
|
||
# Fortran module files | ||
*.mod | ||
*.smod | ||
|
||
# Compiled Static libraries | ||
*.lai | ||
*.la | ||
*.a | ||
*.lib | ||
|
||
# Executables | ||
*.exe | ||
*.out | ||
*.app | ||
|
||
# Compiled C Object files | ||
*.o | ||
*.ko | ||
*.obj | ||
*.elf | ||
|
||
# Precompiled Headers | ||
*.gch | ||
*.pch | ||
|
||
# Libraries | ||
*.lib | ||
*.a | ||
*.la | ||
*.lo | ||
|
||
# Shared objects (inc. Windows DLLs) | ||
*.dll | ||
*.so | ||
*.so.* | ||
*.dylib | ||
|
||
# Executables | ||
*.exe | ||
*.out | ||
*.app | ||
*.i*86 | ||
*.x86_64 | ||
*.hex | ||
|
||
# Debug files | ||
*.dSYM/ | ||
*.su | ||
|
||
# PlatformIO files/dirs | ||
.pio* | ||
.pioenvs | ||
.piolibdeps | ||
.clang_complete | ||
.gcc-flags.json | ||
/lib/ | ||
|
||
# Secure Credentials | ||
Configuration_Secure.h | ||
|
||
# Visual Studio | ||
*.sln | ||
*.vcxproj | ||
*.vcxproj.user | ||
*.vcxproj.filters | ||
Release/ | ||
Debug/ | ||
__vm/ | ||
.vs/ | ||
vc-fileutils.settings | ||
|
||
# Visual Studio Code | ||
.vscode/* | ||
!.vscode/extensions.json | ||
|
||
# Simulation files | ||
imgui.ini | ||
eeprom.dat | ||
spi_flash.bin | ||
fs.img | ||
|
||
# CMake | ||
buildroot/share/cmake/* | ||
CMakeLists.txt | ||
!buildroot/share/cmake/CMakeLists.txt | ||
src/CMakeLists.txt | ||
CMakeListsPrivate.txt | ||
build/ | ||
|
||
# CLion | ||
cmake-build-* | ||
|
||
# Eclipse | ||
.project | ||
.cproject | ||
.pydevproject | ||
.settings | ||
.classpath | ||
|
||
# Python | ||
__pycache__ | ||
|
||
# IOLogger logs | ||
*_log.csv | ||
|
||
# Misc. | ||
*~ | ||
*.orig | ||
*.rej | ||
*.bak | ||
*.idea | ||
*.i | ||
*.ii | ||
*.swp | ||
tags | ||
*.logs | ||
*.bak | ||
/.vscode | ||
/.editorconfig |
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,59 @@ | ||
SCRIPTS_DIR := buildroot/share/scripts | ||
CONTAINER_RT_BIN := docker | ||
CONTAINER_RT_OPTS := --rm -v $(PWD):/code -v platformio-cache:/root/.platformio | ||
CONTAINER_IMAGE := marlin-dev | ||
|
||
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" | ||
@echo "* tests-all-local: Run all tests locally" | ||
@echo "* tests-all-local-docker: Run all tests locally, using docker" | ||
@echo "* setup-local-docker: Build the local docker image" | ||
@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) PLATFORMIO_BUILD_FLAGS=-DGITHUB_ACTION | ||
.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 | ||
@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi | ||
$(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)" | ||
.PHONY: tests-single-local-docker | ||
|
||
tests-all-local: | ||
export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \ | ||
&& export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \ | ||
&& for TEST_TARGET in $$($(SCRIPTS_DIR)/get_test_targets.py) ; do echo "Running tests for $$TEST_TARGET" ; run_tests . $$TEST_TARGET ; done | ||
.PHONY: tests-all-local | ||
|
||
tests-all-local-docker: | ||
@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi | ||
$(CONTAINER_RT_BIN) run $(CONTAINER_RT_OPTS) $(CONTAINER_IMAGE) $(MAKE) tests-all-local VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) GIT_RESET_HARD=$(GIT_RESET_HARD) | ||
.PHONY: tests-all-local-docker | ||
|
||
setup-local-docker: | ||
$(CONTAINER_RT_BIN) build -t $(CONTAINER_IMAGE) -f docker/Dockerfile . | ||
.PHONY: setup-local-docker |
Oops, something went wrong.