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 000000000..ed3d41cc8 Binary files /dev/null and b/radio/src/fonts/sqt5/font_03x05.png differ diff --git a/radio/src/fonts/sqt5/font_04x06_extra.png b/radio/src/fonts/sqt5/font_04x06_extra.png new file mode 100644 index 000000000..c8df54ee0 Binary files /dev/null and b/radio/src/fonts/sqt5/font_04x06_extra.png differ 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 000000000..e71a06b47 Binary files /dev/null and b/radio/src/fonts/sqt5/font_05x07_extra.png differ diff --git a/radio/src/fonts/sqt5/font_10x14_extra.png b/radio/src/fonts/sqt5/font_10x14_extra.png new file mode 100644 index 000000000..5050a46e6 Binary files /dev/null and b/radio/src/fonts/sqt5/font_10x14_extra.png differ diff --git a/radio/src/fonts/sqt5/font_22x38_num.png b/radio/src/fonts/sqt5/font_22x38_num.png new file mode 100644 index 000000000..9f6f82fdf Binary files /dev/null and b/radio/src/fonts/sqt5/font_22x38_num.png differ