From 5db98a3fef2e016c464003f8ebee76506ca2c109 Mon Sep 17 00:00:00 2001 From: bsongis Date: Tue, 15 Jul 2014 23:03:38 +0200 Subject: [PATCH] SMLSIZE last row missing --- radio/src/lcd_common.cpp | 2 +- radio/src/tests/lcd.cpp | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/radio/src/lcd_common.cpp b/radio/src/lcd_common.cpp index 2580759c6..7d0bcf82a 100644 --- a/radio/src/lcd_common.cpp +++ b/radio/src/lcd_common.cpp @@ -178,7 +178,7 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags) } else if (flags & SMLSIZE) { q = (c < 0xc0 ? &font_4x6[(c-0x20)*5] : &font_4x6_extra[(c-0xc0)*5]); - lcdPutPattern(x, y, q, 5, 6, flags); + lcdPutPattern(x, y, q, 5, 7, flags); } else if (flags & TINSIZE) { q = &font_3x5[((uint16_t)c-0x2d)*3]; diff --git a/radio/src/tests/lcd.cpp b/radio/src/tests/lcd.cpp index 723afd9ea..8c6e80320 100644 --- a/radio/src/tests/lcd.cpp +++ b/radio/src/tests/lcd.cpp @@ -192,6 +192,17 @@ TEST(Lcd, vline) EXPECT_TRUE(checkScreenshot("vline")); } +#if defined(CPUARM) +TEST(Lcd, Smlsize) +{ + lcd_clear(); + lcd_putsAtt(0, 0, "TESTgy,", SMLSIZE); + lcd_putsAtt(10, 22, "TESTgy,", SMLSIZE|INVERS); + lcd_filled_rect(8, 40, 100, 20); + lcd_putsAtt(10, 42, "TESTgy,", SMLSIZE); + EXPECT_TRUE(checkScreenshot("smlsize")); +} + TEST(Lcd, Stdsize) { lcd_clear(); @@ -202,7 +213,6 @@ TEST(Lcd, Stdsize) EXPECT_TRUE(checkScreenshot("stdsize")); } -#if defined(CPUARM) TEST(Lcd, Midsize) { lcd_clear();