Victor Oliveira
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
44 additions and
29 deletions
-
Marlin/src/lcd/menu/menu_bed_leveling.cpp
-
Marlin/src/lcd/tft/ui_480x320.cpp
-
buildroot/tests/mks_robin_nano35-tests
|
|
@ -169,7 +169,9 @@ |
|
|
|
if (ui.should_draw()) { |
|
|
|
MenuItem_static::draw(1, GET_TEXT(MSG_LEVEL_BED_WAITING)); |
|
|
|
// Color UI needs a control to detect a touch
|
|
|
|
TERN_(HAS_GRAPHICAL_TFT, touch.add_control(CLICK, 0, 0, TFT_WIDTH, TFT_HEIGHT)); |
|
|
|
#if BOTH(TOUCH_SCREEN, HAS_GRAPHICAL_TFT) |
|
|
|
touch.add_control(CLICK, 0, 0, TFT_WIDTH, TFT_HEIGHT); |
|
|
|
#endif |
|
|
|
} |
|
|
|
if (ui.use_click()) { |
|
|
|
manual_probe_index = 0; |
|
|
|
|
|
@ -49,7 +49,9 @@ |
|
|
|
#error "Seriously? High resolution TFT screen without menu?" |
|
|
|
#endif |
|
|
|
|
|
|
|
#if ENABLED(TOUCH_SCREEN) |
|
|
|
static bool draw_menu_navigation = false; |
|
|
|
#endif |
|
|
|
|
|
|
|
void MarlinUI::tft_idle() { |
|
|
|
#if ENABLED(TOUCH_SCREEN) |
|
|
@ -897,6 +899,7 @@ static void z_minus() { |
|
|
|
moveAxis(Z_AXIS, -1); |
|
|
|
} |
|
|
|
|
|
|
|
#if ENABLED(TOUCH_SCREEN) |
|
|
|
static void e_select() { |
|
|
|
motionAxisState.e_selection++; |
|
|
|
if (motionAxisState.e_selection >= EXTRUDERS) { |
|
|
@ -926,6 +929,7 @@ static void step_size() { |
|
|
|
quick_feedback(); |
|
|
|
drawCurStepValue(); |
|
|
|
} |
|
|
|
#endif |
|
|
|
|
|
|
|
#if HAS_BED_PROBE |
|
|
|
static void z_select() { |
|
|
@ -1021,7 +1025,7 @@ void MarlinUI::move_axis_screen() { |
|
|
|
motionAxisState.zTypePos.x = x; |
|
|
|
motionAxisState.zTypePos.y = y; |
|
|
|
drawCurZSelection(); |
|
|
|
#if HAS_BED_PROBE |
|
|
|
#if BOTH(HAS_BED_PROBE, TOUCH_SCREEN) |
|
|
|
if (!busy) touch.add_control(BUTTON, x, y, BTN_WIDTH, 34 * 2, (intptr_t)z_select); |
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
@ -65,5 +65,14 @@ opt_set X_DRIVER_TYPE TMC2209 |
|
|
|
opt_set Y_DRIVER_TYPE TMC2209 |
|
|
|
exec_test $1 $2 "MKS Robin v2 nano LVGL SPI + TMC" "$3" |
|
|
|
|
|
|
|
# |
|
|
|
# MKS Robin v2 nano New Color UI 480x320 SPI Without Touch Screen |
|
|
|
# |
|
|
|
use_example_configs Mks/Robin |
|
|
|
opt_set MOTHERBOARD BOARD_MKS_ROBIN_NANO_V2 |
|
|
|
opt_disable TFT_INTERFACE_FSMC TFT_RES_320x240 TOUCH_SCREEN |
|
|
|
opt_enable TFT_INTERFACE_SPI TFT_RES_480x320 TFT_COLOR_UI |
|
|
|
exec_test $1 $2 "MKS Robin v2 nano New Color UI 480x320 SPI without TOUCH_SCREEN" |
|
|
|
|
|
|
|
# cleanup |
|
|
|
restore_configs |
|
|
|