Skip to content

Commit f729788

Browse files
committed
**New Year 2024 (20240107)**
* The background of hot-end icon and bed icon blinks when they are being heating * Fix for mriscoc/Ender3V2S1#1175 * Adds mesh inset to the mesh validation test * Fix screen background in trammingWizard regardless an error in the first corner **New in source code:** * Enabled M48 menu item only if Z_MIN_PROBE_REPEATABILITY_TEST is enabled * Moves Bed size menu items after XY MIN/MAX position * Enables the storage of parameters in the EEPROM only if the respective feature is enabled **From Marlin Bugfix** * Slimmer null T command (MarlinFirmware#26615) * Followup to optional M111/M115 (MarlinFirmware#26626) * Fix hangs in DUE native USB (MarlinFirmware#26572) * Fix Bed PID Autotune output (MarlinFirmware#26606) * CONFIGURE_FILAMENT_CHANGE - Optional M603 (MarlinFirmware#26613) * I3DBEE TECH Beez Mini 12864 (MarlinFirmware#26596) * Options to slim M111, remove M115 (MarlinFirmware#26603) * BSD string workaround (MarlinFirmware#26532) * Fix homing with FT_MOTION (MarlinFirmware#26595) * Fix, extend FAN / AUTOFAN confict check (MarlinFirmware#26591) * BigTreeTech Manta M8P V2.0 (STM32H723ZE) (MarlinFirmware#26578) * Optimize FT_MOTION (MarlinFirmware#26557) * TriGorilla Pro default to ONBOARD_SDIO (MarlinFirmware#26586) * Specify [email protected] (MarlinFirmware#26582) * Newer Platform & Toolchain for STM32G0 (MarlinFirmware#26585) * Initial support for HC32 U8G LCD (MarlinFirmware#26568) * Move U8G defines to HALs * BigTreeTech Kraken V1.0 (STM32H723ZG) (MarlinFirmware#26565) * Fix string buffer warning (MarlinFirmware#26550) * Fix MARKFORGED_INVERSE typos (MarlinFirmware#26558) * Creality Free Runs fixups (MarlinFirmware#26562) * Orca 3D Modular Controller (MarlinFirmware#26534) * Jerk correction for LIN_ADVANCE + CLASSIC_JERK (MarlinFirmware#26551) * Optional FAN_INVERTING * Just "warn" on SD fail * FT_MOTION improvements (MarlinFirmware#26074) * Fix Creality E3 "Free-runs" (MarlinFirmware#26533) * Creality E3 Free-runs Silent Motherboard (MarlinFirmware#25636) * Fix planner jerk limits (MarlinFirmware#26529) * MARKFORGED_INVERSE (MarlinFirmware#26516) * Fix MKS TS35 with BTT SKR 1.3/1.4 (MarlinFirmware#26176) * SERIAL_DMA (for some STM32Fx) (MarlinFirmware#26328) * Adjust Progress / Completion (MarlinFirmware#26466) * Encoder improvements (MarlinFirmware#26501) * Use strlcpy with buffer size (MarlinFirmware#26513) * Use PIO versioning (including HC32) (MarlinFirmware#26512) * Voxelab Aquila N32 (via Maple) (MarlinFirmware#26470) * Fix tool-change E prime (MarlinFirmware#26494) * Fix thermistor 14 & 60 constexprness (MarlinFirmware#26499) * UI refresh for some events (MarlinFirmware#26487) * Fix a NeoPixel override (MarlinFirmware#26492) * Fix ftostrX3sign (MarlinFirmware#26497) * DOUBLE_LCD_FRAMERATE (MarlinFirmware#26500) * Fix some action labels (MarlinFirmware#26490) * More num-to-string digits / precisions (MarlinFirmware#26343) * Fix BLTouch HSMode deploy (MarlinFirmware#26311) * Touch fixes (MarlinFirmware#26455) * XY_AFTER_HOMING, EVENT_GCODE_AFTER_HOMING (MarlinFirmware#26469) * BlackBeezMini 3D by I3DBEE (MarlinFirmware#26406) * HAL for HC32F460 (MarlinFirmware#26414) * MAX Thermocouples for Heated Bed (MarlinFirmware#26441) * Pins for FYSETC Spider King 4.07 (MarlinFirmware#26461) * Use ftpl for item strings (MarlinFirmware#26462) * BD_SENSOR_PROBE_NO_STOP (MarlinFirmware#26353) * Fix PANDA ZHU missing #endif (MarlinFirmware#26460) * Update Teensy 4.0/4.1 Serial (MarlinFirmware#26457) * Configurable FR/Flow edit ranges (MarlinFirmware#26446) * Fix MMU2 sscanf bug, optimize (MarlinFirmware#26449) * Fix GT2560_V41b Z2 pin (MarlinFirmware#26370) * BTT Octopus Pro V1.0.1 (STM32H723ZE) (MarlinFirmware#26159) * Fix Ender-5 S1 env * Fix more MarlinUI title centering (MarlinFirmware#26440) * Fix MarlinUI axis move / UBL strings (MarlinFirmware#26439) * Minor touch calibration improvement (MarlinFirmware#26445) * Fix rotational AxisFlags (MarlinFirmware#26444) * Rotational move items (MarlinFirmware#26438) * Define MarlinUI axis moves with lists (MarlinFirmware#26344) * Creality STM32F401RC w/out bootloader (MarlinFirmware#26373) * Fix runout state in menu (MarlinFirmware#26394) And many other Bug fixes and improvements from the Marlin bugfix branch
1 parent c720172 commit f729788

File tree

3,235 files changed

+1778122
-22
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,235 files changed

+1778122
-22
lines changed

.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

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: 🐛 Report a bug
22
description: Create a bug report to help improve the Professional Firmware
33
title: "[BUG] (bug summary)"
4+
labels: ["Bug: Potential ?"]
45
body:
56
- type: markdown
67
attributes:
@@ -110,8 +111,13 @@ body:
110111

111112
- type: input
112113
attributes:
113-
label: Add-ons
114-
description: Please list any hardware add-ons that could be involved.
114+
label: LCD/Controller
115+
description: Some Marlin behaviors are determined by the controller. Describe your LCD/Controller model and version.
116+
117+
- type: input
118+
attributes:
119+
label: Other add-ons
120+
description: Please list any other hardware add-ons that could be involved.
115121

116122
- type: dropdown
117123
attributes:

.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

.github/workflows/auto-label.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#
2+
# auto-label.yml
3+
# - Find all open issues without a label and a title containing "[BUG]".
4+
# - Apply the label "Bug: Potential ?" to these issues.
5+
#
6+
7+
name: Label Old Bugs
8+
9+
on:
10+
schedule:
11+
- cron: "30 8 * * *"
12+
13+
jobs:
14+
autolabel:
15+
name: Auto Label
16+
if: github.repository == 'mriscoc/Ender3V2S1'
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Auto Label for [BUG]
20+
uses: actions/github-script@v7
21+
with:
22+
script: |
23+
// Get all open issues in this repository
24+
const issueList = await github.rest.issues.listForRepo({
25+
owner: context.repo.owner,
26+
repo: context.repo.repo,
27+
state: 'open'
28+
});
29+
// Filter issues without labels that have a title containing '[BUG]'.
30+
const matchingIssues = issueList.data.filter(
31+
issue => issue.title.includes('[BUG]') && issue.labels.length === 0
32+
);
33+
// Process the first 50
34+
for (const issue of matchingIssues.slice(0, 50)) {
35+
await github.rest.issues.addLabels({
36+
owner: context.repo.owner,
37+
repo: context.repo.repo,
38+
issue_number: issue.number,
39+
labels: ['Bug: Potential ?']
40+
});
41+
}

.github/workflows/check-pr.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ on:
1212
- 1.0.x
1313
- 1.1.x
1414
- 2.0.x
15-
- 2.1.x
1615

1716
jobs:
1817
bad_target:

.github/workflows/clean-closed.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
- "S: Please Merge"
2424
- "S: Please Test"
2525
- "help wanted"
26+
- "Bug: Potential ?"
2627
- "Needs: Discussion"
2728
- "Needs: Documentation"
2829
- "Needs: More Data"

.github/workflows/close-stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/stale@v3
20+
- uses: actions/stale@v8
2121
with:
2222
repo-token: ${{ secrets.GITHUB_TOKEN }}
2323
stale-issue-message: 'This issue has had no activity in the last 60 days. Please add a reply if you want to keep this issue active, otherwise it will be automatically closed within 10 days.'

.github/workflows/test-builds.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
pull_request:
1010
branches:
1111
- bugfix-2.1.x
12+
- 2.1.x
1213
paths-ignore:
1314
- config/**
1415
- data/**
@@ -17,6 +18,7 @@ on:
1718
push:
1819
branches:
1920
- bugfix-2.1.x
21+
- 2.1.x
2022
paths-ignore:
2123
- config/**
2224
- data/**
@@ -96,6 +98,7 @@ jobs:
9698

9799
# STM32H7
98100
- BTT_SKR_SE_BX
101+
- STM32H743VI_btt
99102

100103
# STM32F1 (Maple)
101104
- jgaurora_a5s_a1_maple
@@ -111,14 +114,20 @@ jobs:
111114
#- STM32F103RC_btt_maple
112115
#- STM32F103RE_creality_maple
113116

117+
# STM32G0
118+
- STM32G0B1RE_btt
119+
120+
# HC32
121+
- HC32F460C_aquila_101
122+
114123
# LPC176x - Lengthy tests
115124
- LPC1768
116125
- LPC1769
117126

118127
steps:
119128

120129
- name: Check out the PR
121-
uses: actions/checkout@v3
130+
uses: actions/checkout@v4
122131

123132
- name: Cache pip
124133
uses: actions/cache@v3
@@ -134,11 +143,11 @@ jobs:
134143
path: ~/.platformio
135144
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
136145

137-
- name: Select Python 3.7
138-
uses: actions/setup-python@v3
146+
- name: Select Python 3.9
147+
uses: actions/setup-python@v4
139148
with:
140-
python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax.
141-
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
149+
python-version: '3.9'
150+
architecture: 'x64'
142151

143152
- name: Install PlatformIO
144153
run: |

.gitignore

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

0 commit comments

Comments
 (0)