Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Fix an issue in statistics display

Browse source
This commit is contained in:
Bertrand Songis 2019-06-06 09:13:06 +02:00
parent fdb2feb4fc
commit 1e50cc5297
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
4 changed files with 3 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
radio/src/gui/128x64/lcd.h
View file

@ -62,7 +62,6 @@
#define ZCHAR 0x80 #define ZCHAR 0x80
/* lcd outdez flags */ /* lcd outdez flags */
#define UNSIGN 0x08
#define LEADING0 0x10 #define LEADING0 0x10
#define PREC1 0x20 #define PREC1 0x20
#define PREC2 0x30 #define PREC2 0x30

6
radio/src/gui/128x64/view_statistics.cpp
View file

@ -229,11 +229,11 @@ void menuStatisticsDebug(event_t event)
lcdDrawText(lcdLastRightPos, MENU_DEBUG_Y_MIXMAX, "ms"); lcdDrawText(lcdLastRightPos, MENU_DEBUG_Y_MIXMAX, "ms");
lcdDrawTextAlignedLeft(MENU_DEBUG_Y_RTOS, STR_FREESTACKMINB); 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, "/"); 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, "/"); 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); lcdDrawText(4*FW, 7*FH+1, STR_MENUTORESET);
lcdInvertLastLine(); lcdInvertLastLine();

BIN
radio/src/tests/arm_unsigned_128x64.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 328 B

16
radio/src/tests/lcd.cpp
View file

@ -99,28 +99,12 @@ bool checkScreenshot(const QString & test)
#if defined(COLORLCD) #if defined(COLORLCD)
// TODO // TODO
#else #else
#if defined(PCBTARANIS) && LCD_W >= 212
TEST(outdezNAtt, test_unsigned) TEST(outdezNAtt, test_unsigned)
{ {
lcdClear(); lcdClear();
lcdDrawNumber(0, 0, 65530, LEFT); lcdDrawNumber(0, 0, 65530, LEFT);
EXPECT_TRUE(checkScreenshot("unsigned")) << "Unsigned numbers will be bad displayed"; 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) TEST(outdezNAtt, testBigNumbers)
{ {