Skip to content

Commit 1b05e5e

Browse files
mriscocmriscoc
committed
What's new in Universal MAY 2023 Edition (20230522)
- Runout icon indicator over the Extruder flow dashboard icon. - Dashboard Speed shows the current axes speed in mm/s intermittently with the speed percentage - Enhanced preview with arbitrary thumbnail size - Preview QR code removed for improve support with some display units - Improved 3D/BL/CRTouch auto leveling - Enable BLTouch HS mode for bed tramming wizard - Set Multiple probing to 0 as default - Better limits for mesh insets editing - New C35 custom g-code for launch the bed tramming wizard. - Added toolbar option for park head. - Force axes homing to allow parking at pause - Raise Z when printing is aborted - Fix a possible bug with filename drawing in printing page - Fix Crash after removing SD card #894 - Several minor bug fixes and Misc. optimizations - and many more fixes from latest Marlin's bugfix 2.1.x In source: - TJC support to enable preview and grid mesh viewer - Added Creality CV laser module support with automatic file type detection - Added Creality Cloud Support - Menu items value faster/smooth change rate - More #define flags to disable features to help to reduce code size - Many improvements from the latest Marlin's bugfix sources
1 parent 3d74ebc commit 1b05e5e

File tree

1,720 files changed

+1484085
-0
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,720 files changed

+1484085
-0
lines changed

‎.editorconfig‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# editorconfig.org
2+
root = true
3+
4+
[{*.patch,syntax_test_*}]
5+
trim_trailing_whitespace = false
6+
7+
[{*.c,*.cpp,*.h,*.ino,*.py,Makefile}]
8+
trim_trailing_whitespace = true
9+
insert_final_newline = true
10+
end_of_line = lf
11+
12+
[{*.c,*.cpp,*.h,*.ino}]
13+
charset = utf-8
14+
indent_style = space
15+
indent_size = 2
16+
17+
[{Makefile}]
18+
indent_style = tab
19+
indent_size = 2
20+
21+
[{*.py}]
22+
indent_style = space
23+
indent_size = 4
24+
25+
[{*.conf,*.sublime-project}]
26+
indent_style = tab
27+
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: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
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+
# OS
32+
applet/
33+
.DS_Store
34+
35+
# Compiled C++ Object files
36+
*.slo
37+
*.lo
38+
*.o
39+
*.obj
40+
*.ino.cpp
41+
42+
# Precompiled Headers
43+
*.gch
44+
*.pch
45+
46+
# Compiled Dynamic libraries
47+
*.so
48+
*.dylib
49+
*.dll
50+
51+
# Fortran module files
52+
*.mod
53+
*.smod
54+
55+
# Compiled Static libraries
56+
*.lai
57+
*.la
58+
*.a
59+
*.lib
60+
61+
# Executables
62+
*.exe
63+
*.out
64+
*.app
65+
66+
# Compiled C Object files
67+
*.o
68+
*.ko
69+
*.obj
70+
*.elf
71+
72+
# Precompiled Headers
73+
*.gch
74+
*.pch
75+
76+
# Libraries
77+
*.lib
78+
*.a
79+
*.la
80+
*.lo
81+
82+
# Shared objects (inc. Windows DLLs)
83+
*.dll
84+
*.so
85+
*.so.*
86+
*.dylib
87+
88+
# Executables
89+
*.exe
90+
*.out
91+
*.app
92+
*.i*86
93+
*.x86_64
94+
*.hex
95+
96+
# Debug files
97+
*.dSYM/
98+
*.su
99+
100+
# PlatformIO files/dirs
101+
.pio*
102+
.pioenvs
103+
.piolibdeps
104+
.clang_complete
105+
.gcc-flags.json
106+
/lib/
107+
108+
# Secure Credentials
109+
Configuration_Secure.h
110+
111+
# Visual Studio
112+
*.sln
113+
*.vcxproj
114+
*.vcxproj.user
115+
*.vcxproj.filters
116+
Release/
117+
Debug/
118+
__vm/
119+
.vs/
120+
vc-fileutils.settings
121+
122+
# Visual Studio Code
123+
.vscode/*
124+
!.vscode/extensions.json
125+
126+
# Simulation files
127+
imgui.ini
128+
eeprom.dat
129+
spi_flash.bin
130+
fs.img
131+
132+
# CMake
133+
CMakeLists.txt
134+
src/CMakeLists.txt
135+
CMakeListsPrivate.txt
136+
build/
137+
138+
# CLion
139+
cmake-build-*
140+
141+
# Eclipse
142+
.project
143+
.cproject
144+
.pydevproject
145+
.settings
146+
.classpath
147+
148+
# Python
149+
__pycache__
150+
151+
# IOLogger logs
152+
*_log.csv
153+
154+
# Misc.
155+
*~
156+
*.orig
157+
*.rej
158+
*.bak
159+
*.idea
160+
*.i
161+
*.ii
162+
*.swp
163+
tags
164+
*.logs
165+
*.bak
166+
/Compile.ps1
167+
/Copy MRiscoC config.bat
168+
/Compile_Releases.ps1
169+
/Compile_Special.ps1
170+
/Copy 422 MMesh config.bat

‎.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: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
SCRIPTS_DIR := buildroot/share/scripts
2+
CONTAINER_RT_BIN := docker
3+
CONTAINER_RT_OPTS := --rm -v $(PWD):/code -v platformio-cache:/root/.platformio
4+
CONTAINER_IMAGE := marlin-dev
5+
6+
help:
7+
@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"
14+
@echo ""
15+
@echo "Options for testing:"
16+
@echo " TEST_TARGET Set when running tests-single-*, to select the"
17+
@echo " test. If you set it to ALL it will run all "
18+
@echo " tests, but some of them are broken: use "
19+
@echo " tests-all-* instead to run only the ones that "
20+
@echo " run on GitHub CI"
21+
@echo " ONLY_TEST Limit tests to only those that contain this, or"
22+
@echo " the index of the test (1-based)"
23+
@echo " VERBOSE_PLATFORMIO If you want the full PIO output, set any value"
24+
@echo " GIT_RESET_HARD Used by CI: reset all local changes. WARNING:"
25+
@echo " THIS WILL UNDO ANY CHANGES YOU'VE MADE!"
26+
.PHONY: help
27+
28+
tests-single-ci:
29+
export GIT_RESET_HARD=true
30+
$(MAKE) tests-single-local TEST_TARGET=$(TEST_TARGET) PLATFORMIO_BUILD_FLAGS=-DGITHUB_ACTION
31+
.PHONY: tests-single-ci
32+
33+
tests-single-local:
34+
@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-all-local" ; return 1; fi
35+
export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \
36+
&& export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \
37+
&& run_tests . $(TEST_TARGET) "$(ONLY_TEST)"
38+
.PHONY: tests-single-local
39+
40+
tests-single-local-docker:
41+
@if ! test -n "$(TEST_TARGET)" ; then echo "***ERROR*** Set TEST_TARGET=<your-module> or use make tests-all-local-docker" ; return 1; fi
42+
@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
43+
$(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
45+
46+
tests-all-local:
47+
export PATH="./buildroot/bin/:./buildroot/tests/:${PATH}" \
48+
&& export VERBOSE_PLATFORMIO=$(VERBOSE_PLATFORMIO) \
49+
&& 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
51+
52+
tests-all-local-docker:
53+
@if ! $(CONTAINER_RT_BIN) images -q $(CONTAINER_IMAGE) > /dev/null ; then $(MAKE) setup-local-docker ; fi
54+
$(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
56+
57+
setup-local-docker:
58+
$(CONTAINER_RT_BIN) build -t $(CONTAINER_IMAGE) -f docker/Dockerfile .
59+
.PHONY: setup-local-docker

0 commit comments

Comments
 (0)