From 072b90d105ef2c819cbc83b6941f0e78c7862863 Mon Sep 17 00:00:00 2001 From: Keith Bennett <13375512+thisiskeithb@users.noreply.github.com> Date: Fri, 28 Feb 2025 18:57:40 -0800 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=92=9A=20Fix=20Simulator=20CI=20build?= =?UTF-8?q?=20(#27712)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci-build-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-build-tests.yml b/.github/workflows/ci-build-tests.yml index afe9292c19..3dabf82f46 100644 --- a/.github/workflows/ci-build-tests.yml +++ b/.github/workflows/ci-build-tests.yml @@ -188,6 +188,7 @@ jobs: - name: Install Simulator dependencies run: | + sudo apt-get update sudo apt-get install build-essential sudo apt-get install libsdl2-dev sudo apt-get install libsdl2-net-dev From 142177426ba53cac17c9935d9f47d7ccf265b984 Mon Sep 17 00:00:00 2001 From: thinkyhead Date: Sat, 1 Mar 2025 06:07:59 +0000 Subject: [PATCH 2/3] [cron] Bump distribution date (2025-03-01) --- Marlin/Version.h | 2 +- Marlin/src/inc/Version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Version.h b/Marlin/Version.h index 1016d1abec..fb330132f6 100644 --- a/Marlin/Version.h +++ b/Marlin/Version.h @@ -41,7 +41,7 @@ * here we define this default string as the date where the latest release * version was tagged. */ -//#define STRING_DISTRIBUTION_DATE "2025-02-20" +//#define STRING_DISTRIBUTION_DATE "2025-03-01" /** * The protocol for communication to the host. Protocol indicates communication diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h index 43fe20701d..bc1615febe 100644 --- a/Marlin/src/inc/Version.h +++ b/Marlin/src/inc/Version.h @@ -42,7 +42,7 @@ * version was tagged. */ #ifndef STRING_DISTRIBUTION_DATE - #define STRING_DISTRIBUTION_DATE "2025-02-20" + #define STRING_DISTRIBUTION_DATE "2025-03-01" #endif /** From dd3bf2995b42c9040ead3d976493297b519ddf52 Mon Sep 17 00:00:00 2001 From: Farva42 <100859196+Farva42@users.noreply.github.com> Date: Fri, 28 Feb 2025 23:26:56 -0700 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=94=A7=20Static=20assert=20Dual=20X?= =?UTF-8?q?=20min/max=20(#27701)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/inc/SanityCheck.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index a11965a01c..76b9c136d0 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -1933,8 +1933,9 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i #error "DUAL_X_CARRIAGE requires X2_HOME_POS, X2_MIN_POS, and X2_MAX_POS." #elif X_HOME_TO_MAX #error "DUAL_X_CARRIAGE requires X_HOME_DIR -1." - #elif (X2_HOME_POS <= X1_MAX_POS) || (X2_MAX_POS < X1_MAX_POS) - #error "DUAL_X_CARRIAGE will crash if X1 can meet or exceed X2 travel." + #else + static_assert((X2_HOME_POS) > (X1_MAX_POS), "X2_HOME_POS must be greater than X1_MAX_POS (i.e., X_BED_SIZE)."); + static_assert((X2_MIN_POS) > (X1_MIN_POS), "X2_MIN_POS must be greater than X1_MIN_POS (i.e., X_MIN_POS)."); #endif #endif