Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid sanity error about status logo on TFT UI switch #20588

Merged
merged 3 commits into from
Dec 29, 2020
Merged

Avoid sanity error about status logo on TFT UI switch #20588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b3f2d6
Avoid sanity error about status logo on TFT UI switch
tpruvot Dec 28, 2020
2cf2f19
Update STM32F103VE_longer-tests
thinkyhead Dec 29, 2020
093d9c1
Update SanityCheck.h
thinkyhead Dec 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/inc/SanityCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
#error "SHOW_CUSTOM_BOOTSCREEN requires Graphical LCD or TOUCH_UI_FTDI_EVE."
#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

/**
Expand Down
12 changes: 11 additions & 1 deletion buildroot/tests/STM32F103VE_longer-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,17 @@ set -e

use_example_configs Alfawise/U20
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
restore_configs