Skip to content

Commit 2a5aec1

Browse files
mikezsmikezs
committed
Merge branch 'bugfix-2.1.x' into mike-config
* bugfix-2.1.x: (91 commits) 🚸 Fix, clean up ProUI (MarlinFirmware#26434) 🧑‍💻 Update pins formatter script (MarlinFirmware#26450) [cron] Bump distribution date (2023-11-21) ✨ 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) [cron] Bump distribution date (2023-11-20) 🔥 Remove VAkE 403D part deux (MarlinFirmware#26443) 🐛 Fix rotational AxisFlags (MarlinFirmware#26444) 🔨 Similar board name errors [cron] Bump distribution date (2023-11-19) 🔨 Rotational move items (MarlinFirmware#26438) [cron] Bump distribution date (2023-11-18) 🔧 Define MarlinUI axis moves with lists (MarlinFirmware#26344) 🔨 Creality STM32F401RC w/out bootloader (MarlinFirmware#26373) [cron] Bump distribution date (2023-11-17) 🩹 Fix runout state in menu (MarlinFirmware#26394) [cron] Bump distribution date (2023-11-15) ... # Conflicts: # .github/workflows/close-stale.yml # .github/workflows/test-builds.yml
2 parents c2ffe73 + cc8f7c8 commit 2a5aec1

File tree

217 files changed

+3482
-2113
lines changed

Some content is hidden

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

217 files changed

+3482
-2113
lines changed

‎.editorconfig

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
# editorconfig.org
22
root = true
33

4+
[*]
5+
trim_trailing_whitespace = true
6+
insert_final_newline = true
7+
48
[{*.patch,syntax_test_*}]
59
trim_trailing_whitespace = false
610

711
[{*.c,*.cpp,*.h,*.ino,*.py,Makefile}]
8-
trim_trailing_whitespace = true
9-
insert_final_newline = true
1012
end_of_line = lf
1113

1214
[{*.c,*.cpp,*.h,*.ino}]
@@ -18,6 +20,10 @@ indent_size = 2
1820
indent_style = tab
1921
indent_size = 2
2022

23+
[*.md]
24+
# Two spaces at the end of the line means newline in Markdown
25+
trim_trailing_whitespace = false
26+
2127
[{*.py}]
2228
indent_style = space
2329
indent_size = 4

‎.github/ISSUE_TEMPLATE/bug_report.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,13 @@ body:
109109

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

115120
- type: dropdown
116121
attributes:

‎.github/code_of_conduct.md

+1-7
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 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.
4034

4135
## Attribution
4236

‎.github/contributing.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ 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 messaging @MarlinFirmware/moderators on the relevant issue, [or privately](//github.com/orgs/MarlinFirmware/teams/moderators).
3030

3131
## I don't want to read this whole thing I just have a question!!!
3232

‎.github/workflows/close-stale.yml

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#
2+
# close-stale.yml
3+
# Close open issues after a period of inactivity
4+
#
5+
6+
name: Close Stale Issues
7+
8+
on:
9+
schedule:
10+
- cron: "22 1 * * *"
11+
12+
jobs:
13+
stale:
14+
name: Close Stale Issues
15+
if: github.repository == 'MarlinFirmware/Marlin'
16+
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- uses: actions/stale@v3
21+
with:
22+
repo-token: ${{ secrets.GITHUB_TOKEN }}
23+
stale-issue-message: |
24+
Greetings from the Marlin AutoBot!
25+
This issue has had no activity for the last 90 days.
26+
Do you still see this issue with the latest `bugfix-2.1.x` code?
27+
Please add a reply within 14 days or this issue will be automatically closed.
28+
To keep a confirmed issue open we can also add a "Bug: Confirmed" tag.
29+
30+
Disclaimer: This is an open community project with lots of activity and limited
31+
resources. The main project contributors will do a bug sweep ahead of the next
32+
release, but any skilled member of the community may jump in at any time to fix
33+
this issue. That can take a while depending on our busy lives so please be patient,
34+
and take advantage of other resources such as the MarlinFirmware Discord to help
35+
solve the issue.
36+
days-before-stale: 90
37+
days-before-close: 14
38+
stale-issue-label: 'stale-closing-soon'
39+
exempt-all-assignees: true
40+
exempt-issue-labels: 'Bug: Confirmed !,T: Feature Request,Needs: More Data,Needs: Discussion,Needs: Documentation,Needs: Patch,Needs: Work,Needs: Testing,help wanted,no-locking'

‎.github/workflows/test-builds.yml

+177
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
#
2+
# test-builds.yml
3+
# Do test builds to catch compile errors
4+
#
5+
6+
name: CI
7+
8+
on:
9+
pull_request:
10+
branches:
11+
- bugfix-2.1.x
12+
paths-ignore:
13+
- config/**
14+
- data/**
15+
- docs/**
16+
- '**/*.md'
17+
push:
18+
branches:
19+
- bugfix-2.1.x
20+
paths-ignore:
21+
- config/**
22+
- data/**
23+
- docs/**
24+
- '**/*.md'
25+
26+
jobs:
27+
test_builds:
28+
name: Run All Tests
29+
if: github.repository == 'MarlinFirmware/Marlin'
30+
31+
runs-on: ubuntu-latest
32+
33+
strategy:
34+
matrix:
35+
test-platform:
36+
37+
# Native
38+
- linux_native
39+
40+
# AVR
41+
- mega2560
42+
- mega1280
43+
- at90usb1286_dfu
44+
45+
# AVR Extended
46+
- FYSETC_F6
47+
- melzi_optiboot
48+
- rambo
49+
- sanguino1284p
50+
- sanguino644p
51+
52+
# SAM3X8E
53+
- DUE
54+
- DUE_archim
55+
56+
# SAMD21
57+
- SAMD51_grandcentral_m4
58+
- SAMD21_minitronics20
59+
60+
# ESP32
61+
- esp32
62+
- mks_tinybee
63+
64+
# Teensy 2
65+
#- at90usb1286_cdc
66+
67+
# Teensy MK20DX256
68+
- teensy31
69+
70+
# Teensy MK64FX512, MK66FX1M0
71+
- teensy35
72+
73+
# Teensy IMXRT1062DVx6A
74+
- teensy41
75+
76+
# STM32F0
77+
- malyan_M300
78+
- STM32F070CB_malyan
79+
- STM32F070RB_malyan
80+
81+
# STM32F1
82+
- chitu_f103
83+
- mks_robin
84+
- mks_robin_nano_v1v2
85+
- PANDA_PI_V29
86+
- STM32F103RC_btt
87+
- STM32F103RC_fysetc
88+
- STM32F103RE_btt
89+
- STM32F103RE_btt_USB
90+
- STM32F103RE_creality
91+
- STM32F103VE_longer
92+
#- mks_robin_mini
93+
#- mks_robin_nano_v1_3_f4_usbmod
94+
#- mks_robin_nano_v1v2_usbmod
95+
#- STM32F103CB_malyan
96+
#- STM32F103RC_btt_USB
97+
#- STM32F103RE
98+
99+
# STM32F4
100+
- ARMED
101+
- BIGTREE_BTT002
102+
- BIGTREE_GTR_V1_0
103+
- BIGTREE_SKR_PRO
104+
- FLYF407ZG
105+
- FYSETC_S6
106+
- LERDGEK
107+
- LERDGEX
108+
- mks_robin_pro2
109+
- Opulo_Lumen_REV3
110+
- rumba32
111+
- STM32F401RC_creality
112+
- STM32F407VE_black
113+
- I3DBEEZ9_V1
114+
115+
# STM32F7
116+
- NUCLEO_F767ZI
117+
- REMRAM_V1
118+
119+
# STM32H7
120+
- BTT_SKR_SE_BX
121+
- STM32H743VI_btt
122+
123+
# STM32F1 (Maple)
124+
- jgaurora_a5s_a1_maple
125+
- mks_robin_lite_maple
126+
- mks_robin_pro_maple
127+
- STM32F103RC_btt_USB_maple
128+
- STM32F103RC_fysetc_maple
129+
- STM32F103RC_meeb_maple
130+
- STM32F103VE_longer_maple
131+
- STM32F103VE_ZM3E4V2_USB_maple
132+
#- mks_robin_maple
133+
#- mks_robin_nano_v1v2_maple
134+
#- STM32F103RC_btt_maple
135+
#- STM32F103RE_creality_maple
136+
137+
# STM32G0
138+
- STM32G0B1RE_btt
139+
140+
# LPC176x - Lengthy tests
141+
- LPC1768
142+
- LPC1769
143+
144+
steps:
145+
146+
- name: Check out the PR
147+
uses: actions/checkout@v3
148+
149+
- name: Cache pip
150+
uses: actions/cache@v3
151+
with:
152+
path: ~/.cache/pip
153+
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
154+
restore-keys: |
155+
${{ runner.os }}-pip-
156+
157+
- name: Cache PlatformIO
158+
uses: actions/cache@v3
159+
with:
160+
path: ~/.platformio
161+
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
162+
163+
- name: Select Python 3.7
164+
uses: actions/setup-python@v3
165+
with:
166+
python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax.
167+
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
168+
169+
- name: Install PlatformIO
170+
run: |
171+
pip install -U platformio
172+
pio upgrade --dev
173+
pio pkg update --global
174+
175+
- name: Run ${{ matrix.test-platform }} Tests
176+
run: |
177+
make tests-single-ci TEST_TARGET=${{ matrix.test-platform }}

‎.vscode/extensions.json

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"platformio.platformio-ide"
77
],
88
"unwantedRecommendations": [
9+
"ms-vscode-remote.remote-containers",
910
"ms-vscode.cpptools-extension-pack"
1011
]
1112
}

‎Makefile

+10
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ CONTAINER_IMAGE := marlin-dev
55

66
help:
77
@echo "Tasks for local development:"
8+
@echo "* format-pins: Reformat all pins files
89
@echo "* tests-single-ci: Run a single test from inside the CI"
910
@echo "* tests-single-local: Run a single test locally"
1011
@echo "* tests-single-local-docker: Run a single test locally, using docker"
@@ -57,3 +58,12 @@ tests-all-local-docker:
5758
setup-local-docker:
5859
$(CONTAINER_RT_BIN) build -t $(CONTAINER_IMAGE) -f docker/Dockerfile .
5960
.PHONY: setup-local-docker
61+
62+
PINS := $(shell find Marlin/src/pins -mindepth 2 -name '*.h')
63+
64+
.PHONY: $(PINS)
65+
66+
$(PINS): %:
67+
@echo "Formatting $@" && node buildroot/share/scripts/pinsformat.js $@
68+
69+
format-pins: $(PINS)

‎Marlin/Configuration.h

+15-8
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,9 @@
784784
//#define BED_LIMIT_SWITCHING // Keep the bed temperature within BED_HYSTERESIS of the target
785785
#endif
786786

787+
// Add 'M190 R T' for more gradual M190 R bed cooling.
788+
//#define BED_ANNEALING_GCODE
789+
787790
//===========================================================================
788791
//==================== PID > Chamber Temperature Control ====================
789792
//===========================================================================
@@ -952,19 +955,19 @@
952955
// Distance between bed and nozzle Z home position
953956
#define DELTA_HEIGHT 250.00 // (mm) Get this value from G33 auto calibrate
954957

955-
#define DELTA_ENDSTOP_ADJ { 0.0, 0.0, 0.0 } // Get these values from G33 auto calibrate
958+
#define DELTA_ENDSTOP_ADJ { 0.0, 0.0, 0.0 } // (mm) Get these values from G33 auto calibrate
956959

957960
// Horizontal distance bridged by diagonal push rods when effector is centered.
958961
#define DELTA_RADIUS 124.0 // (mm) Get this value from G33 auto calibrate
959962

960963
// Trim adjustments for individual towers
961964
// tower angle corrections for X and Y tower / rotate XYZ so Z tower angle = 0
962965
// measured in degrees anticlockwise looking from above the printer
963-
#define DELTA_TOWER_ANGLE_TRIM { 0.0, 0.0, 0.0 } // Get these values from G33 auto calibrate
966+
#define DELTA_TOWER_ANGLE_TRIM { 0.0, 0.0, 0.0 } // (mm) Get these values from G33 auto calibrate
964967

965-
// Delta radius and diagonal rod adjustments (mm)
966-
//#define DELTA_RADIUS_TRIM_TOWER { 0.0, 0.0, 0.0 }
967-
//#define DELTA_DIAGONAL_ROD_TRIM_TOWER { 0.0, 0.0, 0.0 }
968+
// Delta radius and diagonal rod adjustments
969+
//#define DELTA_RADIUS_TRIM_TOWER { 0.0, 0.0, 0.0 } // (mm)
970+
//#define DELTA_DIAGONAL_ROD_TRIM_TOWER { 0.0, 0.0, 0.0 } // (mm)
968971
#endif
969972

970973
// @section scara
@@ -1646,9 +1649,13 @@
16461649

16471650
#define Z_PROBE_LOW_POINT -2 // (mm) Farthest distance below the trigger-point to go before stopping
16481651

1649-
// For M851 give a range for adjusting the Z probe offset
1650-
#define Z_PROBE_OFFSET_RANGE_MIN -20 // (mm)
1651-
#define Z_PROBE_OFFSET_RANGE_MAX 20 // (mm)
1652+
// For M851 provide ranges for adjusting the X, Y, and Z probe offsets
1653+
//#define PROBE_OFFSET_XMIN -50 // (mm)
1654+
//#define PROBE_OFFSET_XMAX 50 // (mm)
1655+
//#define PROBE_OFFSET_YMIN -50 // (mm)
1656+
//#define PROBE_OFFSET_YMAX 50 // (mm)
1657+
//#define PROBE_OFFSET_ZMIN -20 // (mm)
1658+
//#define PROBE_OFFSET_ZMAX 20 // (mm)
16521659

16531660
// Enable the M48 repeatability test to test probe accuracy
16541661
#define Z_MIN_PROBE_REPEATABILITY_TEST

0 commit comments

Comments
 (0)