From c2dffd2b249563fbab34ca07b7d6bc13d11140d2 Mon Sep 17 00:00:00 2001
From: floaledm <flomartel@gmail.com>
Date: Wed, 16 Mar 2016 20:22:31 +0000
Subject: [PATCH] Gtests on SmlsizeDecimalPoint

---
 radio/src/gui/9x/lcd.cpp                       |   4 ++--
 radio/src/gui/taranis/lcd.cpp                  |   2 +-
 radio/src/tests/SmlsizeDecimalPoint_128x64.png | Bin 0 -> 447 bytes
 radio/src/tests/SmlsizeDecimalPoint_212x64.png | Bin 0 -> 469 bytes
 radio/src/tests/lcd.cpp                        |  10 ++++++++++
 5 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 radio/src/tests/SmlsizeDecimalPoint_128x64.png
 create mode 100644 radio/src/tests/SmlsizeDecimalPoint_212x64.png

diff --git a/radio/src/gui/9x/lcd.cpp b/radio/src/gui/9x/lcd.cpp
index 0b83a84a7..ec0d97b75 100644
--- a/radio/src/gui/9x/lcd.cpp
+++ b/radio/src/gui/9x/lcd.cpp
@@ -441,9 +441,9 @@ void lcdDrawNumber(coord_t x, coord_t y, lcdint_t val, LcdFlags flags, uint8_t l
       }
       else if (smlsize) {
         x -= 2;
-        lcdDrawPoint(x+1, y+5);
+        lcdDrawPoint(x, y+5);
         if ((flags&INVERS) && ((~flags & BLINK) || BLINK_ON_PHASE)) {
-          lcdDrawSolidVerticalLine(x+1, y, 7);
+          lcdDrawSolidVerticalLine(x, y-1, 8);
         }
       }
       else if (tinsize) {
diff --git a/radio/src/gui/taranis/lcd.cpp b/radio/src/gui/taranis/lcd.cpp
index 6553310ad..bbea48118 100644
--- a/radio/src/gui/taranis/lcd.cpp
+++ b/radio/src/gui/taranis/lcd.cpp
@@ -407,7 +407,7 @@ void lcdDrawNumber(coord_t x, coord_t y, int32_t val, LcdFlags flags, uint8_t le
         x -= 2;
         lcdDrawPoint(x, y+5);
         if ((flags&INVERS) && ((~flags & BLINK) || BLINK_ON_PHASE)) {
-          lcdDrawSolidVerticalLine(x-1, y, 7);
+          lcdDrawSolidVerticalLine(x, y-1, 8);
         }
       }
       else if (tinsize) {
diff --git a/radio/src/tests/SmlsizeDecimalPoint_128x64.png b/radio/src/tests/SmlsizeDecimalPoint_128x64.png
new file mode 100644
index 0000000000000000000000000000000000000000..790e83f42732f77e9e8529bd61fb371083e8d4f1
GIT binary patch
literal 447
zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!2~2@x4h5*Qq09po*^6@9Je3(KLBz$3p^r=
z85p=bL736}<mt5x42(&hE{-7;bKc%@%sZ?g;1IZ>#{b+g-`xe>Zp~{Gu3wG+vfo!k
z#roo(mK4{wd&LXCJzlug%xlXvFHOTU8;cBXxEIbyUizm;kGI(0`|+a^@#p(A_=?vo
znRqNQFEw|^+O0pY&AKc5tnT%)&(pojmnP<EU;lBlK2R#{?cV;SKeQ)qTl;f*<nl)b
z>z9eo4@*B4b*t%1IS+#|!x;tx<^!~5Z20v+>U@RO*Eb2<-#h<a$EVk=y}xp1y(-WH
zQ@WWWzi%<o^D8fW*Zu5mqFkoTv#@Jzx2wyaM;4aP@P6L5Y%+uVe#@zuGra#d{du!r
zgLm_^?$0`xw>^EiQ2uOt^E^L&+pqaAvghTVi{In8(I8ABbPX^H7(8A5T-G@yGywoc
CfU{Tt

literal 0
HcmV?d00001

diff --git a/radio/src/tests/SmlsizeDecimalPoint_212x64.png b/radio/src/tests/SmlsizeDecimalPoint_212x64.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce13667dcfabcbe109963993e1647e4b2c21cb65
GIT binary patch
literal 469
zcmeAS@N?(olHy`uVBq!ia0vp^SAf`og9%8!^*$#Bq?n7HJVQ7*IBq}me*oli7I;J!
zGca&>f-s}`$<u2Y7#J%&T^vIy=DfY@nAdC|;u<Kt(SQ9}>$eP|k@tO_E`{V@C|2vx
zf9SK$AmxzRv5W~D<lFE4j!b;NcdMCur4L`y(?-iB#h3PN)>M3(S`rr%c2UOvtm53s
zlP=3#S{uu~`ujdT-p%38x8kEp_O3iss=DO%)a*N-e{=|4GCOAB{y8}D=Bn%41vH*b
zcsJE}eqNQ*(@Wd9>m6&3bo5Jn6jZiLI^y2*qeD>M@R70`eFSeyU;kle;`+1huj}u^
z9p5+puKYB6{=@k*oUPPzf8O|Oc=Pm&Jv-JcvYZ#S{fOyu%O%mf#jZ&l&O4pFzHQ6?
zEibBqTVH#5Outul7vjnOXUh+53cX*Q)3UAQV)g%xbBbQA7qfe?w|%4jC8v!B9@{5w
Q21X2nr>mdKI;Vst0Q6_numAu6

literal 0
HcmV?d00001

diff --git a/radio/src/tests/lcd.cpp b/radio/src/tests/lcd.cpp
index 1f27bad18..926fe07f6 100644
--- a/radio/src/tests/lcd.cpp
+++ b/radio/src/tests/lcd.cpp
@@ -194,6 +194,16 @@ TEST(Lcd, vline_x_lt0)
 #endif
 
 #if defined(CPUARM)
+TEST(Lcd, SmlsizeDecimalPoint)
+{
+  lcdClear();
+  lcdDrawNumber(0, 1, 105, PREC1|SMLSIZE|LEFT);
+  lcdDrawNumber(0, LCD_H-7, 105, PREC1|SMLSIZE|LEFT|INVERS);
+  lcdDrawNumber(LCD_W, 1, 105, PREC2|SMLSIZE);
+  lcdDrawNumber(LCD_W, LCD_H-7, 105, PREC2|SMLSIZE|INVERS);
+  EXPECT_TRUE(checkScreenshot("SmlsizeDecimalPoint"));
+}
+
 TEST(Lcd, Smlsize)
 {
   lcdClear();