From ed094f89e86e4b4d72f040d639db1c2a4d3d9abe Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sun, 6 Jul 2014 08:49:35 +0200 Subject: [PATCH 1/4] Fixes #1458 - Incorrect display of free mem on statistics page lcd_outdezNAtt() on ARM was casting values to uint16_t. --- radio/src/lcd_common.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/lcd_common.cpp b/radio/src/lcd_common.cpp index 883c9be5d..0950d9863 100644 --- a/radio/src/lcd_common.cpp +++ b/radio/src/lcd_common.cpp @@ -324,13 +324,13 @@ void lcd_outdezNAtt(xcoord_t x, uint8_t y, lcdint_t val, LcdFlags flags, uint8_t if (dblsize) x++; for (uint8_t i=1; i<=len; i++) { - div_t qr = div((uint16_t)val, 10); + div_t qr = div(val, 10); char c = qr.rem + '0'; LcdFlags f = flags; #if !defined(PCBTARANIS) if (dblsize) { if (c=='1' && i==len && xn>x+10) { x+=1; } - if ((uint16_t)val >= 1000) { x+=FWNUM; f&=~DBLSIZE; } + if (val >= 1000) { x+=FWNUM; f&=~DBLSIZE; } } #endif lcd_putcAtt(x, y, c, f); @@ -379,7 +379,7 @@ void lcd_outdezNAtt(xcoord_t x, uint8_t y, lcdint_t val, LcdFlags flags, uint8_t } } #if !defined(PCBTARANIS) - if (dblsize && (uint16_t)val >= 1000 && (uint16_t)val < 10000) x-=2; + if (dblsize && val >= 1000 && val < 10000) x-=2; #endif val = qr.quot; x -= fw; From 7130e48089c91c21661bd72ea15b3e8822c0874f Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sun, 6 Jul 2014 09:11:29 +0200 Subject: [PATCH 2/4] Re #1458 - the cast is back, but cast to different type depending on platform. Gtest modernized. --- radio/src/lcd.h | 2 ++ radio/src/lcd_common.cpp | 12 ++++-------- radio/src/tests/gtests.cpp | 16 ++++------------ 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/radio/src/lcd.h b/radio/src/lcd.h index 56aed713b..4ad6ee64b 100644 --- a/radio/src/lcd.h +++ b/radio/src/lcd.h @@ -57,8 +57,10 @@ #if defined(CPUARM) #define lcdint_t int32_t + #define lcduint_t uint32_t #else #define lcdint_t int16_t + #define lcduint_t uint16_t #endif #define FW 6 diff --git a/radio/src/lcd_common.cpp b/radio/src/lcd_common.cpp index 0950d9863..00df912c4 100644 --- a/radio/src/lcd_common.cpp +++ b/radio/src/lcd_common.cpp @@ -276,11 +276,7 @@ void lcd_outdezNAtt(xcoord_t x, uint8_t y, lcdint_t val, LcdFlags flags, uint8_t if (mode != MODE(LEADING0)) { len = 1; -#if defined(CPUARM) - uint32_t tmp = ((uint32_t)val) / 10; -#else - uint16_t tmp = ((uint16_t)val) / 10; -#endif + lcduint_t tmp = ((lcduint_t)val) / 10; while (tmp) { len++; 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++; 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'; LcdFlags f = flags; #if !defined(PCBTARANIS) if (dblsize) { 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 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 (dblsize && val >= 1000 && val < 10000) x-=2; + if (dblsize && (lcduint_t)val >= 1000 && (lcduint_t)val < 10000) x-=2; #endif val = qr.quot; x -= fw; diff --git a/radio/src/tests/gtests.cpp b/radio/src/tests/gtests.cpp index 7bb96c687..07edfe391 100644 --- a/radio/src/tests/gtests.cpp +++ b/radio/src/tests/gtests.cpp @@ -47,6 +47,8 @@ #define CHANNEL_MAX (1024*256) void doMixerCalculations(); +bool checkScreenshot(QString test); + #define MODEL_RESET() \ memset(&g_model, 0, sizeof(g_model)); \ @@ -136,19 +138,9 @@ TEST(Trims, CopySticksToOffset) TEST(outdezNAtt, test_unsigned) { - uint8_t refBuf[sizeof(displayBuf)]; - 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_clear(); lcd_outdezNAtt(0, 0, 65530, LEFT|UNSIGN); - - EXPECT_EQ(memcmp(refBuf, displayBuf, sizeof(displayBuf)), 0) << "Unsigned numbers will be bad displayed"; + EXPECT_TRUE(checkScreenshot("unsigned")) << "Unsigned numbers will be bad displayed"; } #if !defined(PCBSKY9X) From f4fdc233c09b311886ac279340163d0d934e5a88 Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sun, 6 Jul 2014 09:14:20 +0200 Subject: [PATCH 3/4] Re #1458 - Forgoten files for new gtest --- radio/src/tests/unsigned_128x64.png | Bin 0 -> 355 bytes radio/src/tests/unsigned_212x64.png | Bin 0 -> 377 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 radio/src/tests/unsigned_128x64.png create mode 100644 radio/src/tests/unsigned_212x64.png diff --git a/radio/src/tests/unsigned_128x64.png b/radio/src/tests/unsigned_128x64.png new file mode 100644 index 0000000000000000000000000000000000000000..af38ca1344266494170d53e2a54c3cbced6f2d92 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!2~2@x4h5*Qq09po*^6@9Je3(KLBz$3p^r= z85p=bL736}$}UY}%lZFof2dE) zS#i(PXYN(Iq@=m@JWs5%(m(!eXT4r&cz5cT@^EdgE`xnH{+MIk< o+oL{>VFqIYTZ1IS05EJB!xN)4+|HbB2L=;^r>mdKI;Vst09y@s{Qv*} literal 0 HcmV?d00001 diff --git a/radio/src/tests/unsigned_212x64.png b/radio/src/tests/unsigned_212x64.png new file mode 100644 index 0000000000000000000000000000000000000000..f747a08e1b2e241bb5b023369577e284ab005fae GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^SAf`og9%8!^*$#Bq?n7HJVQ7*IBq}me*oli7I;J! zGca&>f-s}`$^Z3mgR7njt#b0mF uPh1~cmw%ae>epMX^~!cekCX=mF<)szl!o(MF)d)=F?hQAxvX0a literal 0 HcmV?d00001 From 88bb28e3f170f6e4d6d41af78fd385602238df26 Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sun, 6 Jul 2014 09:25:38 +0200 Subject: [PATCH 4/4] Re #1458 - added gtest for big numbers (>uint16_t) --- radio/src/tests/big_numbers_128x64.png | Bin 0 -> 422 bytes radio/src/tests/big_numbers_212x64.png | Bin 0 -> 448 bytes radio/src/tests/gtests.cpp | 10 ++++++++++ 3 files changed, 10 insertions(+) create mode 100644 radio/src/tests/big_numbers_128x64.png create mode 100644 radio/src/tests/big_numbers_212x64.png diff --git a/radio/src/tests/big_numbers_128x64.png b/radio/src/tests/big_numbers_128x64.png new file mode 100644 index 0000000000000000000000000000000000000000..d10e2519c2894936c5fcf076d89dad9ea6971cd2 GIT binary patch literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!2~2@x4h5*Qq09po*^6@9Je3(KLBz$3p^r= z85p=bL736}}ysKakzN>SnV#eGAsEdA|F@g231`?V;kQ! zt7L~;TePOC(zVjH>|ZUEZdJ(Ugx|JZI;E_1M}0-v{~fbbw;5mcy3)MwRKSW?>EE8* z+*yA_fA{e+A^rHP`&?}Ap3jeRU8yQ-`%`J@)?elJvezf7I9Q!NEF$k|{qjhyh5h{9 zpDyIh`*HbS`*Wo|^~ZnzFTSMpwymnv;;MF@pV;fSt~>a4>He5fBlxcWu9%Oh-l2!v z9_%)=ezG-E!%!(hyChQWZ= bj5qw;ZvPKhzSw#R7}5-$u6{1-oD!M<3CyC6 literal 0 HcmV?d00001 diff --git a/radio/src/tests/big_numbers_212x64.png b/radio/src/tests/big_numbers_212x64.png new file mode 100644 index 0000000000000000000000000000000000000000..0fcbc72536a64399515a8ee0096d367eab886916 GIT binary patch literal 448 zcmeAS@N?(olHy`uVBq!ia0vp^SAf`og9%8!^*$#Bq?n7HJVQ7*IBq}me*oli7I;J! zGca&>f-s}`$wuy2sV8)GRqv z{QbMX%0FhmduqC1yZ4od#N9UAw(1C}^*?=cG`u46)sAPn&mU$8-ruxAbG`9tx5Srr zvGL`>_Fvo0|C#*Ty`J}YVXpM|&8L-qGrxUT!g)QeY)>7Uu-){GY{vREJ w@`jI;-D-|>^hq=by85}Sb4q9e0K=-pM*si- literal 0 HcmV?d00001 diff --git a/radio/src/tests/gtests.cpp b/radio/src/tests/gtests.cpp index 07edfe391..9f3757c17 100644 --- a/radio/src/tests/gtests.cpp +++ b/radio/src/tests/gtests.cpp @@ -143,6 +143,16 @@ TEST(outdezNAtt, test_unsigned) EXPECT_TRUE(checkScreenshot("unsigned")) << "Unsigned numbers will be bad displayed"; } +#if defined(CPUARM) +TEST(outdezNAtt, testBigNumbers) +{ + lcd_clear(); + lcd_outdezNAtt(0, 0, 1234567, LEFT); + lcd_outdezNAtt(0, FH, -1234567, LEFT); + EXPECT_TRUE(checkScreenshot("big_numbers")); +} +#endif // #if defined(CPUARM) + #if !defined(PCBSKY9X) TEST(EEPROM, 100_random_writes) {