0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Clarify sanity-check for custom status bitmap (#20588)

Browse source
This commit is contained in:
Tanguy Pruvot 2020-12-29 05:13:56 +01:00 committed by GitHub
parent 90a2b482e6
commit 624bf10ab5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -721,7 +721,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#if ENABLED(SHOW_CUSTOM_BOOTSCREEN) && NONE(HAS_MARLINUI_U8GLIB, TOUCH_UI_FTDI_EVE) #if ENABLED(SHOW_CUSTOM_BOOTSCREEN) && NONE(HAS_MARLINUI_U8GLIB, TOUCH_UI_FTDI_EVE)
#error "SHOW_CUSTOM_BOOTSCREEN requires Graphical LCD or TOUCH_UI_FTDI_EVE." #error "SHOW_CUSTOM_BOOTSCREEN requires Graphical LCD or TOUCH_UI_FTDI_EVE."
#elif ENABLED(CUSTOM_STATUS_SCREEN_IMAGE) && !HAS_MARLINUI_U8GLIB #elif ENABLED(CUSTOM_STATUS_SCREEN_IMAGE) && !HAS_MARLINUI_U8GLIB
#error "CUSTOM_STATUS_SCREEN_IMAGE requires a Graphical LCD." #error "CUSTOM_STATUS_SCREEN_IMAGE requires a 128x64 DOGM B/W Graphical LCD."
#endif #endif
/** /**

12
buildroot/tests/STM32F103VE_longer-tests
View file

@ -8,7 +8,17 @@ set -e
use_example_configs Alfawise/U20 use_example_configs Alfawise/U20
opt_enable BAUD_RATE_GCODE opt_enable BAUD_RATE_GCODE
exec_test $1 $2 "Full-featured U20 config" "$3" exec_test $1 $2 "CLASSIC_UI U20 config" "$3"
use_example_configs Alfawise/U20
opt_enable BAUD_RATE_GCODE
opt_enable TFT_COLOR_UI
opt_disable TFT_CLASSIC_UI
exec_test $1 $2 "COLOR_UI U20 config" "$3"
use_example_configs Alfawise/U20-bltouch
opt_enable BAUD_RATE_GCODE
exec_test $1 $2 "BLTouch U20 config"
# cleanup # cleanup
restore_configs restore_configs