3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2026-01-01 04:11:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge https://github.com/MarlinFirmware/Marlin into bugfix-2.1.x-February2

Browse source
This commit is contained in:
classicrocker883 2025-03-01 11:07:45 -05:00
commit 9641281ada
No known key found for this signature in database
GPG key ID: 11D10A09D3B1FFC2
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Version.h
View file

@ -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

5
Marlin/src/inc/SanityCheck.h
View file

@ -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

2
Marlin/src/inc/Version.h
View file

@ -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
/**