Skip to content

Commit 5d3177f

Browse files
committed
Merge branch 'bugfix-2.1.x' into mike-anet-evo
* bugfix-2.1.x: (39 commits) [cron] Bump distribution date (2024-02-11) extend uart checks [cron] Bump distribution date (2024-02-10) 👷 Improve BIGTREE_GTR_V1_0 tests 🚸 Optional encoder multipliers [cron] Bump distribution date (2024-02-09) 🧑‍💻 HC32 endstop interrupts for X2/Y2/Z4 🔥 Clean up SCARA/TPARA ✨ MARLIN_SMALL_BUILD option (MarlinFirmware#26775) 🚸 Adjust encoder multiplier [cron] Bump distribution date (2024-02-08) 🧑‍💻 "static_warning" 🎨 Delete old FTDI Eve bootscreen 🩹 Fix FTDI Eve Touch UI M84 [cron] Bump distribution date (2024-02-07) 🔧 Restore probe XY edit defaults, remove arbitrary Z limit (MarlinFirmware#26774) [cron] Bump distribution date (2024-02-06) 🚸 Keep Filament Change near the top (MarlinFirmware#26172) [cron] Bump distribution date (2024-02-05) 🔧 Fix extraneous DIAG warnings (MarlinFirmware#26694) ...
2 parents 8dd89ea + 9e879a5 commit 5d3177f

File tree

111 files changed

+1007
-803
lines changed

Some content is hidden

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

111 files changed

+1007
-803
lines changed

Marlin/Configuration.h

+7-15
Original file line numberDiff line numberDiff line change
@@ -1009,9 +1009,6 @@
10091009
// Radius around the center where the arm cannot reach
10101010
#define MIDDLE_DEAD_ZONE_R 0 // (mm)
10111011

1012-
#define THETA_HOMING_OFFSET 0 // Calculated from Calibration Guide and M360 / M114. See https://www.morgan3dp.com/morgan-calibration-guide/
1013-
#define PSI_HOMING_OFFSET 0 // Calculated from Calibration Guide and M364 / M114. See https://www.morgan3dp.com/morgan-calibration-guide/
1014-
10151012
#elif ENABLED(MP_SCARA)
10161013

10171014
#define SCARA_OFFSET_THETA1 12 // degrees
@@ -1030,23 +1027,19 @@
10301027
#define DEFAULT_SEGMENTS_PER_SECOND 200
10311028

10321029
// Length of inner and outer support arms. Measure arm lengths precisely.
1033-
#define TPARA_LINKAGE_1 120 // (mm)
1034-
#define TPARA_LINKAGE_2 120 // (mm)
1030+
#define TPARA_LINKAGE_1 120 // (mm)
1031+
#define TPARA_LINKAGE_2 120 // (mm)
10351032

1036-
// SCARA tower offset (position of Tower relative to bed zero position)
1037-
// This needs to be reasonably accurate as it defines the printbed position in the SCARA space.
1038-
#define TPARA_OFFSET_X 0 // (mm)
1039-
#define TPARA_OFFSET_Y 0 // (mm)
1040-
#define TPARA_OFFSET_Z 0 // (mm)
1033+
// TPARA tower offset (position of Tower relative to bed zero position)
1034+
// This needs to be reasonably accurate as it defines the printbed position in the TPARA space.
1035+
#define TPARA_OFFSET_X 0 // (mm)
1036+
#define TPARA_OFFSET_Y 0 // (mm)
1037+
#define TPARA_OFFSET_Z 0 // (mm)
10411038

10421039
#define FEEDRATE_SCALING // Convert XY feedrate from mm/s to degrees/s on the fly
10431040

10441041
// Radius around the center where the arm cannot reach
10451042
#define MIDDLE_DEAD_ZONE_R 0 // (mm)
1046-
1047-
// Calculated from Calibration Guide and M360 / M114. See https://www.morgan3dp.com/morgan-calibration-guide/
1048-
#define THETA_HOMING_OFFSET 0
1049-
#define PSI_HOMING_OFFSET 0
10501043
#endif
10511044

10521045
// @section polar
@@ -3417,7 +3410,6 @@
34173410
#define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus
34183411

34193412
//#define DISABLE_ENCODER // Disable the click encoder, if any
3420-
//#define TOUCH_IDLE_SLEEP_MINS 5 // (minutes) Display Sleep after a period of inactivity. Set with M255 S.
34213413

34223414
#define TOUCH_SCREEN_CALIBRATION
34233415

Marlin/Configuration_adv.h

+15-16
Original file line numberDiff line numberDiff line change
@@ -1970,17 +1970,6 @@
19701970
// Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
19711971
#define USE_SMALL_INFOFONT
19721972

1973-
/**
1974-
* Graphical Display Sleep
1975-
*
1976-
* The U8G library provides sleep / wake functions for SH1106, SSD1306,
1977-
* SSD1309, and some other DOGM displays.
1978-
* Enable this option to save energy and prevent OLED pixel burn-in.
1979-
* Adds the menu item Configuration > LCD Timeout (m) to set a wait period
1980-
* from 0 (disabled) to 99 minutes.
1981-
*/
1982-
//#define DISPLAY_SLEEP_MINUTES 2 // (minutes) Timeout before turning off the screen. Set with M255 S.
1983-
19841973
/**
19851974
* ST7920-based LCDs can emulate a 16 x 4 character display using
19861975
* the ST7920 character-generator for very fast screen updates.
@@ -2229,13 +2218,20 @@
22292218
//#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
22302219
#endif
22312220

2232-
//
2233-
// LCD Backlight Timeout
2234-
// Requires a display with a controllable backlight
2235-
//
2221+
/**
2222+
* Display Sleep
2223+
* Enable this option to save energy and prevent OLED pixel burn-in.
2224+
*/
2225+
//#define DISPLAY_SLEEP_MINUTES 2 // (minutes) Timeout before turning off the screen
2226+
2227+
/**
2228+
* LCD Backlight Timeout
2229+
* Requires a display with a controllable backlight
2230+
*/
22362231
//#define LCD_BACKLIGHT_TIMEOUT_MINS 1 // (minutes) Timeout before turning off the backlight
2232+
22372233
#if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS)
2238-
#define EDITABLE_DISPLAY_TIMEOUT // Edit timeout with M255 S<minutes> and a menu item
2234+
#define EDITABLE_DISPLAY_TIMEOUT // Edit sleep / backlight timeout with M255 S<minutes> and a menu item
22392235
#endif
22402236

22412237
//
@@ -4531,3 +4527,6 @@
45314527

45324528
// Report uncleaned reset reason from register r2 instead of MCUSR. Supported by Optiboot on AVR.
45334529
//#define OPTIBOOT_RESET_REASON
4530+
4531+
// Shrink the build for smaller boards by sacrificing some serial feedback
4532+
//#define MARLIN_SMALL_BUILD

Marlin/Version.h

+1-1
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-30"
44+
//#define STRING_DISTRIBUTION_DATE "2024-02-11"
4545

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

Marlin/src/HAL/HC32/endstop_interrupts.cpp

+19-1
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,15 @@ void endstopIRQHandler() {
4040
CHECK(X_MAX);
4141
CHECK(X_MIN);
4242

43+
CHECK(X2_MAX);
44+
CHECK(X2_MIN);
45+
4346
CHECK(Y_MAX);
4447
CHECK(Y_MIN);
4548

49+
CHECK(Y2_MAX);
50+
CHECK(Y2_MIN);
51+
4652
CHECK(Z_MAX);
4753
CHECK(Z_MIN);
4854

@@ -52,6 +58,9 @@ void endstopIRQHandler() {
5258
CHECK(Z3_MAX);
5359
CHECK(Z3_MIN);
5460

61+
CHECK(Z4_MAX);
62+
CHECK(Z4_MIN);
63+
5564
CHECK(Z_MIN_PROBE);
5665

5766
// Update endstops
@@ -69,9 +78,15 @@ void setup_endstop_interrupts() {
6978
SETUP(X_MAX);
7079
SETUP(X_MIN);
7180

81+
SETUP(X2_MAX);
82+
SETUP(X2_MIN);
83+
7284
SETUP(Y_MAX);
7385
SETUP(Y_MIN);
7486

87+
SETUP(Y2_MAX);
88+
SETUP(Y2_MIN);
89+
7590
SETUP(Z_MAX);
7691
SETUP(Z_MIN);
7792

@@ -81,14 +96,17 @@ void setup_endstop_interrupts() {
8196
SETUP(Z3_MAX);
8297
SETUP(Z3_MIN);
8398

99+
SETUP(Z4_MAX);
100+
SETUP(Z4_MIN);
101+
84102
SETUP(Z_MIN_PROBE);
85103

86104
#undef SETUP
87105
}
88106

89107
// Ensure 1 - 10 IRQs are registered
90108
// Disable some endstops if you encounter this error
91-
#define ENDSTOPS_INTERRUPTS_COUNT COUNT_ENABLED(USE_X_MAX, USE_X_MIN, USE_Y_MAX, USE_Y_MIN, USE_Z_MAX, USE_Z_MIN, USE_Z2_MAX, USE_Z2_MIN, USE_Z3_MAX, USE_Z3_MIN, USE_Z_MIN_PROBE)
109+
#define ENDSTOPS_INTERRUPTS_COUNT COUNT_ENABLED(USE_X_MAX, USE_X_MIN, USE_X2_MAX, USE_X2_MIN, USE_Y_MAX, USE_Y_MIN, USE_Y2_MAX, USE_Y2_MIN, USE_Z_MAX, USE_Z_MIN, USE_Z2_MAX, USE_Z2_MIN, USE_Z3_MAX, USE_Z3_MIN, USE_Z4_MAX, USE_Z4_MIN, USE_Z_MIN_PROBE)
92110
#if ENDSTOPS_INTERRUPTS_COUNT > 10
93111
#error "Too many endstop interrupts! HC32F460 only supports 10 endstop interrupts."
94112
#elif ENDSTOPS_INTERRUPTS_COUNT == 0

Marlin/src/HAL/STM32/HardwareSerial.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
void serialEvent2() __attribute__((weak));
127127
#endif
128128
#ifdef USING_HW_SERIAL3
129-
HAL_HardwareSerial Serial3(USART3);
129+
HAL_HardwareSerial HSerial3(USART3);
130130
void serialEvent3() __attribute__((weak));
131131
#endif
132132
#ifdef USING_HW_SERIAL4
@@ -147,11 +147,11 @@
147147
#endif
148148
#ifdef USING_HW_SERIAL6
149149
#ifdef USART6
150-
HAL_HardwareSerial HSerial5(USART6);
150+
HAL_HardwareSerial HSerial6(USART6);
151151
#else
152-
HAL_HardwareSerial HSerial5(UART6);
152+
HAL_HardwareSerial HSerial6(UART6);
153153
#endif
154-
void serialEvent5() __attribute__((weak));
154+
void serialEvent6() __attribute__((weak));
155155
#endif
156156

157157
// Constructors ////////////////////////////////////////////////////////////////

Marlin/src/HAL/STM32/inc/SanityCheck.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,9 @@
5858
* Check for common serial pin conflicts
5959
*/
6060
#define _CHECK_SERIAL_PIN(N) (( \
61-
BTN_EN1 == N || DOGLCD_CS == N || HEATER_BED_PIN == N || FAN0_PIN == N || \
62-
SDIO_D2_PIN == N || SDIO_D3_PIN == N || SDIO_CK_PIN == N || SDIO_CMD_PIN == N \
61+
BTN_EN1 == N || BTN_EN2 == N ||DOGLCD_CS == N || HEATER_BED_PIN == N || FAN0_PIN == N || \
62+
SDIO_D2_PIN == N || SDIO_D3_PIN == N || SDIO_CK_PIN == N || SDIO_CMD_PIN == N || \
63+
Y_STEP_PIN == N || Y_ENABLE_PIN == N || E0_ENABLE_PIN == N || POWER_LOSS_PIN == N \
6364
))
6465
#define CHECK_SERIAL_PIN(T,N) defined(UART##N##_##T##_PIN) && _CHECK_SERIAL_PIN(UART##N##_##T##_PIN)
6566
#if SERIAL_IN_USE(1)

0 commit comments

Comments
 (0)