From f131119ca1041770d0558e3020b1dd0d45525390 Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Fri, 23 Jan 2015 18:12:33 +0100
Subject: [PATCH] Fixes #2034: ldc_line() was wrong for slanted lines

---
 radio/src/gui/Taranis/lcd.cpp       |  12 ++++++------
 radio/src/tests/lcd.cpp             |  27 +++++++++++++++++++++++++++
 radio/src/tests/lcd_line_212x64.png | Bin 454 -> 1061 bytes
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/radio/src/gui/Taranis/lcd.cpp b/radio/src/gui/Taranis/lcd.cpp
index fb2c2289d..deb71aac6 100755
--- a/radio/src/gui/Taranis/lcd.cpp
+++ b/radio/src/gui/Taranis/lcd.cpp
@@ -490,28 +490,28 @@ void lcd_line(coord_t x1, coord_t y1, coord_t x2, coord_t y2, uint8_t pat, LcdFl
   if (dxabs >= dyabs) {
     /* the line is more horizontal than vertical */
     for (int i=0; i<=dxabs; i++) {
+      if ((1<<(px%8)) & pat) {
+        lcd_plot(px, py, att);
+      }
       y += dyabs;
       if (y>=dxabs) {
         y -= dxabs;
         py += sdy;
       }
-      if ((1<<(px%8)) & pat) {
-        lcd_plot(px, py, att);
-      }
       px += sdx;
     }
   }
   else {
     /* the line is more vertical than horizontal */
     for (int i=0; i<=dyabs; i++) {
+      if ((1<<(py%8)) & pat) {
+        lcd_plot(px, py, att);
+      }
       x += dxabs;
       if (x >= dyabs) {
         x -= dyabs;
         px += sdx;
       }
-      if ((1<<(py%8)) & pat) {
-        lcd_plot(px, py, att);
-      }
       py += sdy;
     }
   }
diff --git a/radio/src/tests/lcd.cpp b/radio/src/tests/lcd.cpp
index d95cb054d..60a8f00b0 100644
--- a/radio/src/tests/lcd.cpp
+++ b/radio/src/tests/lcd.cpp
@@ -438,6 +438,33 @@ TEST(Lcd, lcd_line)
   lcd_line(start+(length>0?1:-1)+xOffset, start, start+(length>0?1:-1)+xOffset+length, start, pattern, 0);
   lcd_line(start+xOffset, start+(length>0?1:-1), start+xOffset, start+(length>0?1:-1)+length, pattern, 0);
 
+  // 45 deg lines
+  lcd_line( 35, 40, 45, 40, SOLID, FORCE );
+  lcd_line( 40, 35, 40, 45, SOLID, FORCE );
+
+  lcd_line( 20, 40, 40, 20, SOLID, FORCE );
+  lcd_line( 40, 20, 60, 40, SOLID, FORCE );
+  lcd_line( 60, 40, 40, 60, SOLID, FORCE );
+  lcd_line( 40, 60, 20, 40, SOLID, FORCE );
+
+  lcd_line( 31, 39, 39, 31, SOLID, FORCE );
+  lcd_line( 41, 31, 49, 39, SOLID, FORCE );
+  lcd_line( 49, 41, 41, 49, SOLID, FORCE );
+  lcd_line( 39, 49, 31, 41, SOLID, FORCE );
+
+  // slanted lines
+  lcd_line( 150, 10, 190, 10, SOLID, FORCE );
+  lcd_line( 150, 10, 190, 20, SOLID, FORCE );
+  lcd_line( 150, 10, 190, 30, SOLID, FORCE );
+  lcd_line( 150, 10, 190, 40, SOLID, FORCE );
+  lcd_line( 150, 10, 190, 50, SOLID, FORCE );
+
+  lcd_line( 150, 10, 190, 50, SOLID, FORCE );
+  lcd_line( 150, 10, 180, 50, SOLID, FORCE );
+  lcd_line( 150, 10, 170, 50, SOLID, FORCE );
+  lcd_line( 150, 10, 160, 50, SOLID, FORCE );
+  lcd_line( 150, 10, 150, 50, SOLID, FORCE );
+
   EXPECT_TRUE(checkScreenshot("lcd_line"));
 }
 #endif
diff --git a/radio/src/tests/lcd_line_212x64.png b/radio/src/tests/lcd_line_212x64.png
index b1411f6aaae9acd35c5faf0639b0fa80857181a1..89b45d8d10706caab71a210bd46d0e5fd0fd370b 100644
GIT binary patch
delta 1004
zcmV<I0~7ql1EmO%M}GszNkl<Zc%1E>NshxH5JfAkzNgQYoAv?;(SR9iz^?xmQRD%e
z@=IYLmOtO`mjJNf$NB_-Umzba1M&egARjQ}w_J2xm;QMK(ED*kF5h)sFaYR)W*3+N
z`G6Ua513KuaFm1_LH$qZ%AdndeV^Mw{ABxkyXr5Xl<z55uz%C+8vd$W!5HVzZbZ0>
zm7vq?KIJ#`bQt3tgo_2H{+)I;JMy6w)**}YX4pgW3tzHg(`}Z^=K`7U2=?O~g`*_-
zWm)hv5s~?hfHBpjUqYFgf^nDh=+))YAoCpoOPovd!e>Ll^5~i(BJ&*qW1PzoQ%Y|B
z8VbhU)3d5B=YIm3?+E0~i_V2Fg9?^sB_X2OIN#wzP|EB_Bkgd|e+#Q?<8a`3`4O%`
z#EyJInJ<kCAl5inEsS3_6-;;BKWBr?mo@?LFCY<zY8SYS`LcrhXlK6c&Kmv&c;kFG
z@{+C1cF|W*HS<;bbnuUu;(TY-oqy&E>SeyhXaf9WZ+~IhBGOG0oUM|+C`y^HJC5bt
zKhe53+T2Fi6%^FSe1jvXp8b;;Rk(Am>Ys^%;+b!1?B1<^T(xdzvW9={$O|bboB0-I
zjePniG@d%>Vt3=X0k49BnQy_ofJ6Uu>f62H8*z(KL8;8wHZPoaJI}lFPbl+IPq@aI
zbGO(-XMZ@l=8ep7xbly&rX#Iqx5KLweE!TgXkIKI{*my%hh}w57mCK8IrB}K7l41H
z{vV&g-o{`PybNdNn=)^3sI$BF9f)Q=8ndl2;UN@%w#>JX^HQAq$6LF>aLxM1ehGLo
z-==x-SZ@83&V00CWL(aE2^caTi+KUJ{#n&)wtuV3dkJ<kAESBkhz|Wz$b2-TTGv08
ztFZO-+Q^+;x^cOCb>oq{L!GOo278UBqEy|uQNs8CLrKeQJ-ybgVY)Wktg$0|Ha#D;
z8tqG&uH8JD-FrUvR??w)bilKG`r|Cb(%WV9&!>5$nE7blv(v}<Sp0Kq9tl6aw!e#z
ze}8N<9Gm`mHji{OAF+D51LxfClz&-A*t2<bz&&3?ZIF*j`O5zGRB;RW59X12=A%`~
zR0o+Cjx^;T%nJx*zGYW*{1f>n^Pqn)FJe+t2{osXdWNIxA2lOxWnTPMD1RP^!aV0k
z^ct@@<SOS?aS{R9*I%*EaDX=<{_Zu#8D$ReGBjTN$1=kK-iPcxU&`b9wuW7S(?TJH
zo_us~*n#E&1ytX+yD-B6UX1q3o~LFwz`HSc)A-;F2Y5ZI_k1ZZ517dZfI+hhKmhUq
aGyVY5B7chHkSx3a0000<MNUMnLSTY>Y6;K)

literal 454
zcmeAS@N?(olHy`uVBq!ia0vp^SAf`og9%8!^*$#Bq?n7HJVQ7*IBq}me*oli7I;J!
zGca&>f-s}`$<u2Y7#K4>T^vIy=DfXY*muZ5ggL<BPVu>Ev-2i)H5@TJv;E0;F0NGx
zl9Mw}{I%$l_NnlRXV^QX-|*CNiKoeDKL1_2_1eGJ7M6cQc23J*yOi<G!}RG;x&5cg
z<s855|CaH4&+^|-D;^#=Xcj+h{b%W&@#*K{Po=Yde{tsKC)XWMVuW@-?Y=N`^WY^u
zf3=_K8Sv@+jcNK$>F3`4R4RFv^E0mE(FwnIKZSNaZ@wR7cT7V*+0G_&&Sdp<|7S6?
qC;xe4<n~iyaZOJkSPC3qGwd1Ec5zkh-G3h#6AYfNelF{r5}E*7p7yH%