mirror of
https://github.com/opentx/opentx.git
synced 2025-07-21 23:35:17 +03:00
Re #1458 - the cast is back, but cast to different type depending on platform. Gtest modernized.
This commit is contained in:
parent
ed094f89e8
commit
7130e48089
3 changed files with 10 additions and 20 deletions
|
@ -57,8 +57,10 @@
|
||||||
|
|
||||||
#if defined(CPUARM)
|
#if defined(CPUARM)
|
||||||
#define lcdint_t int32_t
|
#define lcdint_t int32_t
|
||||||
|
#define lcduint_t uint32_t
|
||||||
#else
|
#else
|
||||||
#define lcdint_t int16_t
|
#define lcdint_t int16_t
|
||||||
|
#define lcduint_t uint16_t
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define FW 6
|
#define FW 6
|
||||||
|
|
|
@ -276,11 +276,7 @@ void lcd_outdezNAtt(xcoord_t x, uint8_t y, lcdint_t val, LcdFlags flags, uint8_t
|
||||||
|
|
||||||
if (mode != MODE(LEADING0)) {
|
if (mode != MODE(LEADING0)) {
|
||||||
len = 1;
|
len = 1;
|
||||||
#if defined(CPUARM)
|
lcduint_t tmp = ((lcduint_t)val) / 10;
|
||||||
uint32_t tmp = ((uint32_t)val) / 10;
|
|
||||||
#else
|
|
||||||
uint16_t tmp = ((uint16_t)val) / 10;
|
|
||||||
#endif
|
|
||||||
while (tmp) {
|
while (tmp) {
|
||||||
len++;
|
len++;
|
||||||
tmp /= 10;
|
tmp /= 10;
|
||||||
|
@ -324,13 +320,13 @@ void lcd_outdezNAtt(xcoord_t x, uint8_t y, lcdint_t val, LcdFlags flags, uint8_t
|
||||||
if (dblsize) x++;
|
if (dblsize) x++;
|
||||||
|
|
||||||
for (uint8_t i=1; i<=len; i++) {
|
for (uint8_t i=1; i<=len; i++) {
|
||||||
div_t qr = div(val, 10);
|
div_t qr = div((lcduint_t)val, 10);
|
||||||
char c = qr.rem + '0';
|
char c = qr.rem + '0';
|
||||||
LcdFlags f = flags;
|
LcdFlags f = flags;
|
||||||
#if !defined(PCBTARANIS)
|
#if !defined(PCBTARANIS)
|
||||||
if (dblsize) {
|
if (dblsize) {
|
||||||
if (c=='1' && i==len && xn>x+10) { x+=1; }
|
if (c=='1' && i==len && xn>x+10) { x+=1; }
|
||||||
if (val >= 1000) { x+=FWNUM; f&=~DBLSIZE; }
|
if ((lcduint_t)val >= 1000) { x+=FWNUM; f&=~DBLSIZE; }
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
lcd_putcAtt(x, y, c, f);
|
lcd_putcAtt(x, y, c, f);
|
||||||
|
@ -379,7 +375,7 @@ void lcd_outdezNAtt(xcoord_t x, uint8_t y, lcdint_t val, LcdFlags flags, uint8_t
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#if !defined(PCBTARANIS)
|
#if !defined(PCBTARANIS)
|
||||||
if (dblsize && val >= 1000 && val < 10000) x-=2;
|
if (dblsize && (lcduint_t)val >= 1000 && (lcduint_t)val < 10000) x-=2;
|
||||||
#endif
|
#endif
|
||||||
val = qr.quot;
|
val = qr.quot;
|
||||||
x -= fw;
|
x -= fw;
|
||||||
|
|
|
@ -47,6 +47,8 @@
|
||||||
#define CHANNEL_MAX (1024*256)
|
#define CHANNEL_MAX (1024*256)
|
||||||
|
|
||||||
void doMixerCalculations();
|
void doMixerCalculations();
|
||||||
|
bool checkScreenshot(QString test);
|
||||||
|
|
||||||
|
|
||||||
#define MODEL_RESET() \
|
#define MODEL_RESET() \
|
||||||
memset(&g_model, 0, sizeof(g_model)); \
|
memset(&g_model, 0, sizeof(g_model)); \
|
||||||
|
@ -136,19 +138,9 @@ TEST(Trims, CopySticksToOffset)
|
||||||
|
|
||||||
TEST(outdezNAtt, test_unsigned)
|
TEST(outdezNAtt, test_unsigned)
|
||||||
{
|
{
|
||||||
uint8_t refBuf[sizeof(displayBuf)];
|
lcd_clear();
|
||||||
memset(displayBuf, 0, sizeof(displayBuf));
|
|
||||||
lcd_putc(0*FWNUM, 0, '6');
|
|
||||||
lcd_putc(1*FWNUM, 0, '5');
|
|
||||||
lcd_putc(2*FWNUM, 0, '5');
|
|
||||||
lcd_putc(3*FWNUM, 0, '3');
|
|
||||||
lcd_putc(4*FWNUM, 0, '0');
|
|
||||||
memcpy(refBuf, displayBuf, sizeof(displayBuf));
|
|
||||||
|
|
||||||
memset(displayBuf, 0, sizeof(displayBuf));
|
|
||||||
lcd_outdezNAtt(0, 0, 65530, LEFT|UNSIGN);
|
lcd_outdezNAtt(0, 0, 65530, LEFT|UNSIGN);
|
||||||
|
EXPECT_TRUE(checkScreenshot("unsigned")) << "Unsigned numbers will be bad displayed";
|
||||||
EXPECT_EQ(memcmp(refBuf, displayBuf, sizeof(displayBuf)), 0) << "Unsigned numbers will be bad displayed";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(PCBSKY9X)
|
#if !defined(PCBSKY9X)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue