From 1e50cc52979db4d1832100864a10df71ea9c0aa6 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 6 Jun 2019 09:13:06 +0200 Subject: [PATCH] Fix an issue in statistics display --- radio/src/gui/128x64/lcd.h | 1 - radio/src/gui/128x64/view_statistics.cpp | 6 +++--- radio/src/tests/arm_unsigned_128x64.png | Bin 328 -> 0 bytes radio/src/tests/lcd.cpp | 16 ---------------- 4 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 radio/src/tests/arm_unsigned_128x64.png diff --git a/radio/src/gui/128x64/lcd.h b/radio/src/gui/128x64/lcd.h index 6aca09933..9450a78d2 100644 --- a/radio/src/gui/128x64/lcd.h +++ b/radio/src/gui/128x64/lcd.h @@ -62,7 +62,6 @@ #define ZCHAR 0x80 /* lcd outdez flags */ -#define UNSIGN 0x08 #define LEADING0 0x10 #define PREC1 0x20 #define PREC2 0x30 diff --git a/radio/src/gui/128x64/view_statistics.cpp b/radio/src/gui/128x64/view_statistics.cpp index 17363de69..ad0e312ed 100644 --- a/radio/src/gui/128x64/view_statistics.cpp +++ b/radio/src/gui/128x64/view_statistics.cpp @@ -229,11 +229,11 @@ void menuStatisticsDebug(event_t event) lcdDrawText(lcdLastRightPos, MENU_DEBUG_Y_MIXMAX, "ms"); lcdDrawTextAlignedLeft(MENU_DEBUG_Y_RTOS, STR_FREESTACKMINB); - lcdDrawNumber(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_RTOS, menusStack.available(), UNSIGN|LEFT); + lcdDrawNumber(MENU_DEBUG_COL1_OFS, MENU_DEBUG_Y_RTOS, menusStack.available(), LEFT); lcdDrawText(lcdLastRightPos, MENU_DEBUG_Y_RTOS, "/"); - lcdDrawNumber(lcdLastRightPos+1, MENU_DEBUG_Y_RTOS, mixerStack.available(), UNSIGN|LEFT); + lcdDrawNumber(lcdLastRightPos+1, MENU_DEBUG_Y_RTOS, mixerStack.available(), LEFT); lcdDrawText(lcdLastRightPos, MENU_DEBUG_Y_RTOS, "/"); - lcdDrawNumber(lcdLastRightPos+1, MENU_DEBUG_Y_RTOS, audioStack.available(), UNSIGN|LEFT); + lcdDrawNumber(lcdLastRightPos+1, MENU_DEBUG_Y_RTOS, audioStack.available(), LEFT); lcdDrawText(4*FW, 7*FH+1, STR_MENUTORESET); lcdInvertLastLine(); diff --git a/radio/src/tests/arm_unsigned_128x64.png b/radio/src/tests/arm_unsigned_128x64.png deleted file mode 100644 index f5b91362afbb848570788d455d806b997c86bca2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!2~2@x4h5*Qk(@Ik;M!Q{D~mUxWayUCQ$H~ zr;B4q#hka-y!n_E1=t?S>z%r}VaCC7hsb!}alubj1B05P9`v1i8 zv@eZu_jlC)TW|aG{oYEePnsF+&q6o-dM)@ig<%F`0$YP5LmK@Vu?+6}gPeu9=S~EM O0)wZkpUXO@geCxglX6r5 diff --git a/radio/src/tests/lcd.cpp b/radio/src/tests/lcd.cpp index e31efdc87..8cacb0bbb 100644 --- a/radio/src/tests/lcd.cpp +++ b/radio/src/tests/lcd.cpp @@ -99,28 +99,12 @@ bool checkScreenshot(const QString & test) #if defined(COLORLCD) // TODO #else -#if defined(PCBTARANIS) && LCD_W >= 212 TEST(outdezNAtt, test_unsigned) { lcdClear(); lcdDrawNumber(0, 0, 65530, LEFT); EXPECT_TRUE(checkScreenshot("unsigned")) << "Unsigned numbers will be bad displayed"; } -#elif LCD_W <= 128 -TEST(outdezNAtt, test_unsigned) -{ - lcdClear(); - lcdDrawNumber(0, 0, 65530, LEFT|UNSIGN); - EXPECT_TRUE(checkScreenshot("arm_unsigned")) << "Unsigned numbers will be bad displayed"; -} -#else -TEST(outdezNAtt, test_unsigned) -{ - lcdClear(); - lcdDrawNumber(0, 0, 65530, LEFT|UNSIGN); - EXPECT_TRUE(checkScreenshot("unsigned")) << "Unsigned numbers will be bad displayed"; -} -#endif TEST(outdezNAtt, testBigNumbers) {