From ac8d9510278316eb8f18e9bcaae35f05bc1ab82b Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Fri, 13 Feb 2015 14:21:43 +0100
Subject: [PATCH] fix usage of font special characters

---
 gen/fonts.c        |  14 +++++++++-----
 gen/fonts.h        |   2 +-
 gen/fonts/font.png | Bin 1079 -> 1114 bytes
 layout.c           |  12 ++++++------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/gen/fonts.c b/gen/fonts.c
index b811732..d562c1d 100644
--- a/gen/fonts.c
+++ b/gen/fonts.c
@@ -9,8 +9,8 @@ const uint8_t *font_data[FONT_END - FONT_START + 1] = {
 	(uint8_t *)"\x06\xc0\xc6\x1c\x70\xc6\x06",
 	(uint8_t *)"\x06\x5c\xfe\xb2\xfe\x4c\x1e",
 	(uint8_t *)"\x01\xc0",
-	(uint8_t *)"\x03\x3c\x7e\x81",
-	(uint8_t *)"\x03\x81\x7e\x3c",
+	(uint8_t *)"\x03\x38\x7c\x82",
+	(uint8_t *)"\x03\x82\x7c\x38",
 	(uint8_t *)"\x05\x6c\x38\xfe\x38\x6c",
 	(uint8_t *)"\x05\x10\x10\x7c\x10\x10",
 	(uint8_t *)"\x02\x03\x06",
@@ -60,9 +60,9 @@ const uint8_t *font_data[FONT_END - FONT_START + 1] = {
 	(uint8_t *)"\x06\xc6\xee\x38\x38\xee\xc6",
 	(uint8_t *)"\x06\xc0\xe0\x3e\x3e\xe0\xc0",
 	(uint8_t *)"\x05\x8e\x9e\xba\xf2\xe2",
-	(uint8_t *)"\x03\xff\xff\x81",
+	(uint8_t *)"\x03\xfe\xfe\x82",
 	(uint8_t *)"\x03\xe0\x38\x0e",
-	(uint8_t *)"\x03\x81\xff\xff",
+	(uint8_t *)"\x03\x82\xfe\xfe",
 	(uint8_t *)"\x03\x60\xc0\x60",
 	(uint8_t *)"\x06\x02\x02\x02\x02\x02\x02",
 	(uint8_t *)"\x02\x80\x40",
@@ -92,8 +92,12 @@ const uint8_t *font_data[FONT_END - FONT_START + 1] = {
 	(uint8_t *)"\x05\x36\x3e\x08\x3e\x36",
 	(uint8_t *)"\x05\x38\x3d\x05\x3f\x3e",
 	(uint8_t *)"\x05\x26\x2e\x3a\x32\x22",
-	(uint8_t *)"\x07\x44\xee\x7c\x38\x7c\xee\x44",
+	(uint8_t *)"\x04\x10\x7c\xee\x82",
 	(uint8_t *)"\x02\xff\xff",
+	(uint8_t *)"\x04\x82\xee\x7c\x10",
+	(uint8_t *)"\x04\x08\x10\x08\x10",
+	(uint8_t *)"\x02\x00\x00",
+	(uint8_t *)"\x07\x44\xee\x7c\x38\x7c\xee\x44",
 	(uint8_t *)"\x07\x18\x1c\x0e\x18\x30\x40\x80",
 	(uint8_t *)"\x06\x10\x38\x7c\x10\x10\x10",
 	(uint8_t *)"\x06\x10\x10\x10\x7c\x38\x10",
diff --git a/gen/fonts.h b/gen/fonts.h
index 0cd6b62..b4465ea 100644
--- a/gen/fonts.h
+++ b/gen/fonts.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 
 #define FONT_START 32
-#define FONT_END 128
+#define FONT_END 132
 #define FONT_HEIGHT 8
 
 int fontCharWidth(char c);
diff --git a/gen/fonts/font.png b/gen/fonts/font.png
index efc88495d6dc5fc311dc2323589921237abf321f..6aa04f5d2be9d38ad2eda1be1b65035ea510879b 100644
GIT binary patch
literal 1114
zcmV-g1f~0lP)<h;3K|Lk000e1NJLTq00Juj000OG0ssI2w`(ZQ000CbNkl<ZXx`OZ
z+jiq13=}#0|G&&WIKfyN4FlLs%R^6$1xSN#$h6d2tyr;QX4Pu3Qfn=xRI664l+R<W
zRxI|s2i9t4j?B#3tAp~G^G*3#>v((iUwh8hdfcnf-!p&m&~bGv-6rS-arEyM@=<Y>
zp5_=uIPq&C8Jjr0$R~84N5YuMEgm?+D$-<9H&t<X_F8f2|0q@L^avPIs%|VqLj-NG
z=|OhK?SxP>2tb{5J<i1X{$|L)(0X{089JU*d%WTwZJE4{OZ2Leq36hOBaUUKCp@0K
zt<8T2Z_&`45fMjvx?*Fh0=yHE2t|;W<?Rrl{~P;V=SA~6Q}ImK+S?}_9)C}@$b)k(
zN9!qF4`iSxb7LU^;UvQ+LzTRW%sa;Ty4k>93OFj#KvZqD^$c?axXwT{xa>Mv+<p7O
z7I)#2`6WHjgdOp+>Fw`qCg!(5{)-JFtoR)0`Qea0N|9-K?Dz-O^d0eXsagb!PO1?&
z2;Lbb3`kZLtI%=3%cxqoj`L?R#`lyNb+I#Lc9XbsNkf<~D#|;{?O5ui4O(zgaf6_3
z{0V>IOsQE=+Zx!ZWGWDfp*ghq6`k)7g(L}xlSKNKQOAVoVi#7U`EWJM5{t+lr@5GF
zs~80k&U1MQ2jaX3I|N~D1aK#<ao#vO2QmC`^{!T50~Ngf<vFJKNY-*n&`^jIw#KL8
zpu}BwN*^<bVS>!{UU!Qze!FbfElN@z5&YTk98*!4oVsnA3JeOdl6l>J>{x>fYF(Cl
zxs4{B(7AH}qfsjxJ#}{EWdOxArV{on%JR6fP#eh93?BLy(x3&s&D;XP#IYS0g;MlB
zIRnA@ZBperrk$(8kvO!hK!m?o<;dLea(*3)ND<J@^Dju{l8To50k@Wi97UTSt*$&#
zNf48yh0v>K2H-${2a<$yXu1R<BEo)M;TD~FIw$x_izRnG;Z}4{q}25@CfV?mOv>7k
z8TbtXX3UYj*FtGE^ZN?=#N?E`EW=c>!@DZ%Pb)4g2)LjNl>lO!ebM>-P4x0S&0jdl
z4O7B>N2v$AO%V1upFO)T7}S0^e<-%~vJaWu^cDO}#`D+ZJ<42ebf+-F>1syazDV$h
zRk-XtM80=HUfVpp)G)06ZRQTynNgvSuy9w%D}MUPlH>uffS{xWP$D-F9)ii_vnOEj
z!|7B$9#cYnr-)?^=UFJd?#BtZUt+n^HDw<&o#EvyQaN8nU_XF~SsiC`=ouieYsYs|
z?j|3!bcKwbUrC<yT<`)5z71^YCBJw-J8VVXna!_VF~m1SXPBQ_?h8Fb8I?!A1;0}2
zfjA<KF1WxUze#)p)IT7_?C;^$*!;a@jY<5^35kIyWSh6K$&GWY7zBg|Zey!(IdMdu
gr_^#@U0nqE57v_;E$1g+9{>OV07*qoM6N<$f}wyKYXATM

literal 1079
zcmV-71jze|P)<h;3K|Lk000e1NJLTq00J2R000OG0ssI2+iiNw000C2Nkl<ZXx`OY
z+qUZ<2*j@a|G(^cNNWrX<EY8$-ad3C1Qn2bEwxrFR;-v=wOXvyT1zR_s#PoH^IEGF
zi;(xkTFuO%nOXaEU><9}F+Y19Ur+cIa*hUZp8~um{-mL!>e#w1&@<xj-#g^9;x0YT
zF^f>*_d+~2c6ydi(S2SCVIsA7;z(8zC*!)Qij!xr6&LtNsUpxzz>rdPbD=aup$!f_
z@b0LcU}{DJP$wP4nOF~Rh71g?7cVkHM{{bASNTU<CST(gy{cr=b7*)F$Fc(nuP1G5
z>u=L``qIub6Zrr?Luf;>;AQzZ&aD59a0k5TP^a{s=vsSAgVW>l)QB`VH*t&}(?K8s
zJ(`;f5eOxjd@`w$Pmy>>7~eOW*mD7AMI0zqTOB>YTmoEYpfot|I$At^`;Q}@!X<}G
zAkc&z^0MjepKQkFw}kxXMs(dnKNHnMvA7=c0~PKaPIC=tu_(HmhTzoY9T;I~u`2Q`
z3h^%UXn{AbpG6A~DKn;JXBz7kakWB|FyB<<cb3{Q*GmVq;BMjpLEHEf#_vq2Sx`F~
z2vl+oD2kyuwDlF8?+Y~&&f_8xzvad;^|{!E)o4Ck&9W3BlE-l_rrNqVK?rB9TtbnW
zL$E^-=0^YE`6^q1gez*b`Wh(H^_S;;;w#z99cL3qT(Awk6c<W7Kc~KKsjPP46^6^x
z*F0(M2HX^`FK(w)NIX>}38OovDHpFGD>>BdrNElFpw?wslsjkwgl?J(FdDUT&{Ops
zFU=Lx5amoPD>D|cPmtk2HG_rtLPE2kx6v(RY7?z8^VPkBb<Q?xLCy8JNJLpy1wvo!
zA!LqqIp>WnnkdlC`W>WKNx#TFz@z2CL($7edlyfX>SDUH5JdGD4~pzNBuOZTrb|Rb
zSlF-iZ_$~jqx)AzY-sDLv!Z(<Cil-g-^!8|=afj4I@WnDv>-DNzNvFcu9P`P#iH)&
zL_e*9u-tax6Dk38OxZslzki7Sny20i)fL?I7NJ3FRC1kVA?#B=TTd?-)P7)oC`$Fb
z4~g9L6}(R3nJ5V)utCRFQHgDEyhs>`J+7=qfvpv>>k>mq_B^FAN<7c%I0Zk7g*!Fg
zPt&VC647CKt^|0<k(&thl`KA6l@e`nWaw%T%Lx6XNJC?|&O&2z-{UW5awQDq95bEa
z%_7p5UY5XqC=&BCPUO%tK*6q+)TEglX;|1u&(AIl;ybA}xN62P6sExIwcU6pm@Sgs
zQ=B1Q`uau4kVoZ}AHlEWdccl|qcbj0$nUe>AnM1saCd))aJKCJ?O4qi@fG>RKoqpi
xJHh1MGgb^Dga_^ftKzbRuk6nBq~f_)@DH^x^cbajO1J<3002ovPDHLkV1g+<|GfYJ

diff --git a/layout.c b/layout.c
index ae082ee..bef3a6c 100644
--- a/layout.c
+++ b/layout.c
@@ -67,14 +67,14 @@ void layoutDialog(LayoutDialogIcon icon, const char *btnNo, const char *btnYes,
 		}
 	}
 	if (btnNo) {
-		oledDrawString(1, OLED_HEIGHT - 8, "{");
-		oledDrawString(fontCharWidth('{') + 3, OLED_HEIGHT - 8, btnNo);
-		oledInvert(0, OLED_HEIGHT - 9, fontCharWidth('{') + fontStringWidth(btnNo) + 2, OLED_HEIGHT - 1);
+		oledDrawString(1, OLED_HEIGHT - 8, "\x80");
+		oledDrawString(fontCharWidth('\x80') + 3, OLED_HEIGHT - 8, btnNo);
+		oledInvert(0, OLED_HEIGHT - 9, fontCharWidth('\x80') + fontStringWidth(btnNo) + 2, OLED_HEIGHT - 1);
 	}
 	if (btnYes) {
-		oledDrawString(OLED_WIDTH - fontCharWidth('}') - 1, OLED_HEIGHT - 8, "}");
-		oledDrawString(OLED_WIDTH - fontStringWidth(btnYes) - fontCharWidth('}') - 3, OLED_HEIGHT - 8, btnYes);
-		oledInvert(OLED_WIDTH - fontStringWidth(btnYes) - fontCharWidth('}') - 4, OLED_HEIGHT - 9, OLED_WIDTH - 1, OLED_HEIGHT - 1);
+		oledDrawString(OLED_WIDTH - fontCharWidth('\x81') - 1, OLED_HEIGHT - 8, "\x81");
+		oledDrawString(OLED_WIDTH - fontStringWidth(btnYes) - fontCharWidth('\x81') - 3, OLED_HEIGHT - 8, btnYes);
+		oledInvert(OLED_WIDTH - fontStringWidth(btnYes) - fontCharWidth('\x81') - 4, OLED_HEIGHT - 9, OLED_WIDTH - 1, OLED_HEIGHT - 1);
 	}
 	oledRefresh();
 }