From d6977a130b3f3112fa6880cf2e3812e6ee4a9b1c Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Fri, 16 May 2014 14:43:32 +0200
Subject: [PATCH] Chars [ and ] use now one less pixel in weight

---
 radio/src/fonts/std/font_05x07.png | Bin 638 -> 685 bytes
 radio/src/lcd.cpp                  |  27 ++++++++++-----------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/radio/src/fonts/std/font_05x07.png b/radio/src/fonts/std/font_05x07.png
index 71a4d36ebf4dad393b0142d8f1badd6fbadbe918..ee51e7b03e95988d7d592bb55f8057b997fcbc0f 100644
GIT binary patch
delta 626
zcmV-&0*(Ft1g!;-90dW(EMFp#Ar+BB9DfB63?MPFS<>tP00KHmL_t(2&n=8yNK<hb
z#-CI~&7!)95v>pDW5cWFjo!p560?DsVZu@yEtVgs%at1(+s-tMVB(3wxtfW@z}9T0
zE!%XtNIFI1P&Z0Z&V*c$(_y$1$<Du%^jy3z@5Ar?VT=Mt;WmXF2099aLTea#41d7D
zNx>3^7>47x7KIFp0B=A`Y6LR70adG7WcyfTsaP~^Vz6K+$F_V1JYlipiUFUk2}J)S
z&>dt!!~}MhCD7q5-qL`M_<@uTwWEIA0b`U6HbOJAmTJVOtm*1HXqKmh_h?WSce-$F
z|LWTeX-=Q4gL13iejRlFiCimeZ+~uCIM{mJZ5(<}yRUM%8F|#s;o`n7bqa3VyYxMH
z*xi^ehgK1jn)>o;bq#uj$&wt*2;Pzkd^{6T)IeE0ERi#7gQd0L{2iWJ#AvZo1}kYV
zB^cHWsjp!%5mE2Lw^Lsvo<zy-3piLgEOX#+<rA#~$$GJGFT&YBoI@4k&wtGi5Z=u;
zFBRlvQuh&-o1c0s#-Evc@Jdd|l5r|&9>67Mq{yX1rpQC@KV&#}SN59pL*LII>D4n`
zViZDXg`N}oI1+`<wHR7%4bE=o!KMirinO3fS%zO5?Y-F|9s-fFK1HkqMprz*8z(Q1
zzQpEEd4T`g)-)!9*2IIJwqLoH0uf{*;>v`GswlC1peMgeZzg-PuvzuOt>7g??5Nn<
z=a#&t4R0tW0n+|=%%7)W%v}%gk0&U@4Oj<$sysg5{8{?Hmn_iaFC1?m?8wrTkpKVy
M07*qoM6N<$f@=UM!~g&Q

delta 604
zcmV-i0;Bz{1^xt(90dTpD{r)sAr*fCVoOIv0Eh)0NB{r;32;bRa{vGf6951U69E94
zoEQKA00(qQO+^RZ0SO5+FZAQmBLDya{z*hZR4C75IKcU1UP9vjZx!<y4sgDhxgu!$
zwu*T`=83N<#-iIQ<}w_RnUMF!Sc%PHHp4*~i@QF?q8lovGaQhu*tjNW`<8!-ejxM5
zC!fUqpDN@T4$A)j|E3sh*t8{jOb%0K9Iw5|kTUa(<(y;&wtwds(srKWyp_zr+8oD_
zwpFblY>LF;|8p7A)*dLFmJSq+W=NZR&Tv{<L)*Xm3{x2Nyuzl=aId}1@O|(5>U-a3
z9RCj#brx(8EHHR(d66M`&a;2L?}~O^7d!`Kez$#Jv}?P@Ife;L-&r)6c9m=TF?<G!
z0u^kx>;p1EYG+-yJjd|4S+Ma#f!YJ03E%$%!SDV5>;E(GI15;wD{hcKT*pv6=k3mO
z#e2#>?E^CZ?mV}8SM|qx4BXAKJI~!MtNr|sp=$cuou}5ls{=Btquzh+T2*$hzW5(Q
z&0N{zrDX@?4?ke|4+j7K|Nh5de*b^HebtVKKr6!U|F64Hz2_;AnG!7N_ReF&QBgyN
z@}6%Nc}6>y0-atW^PTBK(T-Hjb3luq+x;t=u@vau5@rdvj|D0RfbJ~^yLaz%pb0=4
z#Cc$iU`AIn@Jtp2I=xKsLH2frVxHeXr|)(sXkp-ym)?2qj@bgBX#M=xMyuAZe-K>F
qP(M%RbZLp>1MUA%_x^uW{T~3G`W;@1J_1?*0000<MNUMnLSTY#Oeezt

diff --git a/radio/src/lcd.cpp b/radio/src/lcd.cpp
index cdeee8e32..a92bc790a 100644
--- a/radio/src/lcd.cpp
+++ b/radio/src/lcd.cpp
@@ -335,7 +335,7 @@ void lcd_putsnAtt(xcoord_t x, uint8_t y, const pm_char * s, uint8_t len, LcdFlag
 {
   xcoord_t orig_x = x;
   bool setx = false;
-  while(len--) {
+  while (len--) {
     unsigned char c;
     switch (mode & (BSS+ZCHAR)) {
       case BSS:
@@ -355,7 +355,9 @@ void lcd_putsnAtt(xcoord_t x, uint8_t y, const pm_char * s, uint8_t len, LcdFlag
       x = c;
       setx = false;
     }
-    else if (!c || x>LCD_W-6) break;
+    else if (!c) {
+      break;
+    }
     else if (c >= 0x20) {
       lcd_putcAtt(x, y, c, mode);
       x = lcdNextPos;
@@ -421,19 +423,18 @@ void lcd_putsiAtt(xcoord_t x, uint8_t y,const pm_char * s,uint8_t idx, LcdFlags
 {
   uint8_t length;
   length = pgm_read_byte(s++);
-  lcd_putsnAtt(x,y,s+length*idx,length,flags & ~(BSS|ZCHAR));
+  lcd_putsnAtt(x, y, s+length*idx, length, flags & ~(BSS|ZCHAR));
 }
 
 void lcd_outhex4(xcoord_t x, uint8_t y, uint16_t val)
 {
-  x+=FWNUM*4+1;
-  for(int i=0; i<4; i++)
-  {
-    x-=FWNUM;
+  x += FWNUM*4+1;
+  for(int i=0; i<4; i++) {
+    x -= FWNUM;
     char c = val & 0xf;
     c = c>9 ? c+'A'-10 : c+'0';
-    lcd_putcAtt(x,y,c,c>='A'?CONDENSED:0);
-    val>>=4;
+    lcd_putcAtt(x, y, c, c>='A' ? CONDENSED : 0);
+    val >>= 4;
   }
 }
 
@@ -1163,15 +1164,7 @@ void putsTrimMode(xcoord_t x, uint8_t y, uint8_t phase, uint8_t idx, LcdFlags at
 #if ROTARY_ENCODERS > 0
 void putsRotaryEncoderMode(xcoord_t x, uint8_t y, uint8_t phase, uint8_t idx, LcdFlags att)
 {
-#if ROTARY_ENCODERS > 2
-  int16_t v;
-  if(idx < (NUM_ROTARY_ENCODERS - NUM_ROTARY_ENCODERS_EXTRA))
-    v = phaseAddress(phase)->rotaryEncoders[idx];
-  else
-    v = g_model.rotaryEncodersExtra[phase][idx - (NUM_ROTARY_ENCODERS - NUM_ROTARY_ENCODERS_EXTRA)];
-#else
   int16_t v = phaseAddress(phase)->rotaryEncoders[idx];
-#endif
 
   if (v > ROTARY_ENCODER_MAX) {
     uint8_t p = v - ROTARY_ENCODER_MAX - 1;