Skip to content

Commit f000f60

Browse files
classicrocker883classicrocker883
committed
⛙ Merge w/Marlin
2 parents 1d37ce1 + c2d586c commit f000f60

37 files changed

+244
-174
lines changed

‎Marlin/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,8 @@ else ifeq ($(HARDWARE_MOTHERBOARD),1164)
338338
else ifeq ($(HARDWARE_MOTHERBOARD),1165)
339339
# XTLW MFF V2.0
340340
else ifeq ($(HARDWARE_MOTHERBOARD),1166)
341-
341+
# E3D Rumba BigBox
342+
else ifeq ($(HARDWARE_MOTHERBOARD),1167)
342343

343344
#
344345
# RAMBo and derivatives

‎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 "2025-06-09"
44+
//#define STRING_DISTRIBUTION_DATE "2025-06-10"
4545

4646
#define STRING_DISTRIBUTION_DATE __DATE__
4747
#define STRING_DISTRIBUTION_TIME __TIME__

‎Marlin/src/HAL/STM32/tft/xpt2046.h‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@
4949
#define TOUCH_INT_PIN -1
5050
#endif
5151

52-
#define XPT2046_DFR_MODE 0x00
52+
#if PIN_EXISTS(TOUCH_INT)
53+
#define XPT2046_DFR_MODE 0x00
54+
#else
55+
#define XPT2046_DFR_MODE 0x01
56+
#endif
5357
#define XPT2046_SER_MODE 0x04
5458
#define XPT2046_CONTROL 0x80
5559

‎Marlin/src/core/boards.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
#define BOARD_KODAMA_BARDO 1164 // Kodama Bardo V1.x (as found in the Kodama Trinus)
132132
#define BOARD_XTLW_MFF_V1 1165 // XTLW MFF V1.0
133133
#define BOARD_XTLW_MFF_V2 1166 // XTLW MFF V2.0
134+
#define BOARD_RUMBA_E3D 1167 // E3D Rumba BigBox
134135

135136
//
136137
// RAMBo and derivatives

‎Marlin/src/gcode/lcd/M995.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
#if HAS_TFT_LVGL_UI
3030
#include "../../lcd/extui/mks_ui/draw_touch_calibration.h"
31+
#include "../../lcd/extui/mks_ui/draw_ui.h"
3132
#else
3233
#include "../../lcd/menu/menu.h"
3334
#endif
@@ -38,6 +39,7 @@
3839
void GcodeSuite::M995() {
3940

4041
#if HAS_TFT_LVGL_UI
42+
clear_cur_ui();
4143
lv_draw_touch_calibration_screen();
4244
#else
4345
ui.goto_screen(touch_screen_calibration);

‎Marlin/src/inc/SanityCheck.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -871,8 +871,6 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
871871
#if ENABLED(SMOOTH_LIN_ADVANCE)
872872
#ifndef CPU_32_BIT
873873
#error "SMOOTH_LIN_ADVANCE requires a 32-bit CPU."
874-
#elif ENABLED(S_CURVE_ACCELERATION)
875-
#error "SMOOTH_LIN_ADVANCE is not compatible with S_CURVE_ACCELERATION."
876874
#elif ENABLED(INPUT_SHAPING_E_SYNC) && NONE(INPUT_SHAPING_X, INPUT_SHAPING_Y)
877875
#error "INPUT_SHAPING_E_SYNC requires INPUT_SHAPING_X or INPUT_SHAPING_Y."
878876
#endif

‎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 "2025-06-09"
45+
#define STRING_DISTRIBUTION_DATE "2025-06-10"
4646
#endif
4747

4848
/**

‎Marlin/src/lcd/extui/mks_ui/draw_about.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
4646

4747
void lv_draw_about() {
4848
scr = lv_screen_create(ABOUT_UI);
49-
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_A_RETURN);
49+
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_A_RETURN);
5050

5151
board = lv_label_create(scr, BOARD_INFO_NAME);
5252
lv_obj_align(board, nullptr, LV_ALIGN_CENTER, 0, -80);

‎Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -114,24 +114,24 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
114114

115115
void lv_draw_baby_stepping() {
116116
scr = lv_screen_create(BABYSTEP_UI);
117-
lv_big_button_create(scr, "F:/bmp_xAdd.bin", move_menu.x_add, INTERVAL_V, titleHeight, event_handler, ID_BABYSTEP_X_P);
118-
lv_big_button_create(scr, "F:/bmp_xDec.bin", move_menu.x_dec, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_X_N);
119-
lv_big_button_create(scr, "F:/bmp_yAdd.bin", move_menu.y_add, BTN_X_PIXEL + INTERVAL_V * 2, titleHeight, event_handler, ID_BABYSTEP_Y_P);
120-
lv_big_button_create(scr, "F:/bmp_yDec.bin", move_menu.y_dec, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_Y_N);
121-
lv_big_button_create(scr, "F:/bmp_zAdd.bin", move_menu.z_add, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_BABYSTEP_Z_P);
122-
lv_big_button_create(scr, "F:/bmp_zDec.bin", move_menu.z_dec, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_Z_N);
123-
buttonV = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_BABYSTEP_DIST);
117+
lv_big_button_create(scr, "F:/bmp_xAdd.bin", move_menu.x_add, INTERVAL_W, titleHeight, event_handler, ID_BABYSTEP_X_P);
118+
lv_big_button_create(scr, "F:/bmp_xDec.bin", move_menu.x_dec, INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_X_N);
119+
lv_big_button_create(scr, "F:/bmp_yAdd.bin", move_menu.y_add, BTN_SIZE_X + INTERVAL_W * 2, titleHeight, event_handler, ID_BABYSTEP_Y_P);
120+
lv_big_button_create(scr, "F:/bmp_yDec.bin", move_menu.y_dec, BTN_SIZE_X + INTERVAL_W * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_Y_N);
121+
lv_big_button_create(scr, "F:/bmp_zAdd.bin", move_menu.z_add, BTN_SIZE_X * 2 + INTERVAL_W * 3, titleHeight, event_handler, ID_BABYSTEP_Z_P);
122+
lv_big_button_create(scr, "F:/bmp_zDec.bin", move_menu.z_dec, BTN_SIZE_X * 2 + INTERVAL_W * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_Z_N);
123+
buttonV = lv_imgbtn_create(scr, nullptr, BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_BABYSTEP_DIST);
124124
labelV = lv_label_create_empty(buttonV);
125125
#if HAS_ROTARY_ENCODER
126126
if (gCfgItems.encoder_enable)
127127
lv_group_add_obj(g, buttonV);
128128
#endif
129129

130-
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_RETURN);
130+
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_BABYSTEP_RETURN);
131131

132132
disp_baby_step_dist();
133133

134-
zOffsetText = lv_label_create(scr, 290, TITLE_YPOS, nullptr);
134+
zOffsetText = lv_label_create(scr, 290, TITLE_POS_Y, nullptr);
135135
disp_z_offset_value();
136136
}
137137

‎Marlin/src/lcd/extui/mks_ui/draw_change_speed.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,19 @@ static void event_handler(lv_obj_t *obj, lv_event_t event) {
9393
void lv_draw_change_speed() {
9494
scr = lv_screen_create(CHANGE_SPEED_UI);
9595
// Create an Image button
96-
lv_big_button_create(scr, "F:/bmp_Add.bin", speed_menu.add, INTERVAL_V, titleHeight, event_handler, ID_C_ADD);
97-
lv_big_button_create(scr, "F:/bmp_Dec.bin", speed_menu.dec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_C_DEC);
98-
buttonMov = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_C_MOVE);
99-
buttonExt = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_C_EXT);
100-
buttonStep = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_C_STEP);
96+
lv_big_button_create(scr, "F:/bmp_Add.bin", speed_menu.add, INTERVAL_W, titleHeight, event_handler, ID_C_ADD);
97+
lv_big_button_create(scr, "F:/bmp_Dec.bin", speed_menu.dec, BTN_SIZE_X * 3 + INTERVAL_W * 4, titleHeight, event_handler, ID_C_DEC);
98+
buttonMov = lv_imgbtn_create(scr, nullptr, INTERVAL_W, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_C_MOVE);
99+
buttonExt = lv_imgbtn_create(scr, nullptr, BTN_SIZE_X + INTERVAL_W * 2, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_C_EXT);
100+
buttonStep = lv_imgbtn_create(scr, nullptr, BTN_SIZE_X * 2 + INTERVAL_W * 3, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_C_STEP);
101101
#if HAS_ROTARY_ENCODER
102102
if (gCfgItems.encoder_enable) {
103103
lv_group_add_obj(g, buttonMov);
104104
lv_group_add_obj(g, buttonExt);
105105
lv_group_add_obj(g, buttonStep);
106106
}
107107
#endif
108-
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_C_RETURN);
108+
lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_SIZE_X * 3 + INTERVAL_W * 4, BTN_SIZE_Y + INTERVAL_H + titleHeight, event_handler, ID_C_RETURN);
109109

110110
// Create labels on the image buttons
111111
labelMov = lv_label_create_empty(buttonMov);

0 commit comments

Comments
 (0)