Skip to content

Commit 5ab8ab1

Browse files
classicrocker883classicrocker883
committed
⛙ Merge w/Marlin
2 parents 8a189c1 + e80d8e9 commit 5ab8ab1

File tree

97 files changed

+561
-334
lines changed

Some content is hidden

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

97 files changed

+561
-334
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"platformio.platformio-ide",
3939
"marlinfirmware.auto-build",
4040
"editorconfig.editorconfig"
41-
],
41+
]
4242

4343
// Use 'forwardPorts' to make a list of ports inside the container available locally.
4444
// "forwardPorts": [],

‎.github/workflows/ci-validate-boards.yml‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@ name: CI - Validate boards.h
99
on:
1010
pull_request:
1111
branches:
12-
- 2025-August
13-
#- bugfix-2.1.x
12+
- 2025-August
1413
paths:
15-
- 'Marlin/src/core/boards.h'
14+
- "Marlin/src/core/boards.h"
1615
push:
1716
branches:
18-
- 2025-August
19-
#- bugfix-2.1.x
17+
- 2025-August
2018
paths:
21-
- 'Marlin/src/core/boards.h'
19+
- "Marlin/src/core/boards.h"
2220

2321
jobs:
2422
validate_pins_files:
@@ -28,23 +26,23 @@ jobs:
2826
runs-on: ubuntu-latest
2927

3028
steps:
31-
- name: Check out the PR
32-
uses: actions/checkout@v4.2.2
33-
34-
- name: Cache pip
35-
uses: actions/cache@v4.2.3
36-
with:
37-
path: ~/.cache/pip
38-
key: ${{ runner.os }}-pip-boards-v1-${{ hashFiles('**/requirements.txt') }}
39-
restore-keys: |
40-
${{ runner.os }}-pip-boards-v1-
41-
42-
- name: Select Python 3.13
43-
uses: actions/setup-python@v5.6.0
44-
with:
45-
python-version: '3.13'
46-
architecture: 'x64'
47-
48-
- name: Validate core/boards.h
49-
run: |
50-
make validate-boards -j
29+
- name: Check out the PR
30+
uses: actions/checkout@v4.2.2
31+
32+
- name: Cache pip
33+
uses: actions/cache@v4.2.3
34+
with:
35+
path: ~/.cache/pip
36+
key: ${{ runner.os }}-pip-validation-v1-${{ hashFiles('**/requirements.txt') }}
37+
restore-keys: |
38+
${{ runner.os }}-pip-validation-v1-
39+
40+
- name: Select Python 3.13
41+
uses: actions/setup-python@v5.6.0
42+
with:
43+
python-version: "3.13"
44+
architecture: "x64"
45+
46+
- name: Validate core/boards.h
47+
run: |
48+
make validate-boards -j

‎.github/workflows/ci-validate-lines.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#
2+
# ci-validate-lines.yml
3+
# Validate that all text files are unchanged by linesformat.py
4+
#
5+
6+
name: CI - Validate Source Files
7+
8+
on:
9+
pull_request:
10+
branches:
11+
- 2025-August
12+
push:
13+
branches:
14+
- 2025-August
15+
16+
jobs:
17+
validate_source_files:
18+
name: Validate Source Files
19+
if: github.repository == 'classicrocker883/MRiscoCProUI'
20+
21+
runs-on: ubuntu-latest
22+
23+
steps:
24+
- name: Check out the PR
25+
uses: actions/checkout@v4.2.2
26+
27+
- name: Cache node_modules
28+
uses: actions/cache@v4.2.3
29+
with:
30+
path: node_modules
31+
key: ${{ runner.os }}-npm-lines-v1-${{ hashFiles('**/package-lock.json') }}
32+
restore-keys: |
33+
${{ runner.os }}-npm-lines-
34+
35+
- name: Validate text file formatting
36+
run: |
37+
npm install --save-dev prettier
38+
make validate-lines -j

‎.github/workflows/ci-validate-pins.yml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ name: CI - Validate Pins Files
88
on:
99
pull_request:
1010
branches:
11-
- 2025-August
11+
- 2025-August
1212
# Cannot be enabled on 2.1.x until it contains the unit test framework
1313
#- 2.1.x
1414
paths:
15-
- 'Marlin/src/pins/*/**'
15+
- "Marlin/src/pins/*/**"
1616
push:
1717
branches:
18-
- 2025-August
18+
- 2025-August
1919
# Cannot be enabled on 2.1.x until it contains the unit test framework
2020
#- 2.1.x
2121
paths:
22-
- 'Marlin/src/pins/*/**'
22+
- "Marlin/src/pins/*/**"
2323

2424
jobs:
2525
validate_pins_files:
@@ -29,23 +29,23 @@ jobs:
2929
runs-on: ubuntu-latest
3030

3131
steps:
32-
- name: Check out the PR
33-
uses: actions/checkout@v4.2.2
34-
35-
- name: Cache pip
36-
uses: actions/cache@v4.2.3
37-
with:
38-
path: ~/.cache/pip
39-
key: ${{ runner.os }}-pip-pins-v1-${{ hashFiles('**/requirements.txt') }}
40-
restore-keys: |
41-
${{ runner.os }}-pip-pins-v1-
42-
43-
- name: Select Python 3.13
44-
uses: actions/setup-python@v5.6.0
45-
with:
46-
python-version: '3.13'
47-
architecture: 'x64'
48-
49-
- name: Validate all pins files
50-
run: |
51-
make validate-pins -j
32+
- name: Check out the PR
33+
uses: actions/checkout@v4.2.2
34+
35+
- name: Cache pip
36+
uses: actions/cache@v4.2.3
37+
with:
38+
path: ~/.cache/pip
39+
key: ${{ runner.os }}-pip-validation-v1-${{ hashFiles('**/requirements.txt') }}
40+
restore-keys: |
41+
${{ runner.os }}-pip-validation-v1-
42+
43+
- name: Select Python 3.13
44+
uses: actions/setup-python@v5.6.0
45+
with:
46+
python-version: "3.13"
47+
architecture: "x64"
48+
49+
- name: Validate all pins files
50+
run: |
51+
make validate-pins -j

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ out-language/
3131
*.gen
3232
*.sublime-workspace
3333

34+
# npm
35+
node_modules/
36+
package.json
37+
package-lock.json
38+
3439
# OS
3540
applet/
3641
.DS_Store

‎.prettierignore‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Prettier Ignore file
2+
*.min.js
3+
web-ui/
4+
buildroot/share/PlatformIO/boards
5+
buildroot/share/PlatformIO/variants
6+
*.sublime-project
7+
*.sublime-syntax
8+
.github
9+
.vscode
10+
launch.json

‎Makefile‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ help:
88
@echo "Tasks for local development:"
99
@echo "make marlin : Build Marlin for the configured board"
1010
@echo "make format-pins -j : Reformat all pins files (-j for parallel execution)"
11+
@echo "make validate-lines -j : Validate line endings, fails on trailing whitespace, etc."
1112
@echo "make validate-pins -j : Validate all pins files, fails if any require reformatting"
1213
@echo "make validate-boards -j : Validate boards.h and pins.h for standards compliance"
1314
@echo "make tests-single-ci : Run a single test from inside the CI"
@@ -95,7 +96,7 @@ PINS := $(shell find Marlin/src/pins -mindepth 2 -name '*.h')
9596
.PHONY: $(PINS) format-pins validate-pins
9697

9798
$(PINS): %:
98-
@echo "Formatting $@"
99+
@echo "Formatting pins $@"
99100
@python $(SCRIPTS_DIR)/pinsformat.py $< $@
100101

101102
format-pins: $(PINS)
@@ -104,6 +105,17 @@ validate-pins: format-pins
104105
@echo "Validating pins files"
105106
@git diff --exit-code || (git status && echo "\nError: Pins files are not formatted correctly. Run \"make format-pins\" to fix.\n" && exit 1)
106107

108+
.PHONY: format-lines validate-lines
109+
110+
format-lines:
111+
@echo "Formatting all sources"
112+
@python $(SCRIPTS_DIR)/linesformat.py buildroot
113+
@python $(SCRIPTS_DIR)/linesformat.py Marlin
114+
115+
validate-lines:
116+
@echo "Validating text formatting"
117+
@npx prettier --check . --editorconfig --object-wrap preserve
118+
107119
BOARDS_FILE := Marlin/src/core/boards.h
108120

109121
.PHONY: validate-boards

‎Marlin/Configuration.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3597,6 +3597,11 @@
35973597
//
35983598
//#define ENDER2_STOCKDISPLAY
35993599

3600+
#if ENABLED(DWIN_CREALITY_LCD)
3601+
//#define USE_STRING_HEADINGS // Use string headings for Creality UI instead of images
3602+
//#define USE_STRING_TITLES // Use string titles for Creality UI instead of images
3603+
#endif
3604+
36003605
//
36013606
// Touch Screen Settings
36023607
//

‎Marlin/Configuration_adv.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4016,7 +4016,7 @@
40164016
#endif
40174017

40184018
/**
4019-
* M115 - Report capabilites. Disable to save ~1150 bytes of flash.
4019+
* M115 - Report capabilities. Disable to save ~1150 bytes of flash.
40204020
* Some hosts (and serial TFT displays) rely on this feature.
40214021
*/
40224022
#define CAPABILITIES_REPORT

‎Marlin/Version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* here we define this default string as the date where the latest release
4242
* version was tagged.
4343
*/
44-
//#define STRING_DISTRIBUTION_DATE "2025-08-27"
44+
//#define STRING_DISTRIBUTION_DATE "2025-09-06"
4545

4646
#define STRING_DISTRIBUTION_DATE __DATE__
4747
#define STRING_DISTRIBUTION_TIME __TIME__

0 commit comments

Comments
 (0)