Skip to content

Commit aee8acf

Browse files
committed
Merge branch 'bugfix-2.1.x' into mike-anet-evo
* bugfix-2.1.x: [cron] Bump distribution date (2024-01-19) 🌐 Update Turkish language (MarlinFirmware#26676) 🔧 Clarify M600 sanity-check (MarlinFirmware#26702) 🔨 Improve CMakeLists.txt (MarlinFirmware#26700) [cron] Bump distribution date (2024-01-17) ✨ Minor Orca update
2 parents 7600fa6 + 9f7d5bb commit aee8acf

File tree

6 files changed

+195
-96
lines changed

6 files changed

+195
-96
lines changed

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 "2024-01-16"
44+
//#define STRING_DISTRIBUTION_DATE "2024-01-19"
4545

4646
/**
4747
* Defines a generic printer name to be output to the LCD after booting Marlin.

Marlin/src/inc/SanityCheck.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
542542
#elif FILAMENT_RUNOUT_DISTANCE_MM < 0
543543
#error "FILAMENT_RUNOUT_DISTANCE_MM must be greater than or equal to zero."
544544
#elif DISABLED(ADVANCED_PAUSE_FEATURE) && defined(FILAMENT_RUNOUT_SCRIPT)
545-
static_assert(nullptr == strstr(FILAMENT_RUNOUT_SCRIPT, "M600"), "ADVANCED_PAUSE_FEATURE is required to use M600 with FILAMENT_RUNOUT_SENSOR.");
545+
static_assert(nullptr == strstr(FILAMENT_RUNOUT_SCRIPT, "M600"), "FILAMENT_RUNOUT_SCRIPT cannot make use of M600 unless ADVANCED_PAUSE_FEATURE is enabled");
546546
#endif
547547
#endif
548548

@@ -614,7 +614,7 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
614614
#elif ENABLED(MMU2_MENUS) && !HAS_MARLINUI_MENU
615615
#error "MMU2_MENUS requires an LCD supporting MarlinUI."
616616
#elif DISABLED(ADVANCED_PAUSE_FEATURE)
617-
static_assert(nullptr == strstr(MMU2_FILAMENT_RUNOUT_SCRIPT, "M600"), "ADVANCED_PAUSE_FEATURE is required to use M600 with PRUSA_MMU2(S) / HAS_EXTENDABLE_MMU(S).");
617+
static_assert(nullptr == strstr(MMU2_FILAMENT_RUNOUT_SCRIPT, "M600"), "MMU2_FILAMENT_RUNOUT_SCRIPT cannot make use of M600 unless ADVANCED_PAUSE_FEATURE is enabled");
618618
#endif
619619
#endif
620620

Marlin/src/inc/Version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
* version was tagged.
4343
*/
4444
#ifndef STRING_DISTRIBUTION_DATE
45-
#define STRING_DISTRIBUTION_DATE "2024-01-16"
45+
#define STRING_DISTRIBUTION_DATE "2024-01-19"
4646
#endif
4747

4848
/**

0 commit comments

Comments
 (0)