From 72ef865c10ff1beccb78a4adfb2774e338367fc9 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Tue, 1 Jul 2014 22:53:10 +0200
Subject: [PATCH] Prevents lines from wrapping when writing text

---
 radio/src/lcd.cpp                    |   3 ++-
 radio/src/tests/gtests.cpp           |   7 +++++++
 radio/src/tests/line_wrap_128x64.png | Bin 0 -> 297 bytes
 radio/src/tests/line_wrap_212x64.png | Bin 0 -> 321 bytes
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100755 radio/src/tests/line_wrap_128x64.png
 create mode 100755 radio/src/tests/line_wrap_212x64.png

diff --git a/radio/src/lcd.cpp b/radio/src/lcd.cpp
index 693112236..4e742506d 100644
--- a/radio/src/lcd.cpp
+++ b/radio/src/lcd.cpp
@@ -56,6 +56,7 @@ uint8_t lcdNextPos;
 void lcdPutPattern(xcoord_t x, uint8_t y, const uint8_t * pattern, uint8_t width, uint8_t height, LcdFlags flags)
 {
   uint8_t *p = &displayBuf[ y / 8 * LCD_W + x ];
+  uint8_t *end = &displayBuf[ y / 8 * LCD_W + LCD_W ];
 
   bool blink = false;
   bool inv = false;
@@ -75,7 +76,7 @@ void lcdPutPattern(xcoord_t x, uint8_t y, const uint8_t * pattern, uint8_t width
   // we need to work on the previous byte when INVERS
   p--;
 
-  for (int8_t i=0; i<width+2; i++) {
+  for (int8_t i=0; i<width+2 && p<end; i++) {
     uint8_t lines = (height+7)/8;
     assert(lines <= 5);
     uint8_t b[5] = { 0 };
diff --git a/radio/src/tests/gtests.cpp b/radio/src/tests/gtests.cpp
index 02c800a9a..7767eb849 100644
--- a/radio/src/tests/gtests.cpp
+++ b/radio/src/tests/gtests.cpp
@@ -1062,6 +1062,13 @@ TEST(Lcd, Prec2_Right)
   EXPECT_TRUE(checkScreenshot("prec2_right"));
 }
 
+TEST(Lcd, Line_Wrap)
+{
+  lcd_clear();
+  lcd_puts(LCD_W-10, 0, "TEST");
+  EXPECT_TRUE(checkScreenshot("line_wrap"));
+}
+
 int main(int argc, char **argv)
 {
   QCoreApplication app(argc, argv);
diff --git a/radio/src/tests/line_wrap_128x64.png b/radio/src/tests/line_wrap_128x64.png
new file mode 100755
index 0000000000000000000000000000000000000000..5863f968d3dedaf73a478b1a7907f17939c62ee6
GIT binary patch
literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!2~2@x4h5*Qq09po*^6@9Je3(KLBz$3p^r=
z85p=bL736}<mt6Q!84vNjv*Cu-d=O$Vlot9a18&Ge$UMQt3q3iL-dAMQ{HG^IJx2a
znL9t0Y`wN~?#$1pAHRP7(|W!3zH3(Rf5qLO?fmf>tI0PJp#_O7f4TG*Y;?cy)O<@S
v%TbmNP61&BH3y%D84QMuNlZuRA>gmMUD)?z$E9CDe=&Hv`njxgN@xNAzRO{s

literal 0
HcmV?d00001

diff --git a/radio/src/tests/line_wrap_212x64.png b/radio/src/tests/line_wrap_212x64.png
new file mode 100755
index 0000000000000000000000000000000000000000..fd67abee8f2fcd892398c64ae7b8ba3a75a36ec3
GIT binary patch
literal 321
zcmeAS@N?(olHy`uVBq!ia0vp^SAf`og9%8!^*$#Bq?n7HJVQ7*IBq}me*oli7I;J!
zGca&>f-s}`$<u3rf=@hM978JRyuGoJ_pkvE!$FG^^JewVUS^<B(fFeKPUtjkQGTHd
zrpEd|dbeKtY+-!fe*WX{5Bu*d&RzR;PT}w0cVoDG?9Sbu9bPjh?d>JwpBB06@173k
l7R{dC^W#KE|DYgh7zO%-eQz$jQ4RDjgQu&X%Q~loCIC-$qkjMZ

literal 0
HcmV?d00001