diff --git a/cmake/Bitmaps.cmake b/cmake/Bitmaps.cmake index 94d5baa19..398e72ca7 100644 --- a/cmake/Bitmaps.cmake +++ b/cmake/Bitmaps.cmake @@ -43,7 +43,7 @@ macro(add_truetype_font_target name size subset effect) OUTPUT ${target}.png ${target}.specs ${target}.lbm COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/build-font-bitmap.py --subset ${subset} --size ${size} --font ${font} --cjk-font ${cjk_font} --output ${target} COMMAND ${PYTHON_EXECUTABLE} ${LIBOPENUI_TOOLS_DIR}/encode-bitmap.py --format 8bits --rle --size-format 2 ${target}.png ${target}.lbm - DEPENDS ${TOOLS_DIR}/build-font-bitmap.py ${TOOLS_DIR}/charset.py ${LIBOPENUI_TOOLS_DIR}/encode-bitmap.py ${RADIO_SRC_DIR}/translations/cn.h.txt + DEPENDS ${TOOLS_DIR}/build-font-bitmap.py ${TOOLS_DIR}/charset.py ${LIBOPENUI_TOOLS_DIR}/encode-bitmap.py ${RADIO_SRC_DIR}/translations/cn.h.txt ${RADIO_SRC_DIR}/fonts/extra_${size}px.png ) add_custom_target(truetype_font_${name} DEPENDS ${target}.png ${target}.specs) set(truetype_fonts_targets ${truetype_fonts_targets} truetype_font_${name}) diff --git a/radio/src/fonts/extra_13px.png b/radio/src/fonts/extra_13px.png new file mode 100644 index 000000000..cbeb4758e Binary files /dev/null and b/radio/src/fonts/extra_13px.png differ diff --git a/radio/src/fonts/extra_15px.png b/radio/src/fonts/extra_15px.png new file mode 100644 index 000000000..cbeb4758e Binary files /dev/null and b/radio/src/fonts/extra_15px.png differ diff --git a/radio/src/fonts/extra_16px.png b/radio/src/fonts/extra_16px.png index a687b11f0..c036198a0 100644 Binary files a/radio/src/fonts/extra_16px.png and b/radio/src/fonts/extra_16px.png differ diff --git a/radio/src/fonts/extra_24px.png b/radio/src/fonts/extra_24px.png new file mode 100644 index 000000000..cbeb4758e Binary files /dev/null and b/radio/src/fonts/extra_24px.png differ diff --git a/radio/src/fonts/extra_32px.png b/radio/src/fonts/extra_32px.png new file mode 100644 index 000000000..cbeb4758e Binary files /dev/null and b/radio/src/fonts/extra_32px.png differ diff --git a/radio/src/fonts/extra_64px.png b/radio/src/fonts/extra_64px.png new file mode 100644 index 000000000..cbeb4758e Binary files /dev/null and b/radio/src/fonts/extra_64px.png differ diff --git a/radio/src/fonts/extra_9px.png b/radio/src/fonts/extra_9px.png new file mode 100644 index 000000000..cbeb4758e Binary files /dev/null and b/radio/src/fonts/extra_9px.png differ diff --git a/radio/src/gui/colorlcd/model_outputs.cpp b/radio/src/gui/colorlcd/model_outputs.cpp index 586451681..0c9cb54c3 100644 --- a/radio/src/gui/colorlcd/model_outputs.cpp +++ b/radio/src/gui/colorlcd/model_outputs.cpp @@ -125,7 +125,7 @@ class OutputLineButton : public Button { dc->drawNumber(68, FIELD_PADDING_TOP, output->max + 1000, PREC1); dc->drawNumber(132, FIELD_PADDING_TOP, output->offset, PREC1); dc->drawNumber(226, FIELD_PADDING_TOP, PPM_CENTER + output->ppmCenter, RIGHT); - dc->drawText(228, FIELD_PADDING_TOP - 3, output->symetrical ? "=" : "\306"); + dc->drawText(228, FIELD_PADDING_TOP, output->symetrical ? "=" : "\306"); // second line if (output->revert) {