From 67817918f451341fa06084fa71b017d0c7e3ec08 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sun, 10 Sep 2017 17:17:23 +0200 Subject: [PATCH] Add SQT5 that was missing in 2.2 (#5179) Add SQT5 that was missing in 2.2 --- radio/src/CMakeLists.txt | 6 ++++++ radio/src/bitmaps/128x64/CMakeLists.txt | 3 ++- radio/src/bitmaps/212x64/CMakeLists.txt | 3 ++- radio/src/fonts/sqt5/font_03x05.png | Bin 0 -> 374 bytes radio/src/fonts/sqt5/font_04x06_extra.png | Bin 0 -> 313 bytes radio/src/fonts/sqt5/font_05x07_extra.png | Bin 0 -> 378 bytes radio/src/fonts/sqt5/font_10x14_extra.png | Bin 0 -> 383 bytes radio/src/fonts/sqt5/font_22x38_num.png | Bin 0 -> 881 bytes 8 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 radio/src/fonts/sqt5/font_03x05.png create mode 100644 radio/src/fonts/sqt5/font_04x06_extra.png create mode 100644 radio/src/fonts/sqt5/font_05x07_extra.png create mode 100644 radio/src/fonts/sqt5/font_10x14_extra.png create mode 100644 radio/src/fonts/sqt5/font_22x38_num.png diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index b00a27818..e34b07ec6 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -14,6 +14,8 @@ set_property(CACHE SPLASH PROPERTY STRINGS DEFAULT OFF FRSKY) set(PPM_UNIT "PERCENT_PREC1" CACHE STRING "PPM display unit (US/PERCENT_PREC1/PERCENT_PREC0)") set_property(CACHE PPM_UNIT PROPERTY STRINGS US PERCENT_PREC1 PERCENT_PREC0) set(DEFAULT_MODE "" CACHE STRING "Default sticks mode") +set(FONT "STD" CACHE STRING "Choose font : STD or SQT5") +set_property(CACHE FONT PROPERTY STRINGS SQT5) option(HELI "Heli menu" ON) option(FLIGHT_MODES "Flight Modes" ON) @@ -337,6 +339,10 @@ if(FRSKY_STICKS) add_definitions(-DFRSKY_STICKS) endif() +if(NOT FONT STREQUAL "") + add_definitions(-DFONT=${DEFAULT_MODE}) +endif() + if(EEPROM_VARIANT_NEEDED) add_definitions(-DEEPROM_VARIANT=${EEPROM_VARIANT}) endif() diff --git a/radio/src/bitmaps/128x64/CMakeLists.txt b/radio/src/bitmaps/128x64/CMakeLists.txt index 2b5f7469b..9119629ff 100644 --- a/radio/src/bitmaps/128x64/CMakeLists.txt +++ b/radio/src/bitmaps/128x64/CMakeLists.txt @@ -1,4 +1,5 @@ +string(TOLOWER "${FONT}" FONT_DIR) add_bitmaps_target(9x_xbm_1bit ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.xbm 128 1bit 4) -add_bitmaps_target(9x_fonts_1bit ${RADIO_SRC_DIRECTORY}/fonts/std/*.png 128 "") +add_bitmaps_target(9x_fonts_1bit ${RADIO_SRC_DIRECTORY}/fonts/${FONT_DIR}/*.png 128 "") add_bitmaps_target(9x_bitmaps ${RADIO_SRC_DIRECTORY}/bitmaps/128x64/*.png 128 1bit) add_dependencies(9x_bitmaps 9x_fonts_1bit 9x_xbm_1bit) diff --git a/radio/src/bitmaps/212x64/CMakeLists.txt b/radio/src/bitmaps/212x64/CMakeLists.txt index ade4b08dc..c7e4b0fec 100644 --- a/radio/src/bitmaps/212x64/CMakeLists.txt +++ b/radio/src/bitmaps/212x64/CMakeLists.txt @@ -1,4 +1,5 @@ +string(TOLOWER "${FONT}" FONT_DIR) add_bitmaps_target(taranis_xbm ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.xbm 128 1bit 4) -add_bitmaps_target(taranis_fonts ${RADIO_SRC_DIRECTORY}/fonts/std/*.png 128 "") +add_bitmaps_target(taranis_fonts ${RADIO_SRC_DIRECTORY}/fonts/${FONT_DIR}/*.png 128 "") add_bitmaps_target(taranis_bitmaps ${RADIO_SRC_DIRECTORY}/bitmaps/212x64/*.png 212 4bits) add_dependencies(taranis_bitmaps taranis_fonts taranis_xbm) diff --git a/radio/src/fonts/sqt5/font_03x05.png b/radio/src/fonts/sqt5/font_03x05.png new file mode 100644 index 0000000000000000000000000000000000000000..ed3d41cc86db00880712803263311b88d16d956e GIT binary patch literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^8-bXW5lAp7aT;&~DVB6cUq_&LKlh(RRv=#?*(1o8 zfuTx`fuW&=f#DZWsNn?zL#Y7+!>a@a2CEqi4B`cIb_Lo1C76=D-CYO>_%)r1c48n{Iv*t(u1=&kHeO=ifGVw7eD^?0Cz6J{Ec)B=-a9mH`@%{gQ`L=!R z|05+%{af}namU`$mr`xkJI`-7xU>8GhvtX&0b&dVnxa9n4fRbxeX1p{5hW>!C8<`) zMX5lF!N|bST-U%z*U%)yz`)Ab)XLac+rZGuz`$X$`4bckx%nxXX_dG&7@q5o0BT_H MboFyt=akR{0B2NH#{d8T literal 0 HcmV?d00001 diff --git a/radio/src/fonts/sqt5/font_05x07_extra.png b/radio/src/fonts/sqt5/font_05x07_extra.png new file mode 100644 index 0000000000000000000000000000000000000000..e71a06b47f42dc9f1557f6cf39c6d12b309e1f40 GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^@j%SM2qYM`?~xM+QY`6?zK#qG8~eHcB(ehe3dtTp zz6=aistgPb%?u1b{{!il3=E|P3=FRl7#OT(FffScPl`Y422{(GO>_%)r1c48n{Iv*t(u1=&kHeO=ifGVw7eD^?0Cz6J{Adb&7Eal|aXtA5Kcl>a-Ty`- zxkD1{|NbQZ_&$Ef_Fw(C{Xcn$p4@-_(>7XgUQ@l3T)}kYM|zFR zPanp^&yCZ&=C7Dm!I(G{(%oan+-b(8ye!;3W85Fo{p?&#~tz_78O`%fY(kgt&J z5#-CjP^HGe(9pub@Czu^@PdJ%)PRBERRRNp)eHs(@q#(K0&Rd2OiAAEE)0x!yM&hj zd7K3vk;M!Q+`=Ht$S`Y;1W=H@#M9T6{UH+{gR)|!u;Oc=CVNj8#}JFttydk3ZYzke zJ($0UGp@pCdSr!H--T51nOZwL`zNG|&z-UO;TNS-yb+rczWh>FIo_w@{_PR(FE+;a zj1zb!KiD+s+^PM3o<+7Y1y8silyjO!@3r)7&wf+bqj!+OPw3-%p{)M!6_#wb&bekB z@KX5~>GV&&QL-+%|6plA!$a!_3tR3tR6nTX{LR^}Z*V{Qn=h-bTzG%g|DMu2g4=Vh z9{T9b$!c|o?J58K4W6v>d%x_GFW_XqpxKux`keE*X-@G$A(s*`h*ULM^+0{aK9zs1uWS6ioBADzwoMFfbJRI)VWeC= zIh!%`%&mxnveDmoe*T?i@jBw565q7L8aobO6rQ~$^7y>l8#FEA9!1)QpSiMhS)McJ z5wrZx^shD#<~?UnFYPQpa@zCc9oeGZwZ}gj`DOK~+Qf=o`Yq|cx1n~&k$(mc&xORi zDq?;7ut#^}w3^ndGP7M|B9_!1d^bnr_Uhod37Zw=j#)e^>)R}6IG^*i#iN)FyurCQ zQv6Ic#U*Y`?UL_XUwqYY!^L@7yX+14kI5^WO^Os~-#9P!`7!0~j&mOr#I1X9q3=hY zabm1qTi4ntuO9BaH@nE?*W)XnYkf~uD2AMwyMuZAbj4>+86^$>T`A!Y_q9)obGTN_ z(l=vm)}dFA{U&}*uVcJ>>_4Ljhs3G72CEx@sY|lNHKN2hKQ}iuuY|$5C^fMpHASI3 zvm`^o-P1Q9ypc~Fs7Mv0C g{0WMN-29Zxv`X9>4A1pP05vdpy85}Sb4q9e0JQXDe*gdg literal 0 HcmV?d00001