diff --git a/.github/workflows/bump-date.yml b/.github/workflows/bump-date.yml index 604c33e304..7de5798e31 100644 --- a/.github/workflows/bump-date.yml +++ b/.github/workflows/bump-date.yml @@ -18,12 +18,12 @@ jobs: steps: - - name: Check out 2024-December + - name: Check out 2025-January uses: actions/checkout@v4.2.2 with: - ref: 2024-December + ref: 2025-January - - name: Bump Date (2024-December) + - name: Bump Date (2025-January) run: | if [[ ! "$( git log -1 --pretty=%B )" =~ ^\[cron\] ]]; then shopt -s globstar && \ diff --git a/.github/workflows/ci-build-tests.yml b/.github/workflows/ci-build-tests.yml index 7e2f3a40b3..3ca70d3f82 100644 --- a/.github/workflows/ci-build-tests.yml +++ b/.github/workflows/ci-build-tests.yml @@ -8,7 +8,7 @@ name: CI - Build Tests on: pull_request: branches: - - 2024-December + - 2025-January paths-ignore: - configurations/** - display assets/** @@ -22,7 +22,7 @@ on: - '**/*.md' push: branches: - - 2024-December + - 2025-January paths-ignore: - configurations/** - display assets/** diff --git a/.github/workflows/ci-unit-tests.yml b/.github/workflows/ci-unit-tests.yml index 39fe3a9491..a6e6393d3c 100644 --- a/.github/workflows/ci-unit-tests.yml +++ b/.github/workflows/ci-unit-tests.yml @@ -8,7 +8,7 @@ name: CI - Unit Tests on: pull_request: branches: - - 2024-December + - 2025-January paths-ignore: - configurations/** - display assets/** @@ -22,7 +22,7 @@ on: - '**/*.md' push: branches: - - 2024-December + - 2025-January paths-ignore: - configurations/** - display assets/** diff --git a/.github/workflows/ci-validate-boards.yml b/.github/workflows/ci-validate-boards.yml index 519b1afb38..e9764cba5e 100644 --- a/.github/workflows/ci-validate-boards.yml +++ b/.github/workflows/ci-validate-boards.yml @@ -9,13 +9,13 @@ name: CI - Validate boards.h on: pull_request: branches: - - 2024-December + - 2025-January #- bugfix-2.1.x paths: - 'Marlin/src/core/boards.h' push: branches: - - 2024-December + - 2025-January #- bugfix-2.1.x paths: - 'Marlin/src/core/boards.h' diff --git a/.github/workflows/ci-validate-pins.yml b/.github/workflows/ci-validate-pins.yml index 14cd824238..19222819c1 100644 --- a/.github/workflows/ci-validate-pins.yml +++ b/.github/workflows/ci-validate-pins.yml @@ -8,14 +8,14 @@ name: CI - Validate Pins Files on: pull_request: branches: - - 2024-December + - 2025-January # Cannot be enabled on 2.1.x until it contains the unit test framework #- 2.1.x paths: - 'Marlin/src/pins/*/**' push: branches: - - 2024-December + - 2025-January # Cannot be enabled on 2.1.x until it contains the unit test framework #- 2.1.x paths: diff --git a/Marlin/Version.h b/Marlin/Version.h index c7660629dc..4e802d325b 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/README.md b/README.md index f241bdd40a..8cd8725e9d 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ ### - Please read this: - > [!NOTE] -Many Updates have been included in the most recent MRiscoCProUI for the **2024-December** release. +Many Updates have been included in the most recent MRiscoCProUI for the **2025-January** release. This release has many changes to the **UI**. New ICON's have been added, and old ones enhanced. Whoever edited them before saved directly as .*JPG* which in many editors lowers the quality of the image. I painstakingly remastered almost every single one; preserving the original quality. > diff --git a/buildroot/bin/build_all_examples b/buildroot/bin/build_all_examples index 1780486416..8f9ddf6037 100755 --- a/buildroot/bin/build_all_examples +++ b/buildroot/bin/build_all_examples @@ -50,7 +50,7 @@ build_all_examples [-a|--archive] - Copy the binary to the export locati } # Assume the most recent configs -BRANCH="2024-December" +BRANCH="2025-January" unset FIRST_CONF EXIT_USAGE= LIMIT=1000 diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs index 85ea5f6c1f..072db23375 100755 --- a/buildroot/bin/use_example_configs +++ b/buildroot/bin/use_example_configs @@ -20,7 +20,7 @@ which wget >/dev/null && TOOL='wget -q -O wgot' CURR=$(git branch 2>/dev/null | grep ^* | sed 's/\* //g') case "$CURR" in 2024-* ) BRANCH=$CURR ;; -* ) BRANCH=2024-December ;; +* ) BRANCH=2025-January ;; esac diff --git a/configurations/BTT_SKR-Mini-E3-V2/MM/Version.h b/configurations/BTT_SKR-Mini-E3-V2/MM/Version.h index b621af4f12..5627fe2b77 100644 --- a/configurations/BTT_SKR-Mini-E3-V2/MM/Version.h +++ b/configurations/BTT_SKR-Mini-E3-V2/MM/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/BTT_SKR-Mini-E3-V2/UBL/Version.h b/configurations/BTT_SKR-Mini-E3-V2/UBL/Version.h index c7660629dc..4e802d325b 100644 --- a/configurations/BTT_SKR-Mini-E3-V2/UBL/Version.h +++ b/configurations/BTT_SKR-Mini-E3-V2/UBL/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/BTT_SKR-Mini-E3-V3/MM/Version.h b/configurations/BTT_SKR-Mini-E3-V3/MM/Version.h index b621af4f12..5627fe2b77 100644 --- a/configurations/BTT_SKR-Mini-E3-V3/MM/Version.h +++ b/configurations/BTT_SKR-Mini-E3-V3/MM/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/BTT_SKR-Mini-E3-V3/UBL/Version.h b/configurations/BTT_SKR-Mini-E3-V3/UBL/Version.h index c7660629dc..4e802d325b 100644 --- a/configurations/BTT_SKR-Mini-E3-V3/UBL/Version.h +++ b/configurations/BTT_SKR-Mini-E3-V3/UBL/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/Creality Ender/BLT/Version.h b/configurations/Creality Ender/BLT/Version.h index 0c4f7c245d..b6a24a0502 100644 --- a/configurations/Creality Ender/BLT/Version.h +++ b/configurations/Creality Ender/BLT/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/Creality Ender/Default/Version.h b/configurations/Creality Ender/Default/Version.h index d5dd7554ed..48489aa01e 100644 --- a/configurations/Creality Ender/Default/Version.h +++ b/configurations/Creality Ender/Default/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/Creality Ender/E3-Free-runs/MM/Version.h b/configurations/Creality Ender/E3-Free-runs/MM/Version.h index 98097f7ebd..71e677bbda 100644 --- a/configurations/Creality Ender/E3-Free-runs/MM/Version.h +++ b/configurations/Creality Ender/E3-Free-runs/MM/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/Creality Ender/E3-Free-runs/UBL/Version.h b/configurations/Creality Ender/E3-Free-runs/UBL/Version.h index b6ae9a03ac..09ba4ea0bb 100644 --- a/configurations/Creality Ender/E3-Free-runs/UBL/Version.h +++ b/configurations/Creality Ender/E3-Free-runs/UBL/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/Creality Ender/MM/Version.h b/configurations/Creality Ender/MM/Version.h index 544f3ed4a7..ba3faa4975 100644 --- a/configurations/Creality Ender/MM/Version.h +++ b/configurations/Creality Ender/MM/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/Creality Ender/S1/UBL/Version.h b/configurations/Creality Ender/S1/UBL/Version.h index 8e25d246ff..dcc831278f 100644 --- a/configurations/Creality Ender/S1/UBL/Version.h +++ b/configurations/Creality Ender/S1/UBL/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/Creality Ender/UBL/Version.h b/configurations/Creality Ender/UBL/Version.h index 360227a7ec..6b989cdaf8 100644 --- a/configurations/Creality Ender/UBL/Version.h +++ b/configurations/Creality Ender/UBL/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/Voxelab Aquila 427/BLT/Version.h b/configurations/Voxelab Aquila 427/BLT/Version.h index 6476a3d816..595119f084 100644 --- a/configurations/Voxelab Aquila 427/BLT/Version.h +++ b/configurations/Voxelab Aquila 427/BLT/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/Voxelab Aquila 427/Default/Version.h b/configurations/Voxelab Aquila 427/Default/Version.h index 9e60174867..f35b719e06 100644 --- a/configurations/Voxelab Aquila 427/Default/Version.h +++ b/configurations/Voxelab Aquila 427/Default/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/Voxelab Aquila 427/MM/Version.h b/configurations/Voxelab Aquila 427/MM/Version.h index b621af4f12..5627fe2b77 100644 --- a/configurations/Voxelab Aquila 427/MM/Version.h +++ b/configurations/Voxelab Aquila 427/MM/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/Voxelab Aquila 427/UBL/Version.h b/configurations/Voxelab Aquila 427/UBL/Version.h index c7660629dc..4e802d325b 100644 --- a/configurations/Voxelab Aquila 427/UBL/Version.h +++ b/configurations/Voxelab Aquila 427/UBL/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/Voxelab Aquila/BLT/Version.h b/configurations/Voxelab Aquila/BLT/Version.h index 280247db3d..e4dab491a6 100644 --- a/configurations/Voxelab Aquila/BLT/Version.h +++ b/configurations/Voxelab Aquila/BLT/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/Voxelab Aquila/Default/Version.h b/configurations/Voxelab Aquila/Default/Version.h index ea84e556de..ee958c66f1 100644 --- a/configurations/Voxelab Aquila/Default/Version.h +++ b/configurations/Voxelab Aquila/Default/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/Voxelab Aquila/MM/Version.h b/configurations/Voxelab Aquila/MM/Version.h index eb8872601d..7ec3633e2a 100644 --- a/configurations/Voxelab Aquila/MM/Version.h +++ b/configurations/Voxelab Aquila/MM/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/Voxelab Aquila/UBL/Version.h b/configurations/Voxelab Aquila/UBL/Version.h index 5d0566898b..73e14a9677 100644 --- a/configurations/Voxelab Aquila/UBL/Version.h +++ b/configurations/Voxelab Aquila/UBL/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location diff --git a/configurations/Voxelab Aquila/X3/Version.h b/configurations/Voxelab Aquila/X3/Version.h index 50b8f1018d..8f9e95bc3b 100644 --- a/configurations/Voxelab Aquila/X3/Version.h +++ b/configurations/Voxelab Aquila/X3/Version.h @@ -28,7 +28,7 @@ /** * Marlin release version identifier */ -#define SHORT_BUILD_VERSION "2.1.3f-12" +#define SHORT_BUILD_VERSION "2.1.3g-1" /** * Verbose version identifier which should contain a reference to the location