From 2f5fcfcc01d207c09167e642aed6d88480c86778 Mon Sep 17 00:00:00 2001
From: "mhotar@gmail.com"
 <mhotar@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Tue, 18 Jun 2013 23:00:42 +0000
Subject: [PATCH] Custom doublesize font chars for CPUARM CZ font bitmaps

---
 src/fonts/std/font_cz_04x06.lbm |   2 +-
 src/fonts/std/font_cz_04x06.png | Bin 131 -> 220 bytes
 src/fonts/std/font_cz_08x10.lbm |   2 +-
 src/fonts/std/font_cz_08x10.png | Bin 295 -> 292 bytes
 src/fonts/std/font_cz_10x14.lbm |   2 +-
 src/fonts/std/font_cz_10x14.png | Bin 133 -> 410 bytes
 src/lcd.cpp                     |   4 ++++
 src/translations.cpp            |  17 +++++++++++++++++
 8 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/fonts/std/font_cz_04x06.lbm b/src/fonts/std/font_cz_04x06.lbm
index 0d8a5dd53..450f6b219 100644
--- a/src/fonts/std/font_cz_04x06.lbm
+++ b/src/fonts/std/font_cz_04x06.lbm
@@ -1 +1 @@
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x18,0x24,0x16,0x3d,0x00,0x18,0x24,0x25,0x02,0x01,0x18,0x34,0x2c,0x0a,0x01,0x18,0x34,0x2d,0x0a,0x01,0x00,0x24,0x3c,0x22,0x01,0x18,0x24,0x24,0x1a,0x01,0x3c,0x04,0x05,0x0a,0x01,0x28,0x2d,0x36,0x15,0x00,0x1c,0x20,0x22,0x3d,0x00,0x1c,0x21,0x21,0x3c,0x00,0x0c,0x50,0x22,0x1d,0x00,0x38,0x14,0x14,0x3a,0x01,0x00,0x24,0x3e,0x25,0x00,0x3c,0x15,0x16,0x2d,0x00,0x00,0x0c,0x32,0x0d,0x00,0x24,0x35,0x2e,0x25,0x00,0x3e,0x2a,0x2a,0x22,0x01,
diff --git a/src/fonts/std/font_cz_04x06.png b/src/fonts/std/font_cz_04x06.png
index 7ac5b80a0579f7e30fb71e94ca092a4a8fce1a54..d43f5b05ce108ef439e7894d704d6d011abd2ba4 100644
GIT binary patch
delta 209
zcmZo>yu+y28Q|y6%O%Cdz`(%k>ERLtq(gz2osk(xI@eBqI#E%yo-xVW-G!lpRn`M2
z$XVbKS<Jw|Eeyhp4727)fYg_G`ns~;WfKzRlgiVm>H-SIc)B=-a9mHW*j`>+`eOF|
z_v`Zi9w^xV>)!Xf-}m3IjX!(v!sk1md=ksHxZXa*)%M1_c)Q;DzFoU>x3e^V-+61T
z{pQUnzfWsRT(eQ%Zt;7^@;Ar6x$w39Pxv6$QP05Ov){NfvtzF!&>{v;S3j3^P6<r_
DNk&g3

delta 93
zcmcb^*vzQd8Q|y6%O%Cdz`(%k>ERLtq~n2@osk(xhQu@LOjHz|=qzi%&CM@w^FdP^
rC@SFT;uyklJ^4pJ!+(htrx+RTs|PQ0oFD!iD97OG>gTe~DWM4feJK{~

diff --git a/src/fonts/std/font_cz_08x10.lbm b/src/fonts/std/font_cz_08x10.lbm
index 5562605a7..63fbb75db 100644
--- a/src/fonts/std/font_cz_08x10.lbm
+++ b/src/fonts/std/font_cz_08x10.lbm
@@ -1 +1 @@
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x03,0xa0,0x07,0xb0,0x04,0x94,0x04,0x93,0x02,0xf1,0x07,0xe0,0x07,0x00,0x00,0xc0,0x01,0xe1,0x03,0x33,0x06,0x16,0x04,0x13,0x04,0x31,0x06,0x20,0x02,0x00,0x00,0xc0,0x01,0xe0,0x03,0xb0,0x06,0x94,0x04,0xb3,0x04,0xe1,0x06,0xc0,0x02,0x00,0x00,0xc0,0x01,0xe1,0x03,0xb3,0x06,0x96,0x04,0xb3,0x04,0xe1,0x06,0xc0,0x02,0x00,0x00,0x00,0x04,0x10,0x04,0xf4,0x07,0xf3,0x07,0x01,0x04,0x00,0x04,0x00,0x00,0x00,0x00,0xc0,0x01,0xe0,0x03,0x30,0x06,0x14,0x04,0x33,0x06,0xe1,0x03,0xc0,0x01,0x00,0x00,0x11,0x00,0xf3,0x07,0xe6,0x07,0x33,0x00,0x11,0x00,0x30,0x00,0x20,0x00,0x00,0x00,0x60,0x02,0xf1,0x06,0x93,0x04,0x96,0x04,0x93,0x04,0xb1,0x07,0x20,0x03,0x00,0x00,0xf0,0x01,0xf0,0x03,0x00,0x06,0x04,0x04,0x03,0x02,0xf1,0x07,0xf0,0x07,0x00,0x00,0xf0,0x01,0xf0,0x03,0x02,0x06,0x05,0x04,0x05,0x02,0xf2,0x07,0xf0,0x07,0x00,0x00,0xf0,0x04,0xf0,0x0c,0x00,0x09,0x04,0x09,0x83,0x0c,0xf1,0x07,0xf0,0x03,0x00,0x00,0xf0,0x07,0xf8,0x07,0x88,0x00,0x8c,0x00,0x8b,0x00,0x89,0x00,0xf8,0x07,0xf0,0x07,0x00,0x00,0x08,0x04,0x08,0x04,0xfc,0x07,0xfb,0x07,0x09,0x04,0x08,0x04,0x00,0x00,0xf8,0x07,0xf9,0x07,0xcb,0x00,0xce,0x00,0xcb,0x01,0x49,0x03,0x78,0x06,0x30,0x04,0x18,0x00,0x18,0x00,0x30,0x00,0xe4,0x07,0xe3,0x07,0x31,0x00,0x18,0x00,0x18,0x00,0x08,0x06,0x09,0x07,0x8b,0x05,0xce,0x04,0x6b,0x04,0x39,0x04,0x18,0x04,0x00,0x00,0xf8,0x07,0xf8,0x07,0x48,0x04,0x4c,0x04,0x4b,0x04,0x49,0x04,0x08,0x04,0x00,0x00,
diff --git a/src/fonts/std/font_cz_08x10.png b/src/fonts/std/font_cz_08x10.png
index 4ce0d67d06a2b454fdeedd27c61e96ca1b570c3d..912588acb37b199e4150c5aa801ee42403bf9de9 100644
GIT binary patch
delta 238
zcmZ3^w1i2qGr-TCmrII^fq{Y7)59eQNOu4+4<j>>Yz|GoKT*-4Uc{WOH2<InP-Kax
zi(?4Kb>BWkzQYDQuCk(UxE?bf4xPBv!!A0+Kr}QoAb?LeLG&pDb8{ObTi}Ih>k_Kj
z{#8v{%m3<X_r1McuO^CWh3l0*{k7)n2~n@-SC@NOHh$-S-ebxZloa>VOnH%LbuNoy
z#r(fb%RRj=a2O^pS#PN1!fau*Y<8V#Q;dqRf?(-ofpYE1E=`6l6Kap-W`_lIBzS7_
m$~>=~zvlJ)Gx76}@3ec{+%S{nT!uH$!3>_RelF{r5}E+2s8`bf

delta 241
zcmV<N01p480;d8YiBL{Q4GJ0x0000DNk~Le0001(0000C0RsR40HpioH<2Mge-0lV
zv*v)P0001|Nkl<Z2-j`Tp$Y>r3;@t8C-w{T8%!Uk0)c*8IWbNhM^sfmrXp1J6DA{1
zR2)@Zy2&kpP##H0hxQvop+Zs~L{!S>t#<Os$GI_)i13}W+M)5%Yz>?<XpCBn%#Cjg
z0HENtS~c&9Hd^6pv2?2zAVbhPN1+&zQO#Ln)O0ota*^Eoz*?(T0V>KYq1)uW&lF(a
rXA}_IZH+OG9F~-x=yYSh<<H;V{(6?ODk&VQ00000NkvXXu0mjf27zF+

diff --git a/src/fonts/std/font_cz_10x14.lbm b/src/fonts/std/font_cz_10x14.lbm
index 9d2d549c0..2e96bc3f2 100644
--- a/src/fonts/std/font_cz_10x14.lbm
+++ b/src/fonts/std/font_cz_10x14.lbm
@@ -1 +1 @@
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+0x00,0x18,0x00,0x3c,0x60,0x7e,0x60,0x66,0x68,0x66,0x6c,0x66,0x67,0x66,0xe3,0x66,0xc1,0x7f,0x80,0x7f,0x80,0x1f,0xc0,0x3f,0xe0,0x70,0x67,0x60,0x6f,0x60,0x6c,0x60,0x66,0x60,0x63,0x70,0x01,0x38,0x00,0x18,0x80,0x1f,0xc0,0x3f,0xe0,0x76,0x60,0x66,0x68,0x66,0x6c,0x66,0x67,0x66,0xe3,0x66,0xc1,0x07,0x80,0x07,0x80,0x1f,0xc0,0x3f,0xe0,0x76,0x67,0x66,0x6f,0x66,0x6c,0x66,0x66,0x66,0xe3,0x66,0xc1,0x07,0x80,0x07,0x00,0x00,0x00,0x00,0x60,0x60,0x60,0x60,0xe8,0x7f,0xec,0x7f,0x07,0x60,0x03,0x60,0x01,0x00,0x00,0x00,0x80,0x1f,0xc0,0x3f,0xe0,0x70,0x60,0x60,0x68,0x60,0x6c,0x60,0x67,0x60,0xe3,0x70,0xc1,0x3f,0x80,0x1f,0xe0,0x7f,0xe0,0x7f,0x80,0x01,0xc7,0x01,0xef,0x00,0x6c,0x00,0x66,0x00,0xe3,0x00,0xc1,0x01,0x80,0x01,0x80,0x61,0xc0,0x63,0xe0,0x67,0x67,0x66,0x6f,0x66,0x6c,0x66,0x66,0x66,0x63,0x7e,0x01,0x3c,0x00,0x18,0xe0,0x1f,0xe0,0x3f,0x00,0x70,0x00,0x60,0x08,0x60,0x0c,0x70,0x07,0x38,0x03,0x18,0xe1,0x7f,0xe0,0x7f,0xe0,0x1f,0xe0,0x3f,0x00,0x70,0x06,0x60,0x09,0x60,0x09,0x70,0x0f,0x38,0x06,0x18,0xe0,0x7f,0xe0,0x7f,0xe0,0x01,0xe0,0x03,0x00,0x67,0x00,0x66,0x08,0x66,0x0c,0x66,0x07,0x66,0x03,0x76,0xe1,0x3f,0xe0,0x1f,0x80,0x7f,0xc0,0x7f,0xe0,0x06,0x70,0x06,0x38,0x06,0x38,0x06,0x74,0x06,0xe7,0x06,0xc3,0x7f,0x81,0x7f,0x00,0x00,0x00,0x00,0x18,0x60,0x18,0x60,0xfc,0x7f,0xff,0x7f,0x1b,0x60,0x19,0x60,0x00,0x00,0x00,0x00,0xf8,0x7f,0xf8,0x7f,0x18,0x03,0x17,0x03,0x0f,0x07,0x0c,0x0f,0x16,0x1f,0xbb,0x3b,0xf1,0x71,0xe0,0x60,0xf8,0x00,0xf8,0x01,0x80,0x03,0x00,0x07,0x00,0x7e,0x04,0x7e,0x07,0x07,0x83,0x03,0xf9,0x01,0xf8,0x00,0x18,0x70,0x18,0x70,0x18,0x78,0x17,0x7c,0x0f,0x6e,0x0c,0x67,0x96,0x63,0xdb,0x61,0xf9,0x60,0x78,0x60,0xf8,0x7f,0xf8,0x7f,0x18,0x63,0x18,0x63,0x1c,0x63,0x1f,0x63,0x1b,0x63,0x19,0x63,0x18,0x60,0x18,0x60,
diff --git a/src/fonts/std/font_cz_10x14.png b/src/fonts/std/font_cz_10x14.png
index f18ea4e4862120ad62ed5c7dc0c151759573ed0c..bc97e13bef4977ff4b280648f909a5ff7faacfbe 100644
GIT binary patch
delta 400
zcmV;B0dM|=0h$9LiBL{Q4GJ0x0000DNk~Le000200000G0RsR40KDmT(vcw*e*t1k
zM??UK1szBL000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*n|6)`1%kbR2)00A0F
zL_t&-({0bOYQr!P24EQ%XDJmli>Eq|;F6_-sn!mKzCyOXLJB3e$>1?Vrc8c_zQ7d~
z+`&|@V8{z7y+tBN)N{#F=ndlTe*^u;33_R}9hEoFJ9;fU=RA)N1bJn)6z-q4bX3Os
zar7X(E8E7OR$1eZszn?}1c4NkIX|T`@bP9Jgb?9RHK3<9X9ioySlhXbmDCucStBVB
zu((SiJzOUvf8V0f=$KEF!?47zT9nLoiKgBkn1e)1XuvYRa|da+7aSt3W)S@K#37&D
zK_NTl>dYZhvgfW}Wg8C3q^2;kE2QL*FQu}PCpDGWt%FMwIq;UOP|VdVy^3L&QdG|#
uF9^)05aT&Hp96MIvCjKTX7kJ8zk(k}p4Go~S~9W#0000<MNUMnLSTZ~#i8i{

delta 95
zcmbQm+{&of8Q|y6%O%Cdz`(%k>ERLtr1t@_03$PyoU|s~VWOhwL}yteZf<^ShR<hz
s0Y!y8T^vIsE+_x!m;I9{F;#+tli~2Xx`ZNENsuWFp00i_>zopr00&<fK>z>%

diff --git a/src/lcd.cpp b/src/lcd.cpp
index 3d21f2b68..636acfad4 100644
--- a/src/lcd.cpp
+++ b/src/lcd.cpp
@@ -118,6 +118,10 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags)
       c_remapped = c - 'a' + 42;
     else if (c=='_')
       c_remapped = 4;
+#if defined(CPUARM)      
+    else if (c>= 128 )
+      c_remapped = c - 60;
+#endif      
     else
       c_remapped = 0;
 
diff --git a/src/translations.cpp b/src/translations.cpp
index 83c75c91d..66b58c98d 100644
--- a/src/translations.cpp
+++ b/src/translations.cpp
@@ -526,6 +526,23 @@ const pm_uchar font_5x7[] PROGMEM = {
 
 const pm_uchar font_10x14[] PROGMEM = {
 #include "fonts/std/font_10x14_compressed.lbm"
+#if defined(CPUARM)
+  #if defined(TRANSLATIONS_DE)
+  #include "fonts/std/font_de_10x14.lbm"
+  #elif defined(TRANSLATIONS_CZ)
+  #include "fonts/std/font_cz_10x14.lbm"
+  #elif defined(TRANSLATIONS_ES)
+  #include "fonts/std/font_es_10x146.lbm"
+  #elif defined(TRANSLATIONS_FR)
+  #include "fonts/std/font_fr_10x146.lbm"
+  #elif defined(TRANSLATIONS_IT)
+  #include "fonts/std/font_it_10x14.lbm"
+  #elif defined(TRANSLATIONS_PT)
+  #include "fonts/std/font_pt_10x14.lbm"
+  #elif defined(TRANSLATIONS_SE)
+  #include "fonts/std/font_se_10x14.lbm"
+  #endif
+#endif
 };
 
 #if defined(CPUARM)