Skip to content

Fix displayio when CIRCUITPY_REPL_LOGO is disabled #8300

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

Merged
merged 2 commits into from
Aug 20, 2023
Merged

Fix displayio when CIRCUITPY_REPL_LOGO is disabled #8300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b50a7fb
Fix displayio when CIRCUITPY_REPL_LOGO is disabled
deshipu Aug 19, 2023
b93b1d0
Fix the SRC_SUPERVISOR setting check
deshipu Aug 19, 2023
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
6 changes: 2 additions & 4 deletions supervisor/shared/display.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,8 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
status_bar->full_change = true;

scroll_area->width_in_tiles = width_in_tiles;
scroll_area->height_in_tiles = height_in_tiles;
#if CIRCUITPY_REPL_LOGO
scroll_area->height_in_tiles -= 1;
#endif
// Leave space for the status bar, no matter if we have logo or not.
scroll_area->height_in_tiles = height_in_tiles - 1;
scroll_area->pixel_width = scroll_area->width_in_tiles * scroll_area->tile_width;
scroll_area->pixel_height = scroll_area->height_in_tiles * scroll_area->tile_height;
// Right align the scroll area to give margin to the start of each line.
Expand Down
2 changes: 1 addition & 1 deletion tools/ci_set_matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def get_settings(board):
# Check supervisor files
# This is useful for limiting workflow changes to the relevant boards
if file.startswith("supervisor"):
if file in settings["SRC_SUPERVISOR"]:
if file in settings.get("SRC_SUPERVISOR", ""):
boards_to_build.add(board)
continue

Expand Down