Skip to content

Commit 5562e75

Browse files
mriscocmriscoc
committed
Version 20220312
Upstream Marlin bugfix applied Better support of DACAI screens Increase Z feed rate Fix incompatibility with BILINEAR_SUBDIVISION Bug fixes
1 parent eae9ba6 commit 5562e75

File tree

1,486 files changed

+1438529
-20
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,486 files changed

+1438529
-20
lines changed

‎.editorconfig

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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,*.conf,*.sublime-project}]
18+
indent_style = tab
19+
indent_size = 4

‎.gitattributes

+21
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

+171
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
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
25+
marlin_config.json
26+
mczip.h
27+
*.gen
28+
*.sublime-workspace
29+
30+
#
31+
# OS
32+
#
33+
applet/
34+
.DS_Store
35+
36+
#
37+
# Misc
38+
#
39+
*~
40+
*.orig
41+
*.rej
42+
*.bak
43+
*.idea
44+
*.i
45+
*.ii
46+
*.swp
47+
tags
48+
49+
#
50+
# C++
51+
#
52+
# Compiled Object files
53+
*.slo
54+
*.lo
55+
*.o
56+
*.obj
57+
*.ino.cpp
58+
59+
# Precompiled Headers
60+
*.gch
61+
*.pch
62+
63+
# Compiled Dynamic libraries
64+
*.so
65+
*.dylib
66+
*.dll
67+
68+
# Fortran module files
69+
*.mod
70+
*.smod
71+
72+
# Compiled Static libraries
73+
*.lai
74+
*.la
75+
*.a
76+
*.lib
77+
78+
# Executables
79+
*.exe
80+
*.out
81+
*.app
82+
83+
#
84+
# C
85+
#
86+
# Object files
87+
*.o
88+
*.ko
89+
*.obj
90+
*.elf
91+
92+
# Precompiled Headers
93+
*.gch
94+
*.pch
95+
96+
# Libraries
97+
*.lib
98+
*.a
99+
*.la
100+
*.lo
101+
102+
# Shared objects (inc. Windows DLLs)
103+
*.dll
104+
*.so
105+
*.so.*
106+
*.dylib
107+
108+
# Executables
109+
*.exe
110+
*.out
111+
*.app
112+
*.i*86
113+
*.x86_64
114+
*.hex
115+
116+
# Debug files
117+
*.dSYM/
118+
*.su
119+
120+
# PlatformIO files/dirs
121+
.pio*
122+
.pioenvs
123+
.piolibdeps
124+
.clang_complete
125+
.gcc-flags.json
126+
/lib/
127+
128+
# Secure Credentials
129+
Configuration_Secure.h
130+
131+
# Visual Studio
132+
*.sln
133+
*.vcxproj
134+
*.vcxproj.user
135+
*.vcxproj.filters
136+
Release/
137+
Debug/
138+
__vm/
139+
.vs/
140+
vc-fileutils.settings
141+
142+
# Visual Studio Code
143+
.vscode/*
144+
!.vscode/extensions.json
145+
146+
#Simulation
147+
imgui.ini
148+
eeprom.dat
149+
spi_flash.bin
150+
151+
#cmake
152+
CMakeLists.txt
153+
src/CMakeLists.txt
154+
CMakeListsPrivate.txt
155+
build/
156+
157+
# CLion
158+
cmake-build-*
159+
160+
# Eclipse
161+
.project
162+
.cproject
163+
.pydevproject
164+
.settings
165+
.classpath
166+
167+
# Python
168+
__pycache__
169+
170+
# IOLogger logs
171+
*_log.csv

‎.vscode/extensions.json

+11
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

+52
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)