Skip to content

Commit 314835d

Browse files
mriscocmriscoc
committed
What's new in Boreal Spring 20230312 version
- Fix #742 - Increased the number of sorted files to 50 - Preview works in DWIN and DACAI screens (selected automatically, S1 F4 preview supports only DACAI screens in the precompiled firmware) - Fix C125 issue: #667 - Power outage recovery can be enabled/disabled in tune menu - Improved power outage recovery - Added Extrude 100 mm to Move menu for aid with extruder calibration - Optimize print percent and remain time to use Marlin's processing - Decrease HOTEND_IDLE_MIN_TRIGGER to 150 - Removed forcing automatic cool down and motor disable - Axes are not immediately disabled after abort print, now using timeout. - Allows enable/disable file list sorting if MEDIASORT_MENU_ITEM is defined - Enable/Disable tune menu items: RUNOUT_TUNE_ITEM, PLR_TUNE_ITEM, JD_TUNE_ITEM, ADVK_TUNE_ITEM - Use LCD_BED_TRAMMING settings for bed tramming - Some fixes in source code for special configurations - Several minor fixes - Marlin'sFix UBL 'G29 J' mesh tilt (#25453) - Marlin's Enhanced IS and LA - Marlin's Fix FastPWM calculations (#25343) - Marlin's AVOID_OBSTACLES for UBL (#25256) - and many more fixes from latest Marlin's bugfix 2.1.x
1 parent 398d931 commit 314835d

File tree

1,621 files changed

+1460331
-5
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,621 files changed

+1460331
-5
lines changed

‎.editorconfig‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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}]
18+
indent_style = space
19+
indent_size = 4
20+
21+
[{*.conf,*.sublime-project}]
22+
indent_style = tab
23+
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

‎.gitignore‎

Lines changed: 173 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
#
2+
# Marlin 3D Printer Firmware
3+
# Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4+
#
5+
# Based on Sprinter and grbl.
6+
# Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7+
#
8+
# This program is free software: you can redistribute it and/or modify
9+
# it under the terms of the GNU General Public License as published by
10+
# the Free Software Foundation, either version 3 of the License, or
11+
# (at your option) any later version.
12+
#
13+
# This program is distributed in the hope that it will be useful,
14+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
# GNU General Public License for more details.
17+
#
18+
# You should have received a copy of the GNU General Public License
19+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
20+
#
21+
22+
# Generated files
23+
_Version.h
24+
bdf2u8g.exe
25+
genpages.exe
26+
marlin_config.json
27+
mczip.h
28+
*.gen
29+
*.sublime-workspace
30+
31+
#
32+
# OS
33+
#
34+
applet/
35+
.DS_Store
36+
37+
#
38+
# Misc
39+
#
40+
*~
41+
*.orig
42+
*.rej
43+
*.bak
44+
*.idea
45+
*.i
46+
*.ii
47+
*.swp
48+
tags
49+
50+
#
51+
# C++
52+
#
53+
# Compiled Object files
54+
*.slo
55+
*.lo
56+
*.o
57+
*.obj
58+
*.ino.cpp
59+
60+
# Precompiled Headers
61+
*.gch
62+
*.pch
63+
64+
# Compiled Dynamic libraries
65+
*.so
66+
*.dylib
67+
*.dll
68+
69+
# Fortran module files
70+
*.mod
71+
*.smod
72+
73+
# Compiled Static libraries
74+
*.lai
75+
*.la
76+
*.a
77+
*.lib
78+
79+
# Executables
80+
*.exe
81+
*.out
82+
*.app
83+
84+
#
85+
# C
86+
#
87+
# Object files
88+
*.o
89+
*.ko
90+
*.obj
91+
*.elf
92+
93+
# Precompiled Headers
94+
*.gch
95+
*.pch
96+
97+
# Libraries
98+
*.lib
99+
*.a
100+
*.la
101+
*.lo
102+
103+
# Shared objects (inc. Windows DLLs)
104+
*.dll
105+
*.so
106+
*.so.*
107+
*.dylib
108+
109+
# Executables
110+
*.exe
111+
*.out
112+
*.app
113+
*.i*86
114+
*.x86_64
115+
*.hex
116+
117+
# Debug files
118+
*.dSYM/
119+
*.su
120+
121+
# PlatformIO files/dirs
122+
.pio*
123+
.pioenvs
124+
.piolibdeps
125+
.clang_complete
126+
.gcc-flags.json
127+
/lib/
128+
129+
# Secure Credentials
130+
Configuration_Secure.h
131+
132+
# Visual Studio
133+
*.sln
134+
*.vcxproj
135+
*.vcxproj.user
136+
*.vcxproj.filters
137+
Release/
138+
Debug/
139+
__vm/
140+
.vs/
141+
vc-fileutils.settings
142+
143+
# Visual Studio Code
144+
.vscode/*
145+
!.vscode/extensions.json
146+
147+
#Simulation
148+
imgui.ini
149+
eeprom.dat
150+
spi_flash.bin
151+
fs.img
152+
153+
#cmake
154+
CMakeLists.txt
155+
src/CMakeLists.txt
156+
CMakeListsPrivate.txt
157+
build/
158+
159+
# CLion
160+
cmake-build-*
161+
162+
# Eclipse
163+
.project
164+
.cproject
165+
.pydevproject
166+
.settings
167+
.classpath
168+
169+
# Python
170+
__pycache__
171+
172+
# IOLogger logs
173+
*_log.csv

‎.vscode/extensions.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
// See http://go.microsoft.com/fwlink/?LinkId=827846
3+
// for the documentation about the extensions.json format
4+
"recommendations": [
5+
"marlinfirmware.auto-build",
6+
"platformio.platformio-ide"
7+
],
8+
"unwantedRecommendations": [
9+
"ms-vscode.cpptools-extension-pack"
10+
]
11+
}

‎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)