Skip to content

Develop 3 #46

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
H4W9 merged 2 commits into from
Aug 30, 2026
Merged

Develop 3 #46

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
79c0456
Reduce V8 boot logo size by half
justcallmekoko Aug 29, 2026
4c65a2b
Merge pull request #1521 from justcallmekoko/feature/jcmk-boot-splash
justcallmekoko Aug 29, 2026
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
4 changes: 4 additions & 0 deletions esp32_marauder/BootSplash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ BootSplashLayout bootSplashLayout(int16_t screen_width,
layout.logo_height = available_height < height_from_width
? available_height : height_from_width;
if (layout.logo_height < 24) layout.logo_height = 24;
if (v8_portrait) {
layout.logo_height /= 2;
layout.logo_y += (available_height - layout.logo_height) / 2;
}
layout.logo_width = layout.logo_height * 240 / 316;
layout.logo_x = (screen_width - layout.logo_width) / 2;
return layout;
Expand Down
10 changes: 7 additions & 3 deletions test/test_boot_splash/test_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,18 @@ void test_layout_fits_mini_v3() {
TEST_ASSERT_EQUAL_UINT8(1, layout.text_size);
}

void test_layout_fits_v8_and_uses_more_logo_area() {
void test_layout_fits_v8_with_half_size_logo() {
const marauder::BootSplashLayout mini =
marauder::bootSplashLayout(128, 128);
const marauder::BootSplashLayout v8 =
marauder::bootSplashLayout(240, 320);
assertLayoutFits(240, 320);
TEST_ASSERT_EQUAL_UINT8(1, v8.text_size);
TEST_ASSERT_GREATER_THAN_INT16(mini.logo_height * 2, v8.logo_height);
TEST_ASSERT_EQUAL_INT16(79, v8.logo_x);
TEST_ASSERT_EQUAL_INT16(101, v8.logo_y);
TEST_ASSERT_EQUAL_INT16(81, v8.logo_width);
TEST_ASSERT_EQUAL_INT16(107, v8.logo_height);
TEST_ASSERT_GREATER_THAN_INT16(mini.logo_height, v8.logo_height);
}

void test_layout_fits_landscape_and_square_displays() {
Expand All @@ -44,7 +48,7 @@ void test_layout_fits_landscape_and_square_displays() {
int main() {
UNITY_BEGIN();
RUN_TEST(test_layout_fits_mini_v3);
RUN_TEST(test_layout_fits_v8_and_uses_more_logo_area);
RUN_TEST(test_layout_fits_v8_with_half_size_logo);
RUN_TEST(test_layout_fits_landscape_and_square_displays);
return UNITY_END();
}
Loading