diff --git a/radio/src/lcd_common.cpp b/radio/src/lcd_common.cpp index ad39b1d06..9d538fb7a 100644 --- a/radio/src/lcd_common.cpp +++ b/radio/src/lcd_common.cpp @@ -113,7 +113,7 @@ void lcdPutPattern(coord_t x, coord_t y, const uint8_t * pattern, uint8_t width, for (int8_t j=-1; j<=height; j++) { bool plot; - if (j < 0 || j == height) { + if (j < 0 || ((j == height) && !(FONTSIZE(flags) == SMLSIZE))) { plot = false; if (height >= 12) continue; if (j<0 && !inv) continue; diff --git a/radio/src/tests/dblsize_128x64.png b/radio/src/tests/dblsize_128x64.png index b18c73888..925840094 100644 Binary files a/radio/src/tests/dblsize_128x64.png and b/radio/src/tests/dblsize_128x64.png differ diff --git a/radio/src/tests/dblsize_212x64.png b/radio/src/tests/dblsize_212x64.png index 81f2271ba..fff9e7fc8 100644 Binary files a/radio/src/tests/dblsize_212x64.png and b/radio/src/tests/dblsize_212x64.png differ diff --git a/radio/src/tests/lcd.cpp b/radio/src/tests/lcd.cpp index 47131b578..9a8e67d74 100644 --- a/radio/src/tests/lcd.cpp +++ b/radio/src/tests/lcd.cpp @@ -210,6 +210,13 @@ TEST(Lcd, Smlsize) lcd_putsAtt(10, 22, "TESTgy,", SMLSIZE|INVERS); lcd_filled_rect(8, 40, 100, 20); lcd_putsAtt(10, 42, "TESTgy,", SMLSIZE); + + bool invert = false; + for(int i=0; i<3; i++) { + lcd_putsAtt(40+(4*i), 0+(4*i), "ABC", SMLSIZE|(invert?INVERS:0)); + invert = !invert; + } + EXPECT_TRUE(checkScreenshot("smlsize")); } @@ -220,6 +227,13 @@ TEST(Lcd, Stdsize) lcd_putsAtt(10, 22, "TEST", INVERS); lcd_filled_rect(8, 40, 100, 20); lcd_putsAtt(10, 42, "TEST", 0); + + bool invert = false; + for(int i=0; i<3; i++) { + lcd_putsAtt(40+(4*i), 0+(4*i), "ABC", (invert?INVERS:0)); + invert = !invert; + } + EXPECT_TRUE(checkScreenshot("stdsize")); } @@ -230,6 +244,13 @@ TEST(Lcd, Midsize) lcd_putsAtt(10, 22, "TEST", MIDSIZE|INVERS); lcd_filled_rect(8, 40, 100, 20); lcd_putsAtt(10, 42, "TEST", MIDSIZE); + + bool invert = false; + for(int i=0; i<3; i++) { + lcd_putsAtt(40+(4*i), 0+(4*i), "ABC", MIDSIZE|(invert?INVERS:0)); + invert = !invert; + } + EXPECT_TRUE(checkScreenshot("midsize")); } @@ -240,6 +261,13 @@ TEST(Lcd, Dblsize) lcd_putsAtt(42, 10, "TST", DBLSIZE|INVERS); lcd_filled_rect(80, 8, 46, 24); lcd_putsAtt(82, 10, "TST", DBLSIZE); + + bool invert = false; + for(int i=0; i<3; i++) { + lcd_putsAtt(10+(4*i), 30+(4*i), "ABC", DBLSIZE|(invert?INVERS:0)); + invert = !invert; + } + EXPECT_TRUE(checkScreenshot("dblsize")); } #endif diff --git a/radio/src/tests/midsize_128x64.png b/radio/src/tests/midsize_128x64.png index 316f7c0f9..213c92c4d 100644 Binary files a/radio/src/tests/midsize_128x64.png and b/radio/src/tests/midsize_128x64.png differ diff --git a/radio/src/tests/midsize_212x64.png b/radio/src/tests/midsize_212x64.png index e043e45ef..71da8b3ef 100644 Binary files a/radio/src/tests/midsize_212x64.png and b/radio/src/tests/midsize_212x64.png differ diff --git a/radio/src/tests/smlsize_128x64.png b/radio/src/tests/smlsize_128x64.png index 456ef0e94..47b9f207a 100644 Binary files a/radio/src/tests/smlsize_128x64.png and b/radio/src/tests/smlsize_128x64.png differ diff --git a/radio/src/tests/smlsize_212x64.png b/radio/src/tests/smlsize_212x64.png index aa8f7cb62..465d4fe5f 100644 Binary files a/radio/src/tests/smlsize_212x64.png and b/radio/src/tests/smlsize_212x64.png differ diff --git a/radio/src/tests/stdsize_128x64.png b/radio/src/tests/stdsize_128x64.png index f2ef3b6f3..c07424c5f 100644 Binary files a/radio/src/tests/stdsize_128x64.png and b/radio/src/tests/stdsize_128x64.png differ diff --git a/radio/src/tests/stdsize_212x64.png b/radio/src/tests/stdsize_212x64.png index 9b5894739..1275355cc 100644 Binary files a/radio/src/tests/stdsize_212x64.png and b/radio/src/tests/stdsize_212x64.png differ