piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

SQT5 Font option added

Browse Source 
Please check if I done It right
This commit is contained in:
mhotar@gmail.com
2013-07-31 23:00:53 +00:00
parent 4e100c542d
commit 381b786025
17 changed files with 187 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile
+54 -1
View File
@@ -134,6 +134,10 @@ GRAPHICS = YES
BOLD = YES
BATTGRAPH = NO
# FONT TYPE
# Values = STD, SQT5
FONT = STD
# PPM center adjustable
# Values = YES, NO
PPM_CENTER_ADJUSTABLE = NO
@@ -763,6 +767,10 @@ ifneq ($(PCB), TARANIS)
CPPDEFS += -DBATTGRAPH
endif
endif
ifneq ($(FONT), STD)
CPPDEFS += -DFONT_$(FONT)
endif
ifeq ($(THR_TRACE), YES)
CPPDEFS += -DTHRTRACE
@@ -1036,7 +1044,7 @@ else
endif
tra: translations/se.h
lbm: fonts/std/font_05x07.lbm bitmaps/sticks.lbm
lbm: fonts/std/font_05x07.lbm fonts/sqt5/font_05x07.lbm bitmaps/sticks.lbm
elf: $(TARGET).elf
bin: $(TARGET).bin
@@ -1109,6 +1117,50 @@ translations/se.h: translations/cz.h.txt translations/de.h.txt translations/es.h
@echo "Swedish"
$(TRANSLATE) translations/se.h.txt translations/se.h se
ifeq ($(FONT), SQT5)
fonts/sqt5/font_05x07.lbm: fonts/std/font_03x05.png fonts/sqt5/font_04x06.png fonts/sqt5/font_05x07.png fonts/sqt5/font_08x10.png fonts/sqt5/font_10x14.png fonts/sqt5/font_10x14_compressed.png fonts/std/font_04x06_extra.png fonts/std/font_05x07_extra.png fonts/std/font_10x14_extra.png fonts/sqt5/font_cz_04x06.png fonts/sqt5/font_cz_05x07.png fonts/sqt5/font_cz_08x10.png fonts/sqt5/font_cz_10x14.png fonts/std/font_de_04x06.png fonts/std/font_de_05x07.png fonts/std/font_de_08x10.png fonts/std/font_de_10x14.png fonts/std/font_es_04x06.png fonts/std/font_es_05x07.png fonts/std/font_es_08x10.png fonts/std/font_es_10x14.png fonts/std/font_fr_04x06.png fonts/std/font_fr_05x07.png fonts/std/font_fr_08x10.png fonts/std/font_fr_10x14.png fonts/std/font_it_04x06.png fonts/std/font_it_05x07.png fonts/std/font_it_08x10.png fonts/std/font_it_10x14.png fonts/std/font_se_04x06.png fonts/std/font_se_05x07.png fonts/std/font_se_08x10.png fonts/std/font_se_10x14.png
@echo
@echo "Convert SQT5 fonts from png to lbm:"
$(IMG2LBM) fonts/std/font_03x05.png fonts/std/font_03x05.lbm 3x5
$(IMG2LBM) fonts/sqt5/font_04x06.png fonts/sqt5/font_04x06.lbm 4x6
$(IMG2LBM) fonts/sqt5/font_05x07.png fonts/sqt5/font_05x07.lbm 5x7
$(IMG2LBM) fonts/sqt5/font_08x10.png fonts/sqt5/font_08x10.lbm 8x10
$(IMG2LBM) fonts/sqt5/font_10x14.png fonts/sqt5/font_10x14.lbm 10x14
$(IMG2LBM) fonts/sqt5/font_10x14_compressed.png fonts/sqt5/font_10x14_compressed.lbm 10x14
$(IMG2LBM) fonts/std/font_04x06_extra.png fonts/std/font_04x06_extra.lbm 4x6
$(IMG2LBM) fonts/std/font_05x07_extra.png fonts/std/font_05x07_extra.lbm 5x7
$(IMG2LBM) fonts/std/font_10x14_extra.png fonts/std/font_10x14_extra.lbm 10x14
$(IMG2LBM) fonts/sqt5/font_cz_04x06.png fonts/sqt5/font_cz_04x06.lbm 4x6
$(IMG2LBM) fonts/sqt5/font_cz_05x07.png fonts/sqt5/font_cz_05x07.lbm 5x7
$(IMG2LBM) fonts/sqt5/font_cz_08x10.png fonts/sqt5/font_cz_08x10.lbm 8x10
$(IMG2LBM) fonts/sqt5/font_cz_10x14.png fonts/sqt5/font_cz_10x14.lbm 10x14
$(IMG2LBM) fonts/std/font_de_04x06.png fonts/std/font_de_04x06.lbm 4x6
$(IMG2LBM) fonts/std/font_de_05x07.png fonts/std/font_de_05x07.lbm 5x7
$(IMG2LBM) fonts/std/font_de_08x10.png fonts/std/font_de_08x10.lbm 8x10
$(IMG2LBM) fonts/std/font_de_10x14.png fonts/std/font_de_10x14.lbm 10x14
$(IMG2LBM) fonts/std/font_es_04x06.png fonts/std/font_es_04x06.lbm 4x6
$(IMG2LBM) fonts/std/font_es_05x07.png fonts/std/font_es_05x07.lbm 5x7
$(IMG2LBM) fonts/std/font_es_08x10.png fonts/std/font_es_08x10.lbm 8x10
$(IMG2LBM) fonts/std/font_es_10x14.png fonts/std/font_es_10x14.lbm 10x14
$(IMG2LBM) fonts/std/font_fr_04x06.png fonts/std/font_fr_04x06.lbm 4x6
$(IMG2LBM) fonts/std/font_fr_05x07.png fonts/std/font_fr_05x07.lbm 5x7
$(IMG2LBM) fonts/std/font_fr_08x10.png fonts/std/font_fr_08x10.lbm 8x10
$(IMG2LBM) fonts/std/font_fr_10x14.png fonts/std/font_fr_10x14.lbm 10x14
$(IMG2LBM) fonts/std/font_it_04x06.png fonts/std/font_it_04x06.lbm 4x6
$(IMG2LBM) fonts/std/font_it_05x07.png fonts/std/font_it_05x07.lbm 5x7
$(IMG2LBM) fonts/std/font_it_08x10.png fonts/std/font_it_08x10.lbm 8x10
$(IMG2LBM) fonts/std/font_it_10x14.png fonts/std/font_it_10x14.lbm 10x14
$(IMG2LBM) fonts/std/font_pt_04x06.png fonts/std/font_pt_04x06.lbm 4x6
$(IMG2LBM) fonts/std/font_pt_05x07.png fonts/std/font_pt_05x07.lbm 5x7
$(IMG2LBM) fonts/std/font_pt_08x10.png fonts/std/font_pt_08x10.lbm 8x10
$(IMG2LBM) fonts/std/font_pt_10x14.png fonts/std/font_pt_10x14.lbm 10x14
$(IMG2LBM) fonts/std/font_se_04x06.png fonts/std/font_se_04x06.lbm 4x6
$(IMG2LBM) fonts/std/font_se_05x07.png fonts/std/font_se_05x07.lbm 5x7
$(IMG2LBM) fonts/std/font_se_08x10.png fonts/std/font_se_08x10.lbm 8x10
$(IMG2LBM) fonts/std/font_se_10x14.png fonts/std/font_se_10x14.lbm 10x14
else
fonts/std/font_05x07.lbm: fonts/std/font_03x05.png fonts/std/font_04x06.png fonts/std/font_05x07.png fonts/std/font_08x10.png fonts/std/font_10x14.png fonts/std/font_10x14_compressed.png fonts/std/font_04x06_extra.png fonts/std/font_05x07_extra.png fonts/std/font_10x14_extra.png fonts/std/font_cz_04x06.png fonts/std/font_cz_05x07.png fonts/std/font_cz_08x10.png fonts/std/font_cz_10x14.png fonts/std/font_de_04x06.png fonts/std/font_de_05x07.png fonts/std/font_de_08x10.png fonts/std/font_de_10x14.png fonts/std/font_es_04x06.png fonts/std/font_es_05x07.png fonts/std/font_es_08x10.png fonts/std/font_es_10x14.png fonts/std/font_fr_04x06.png fonts/std/font_fr_05x07.png fonts/std/font_fr_08x10.png fonts/std/font_fr_10x14.png fonts/std/font_it_04x06.png fonts/std/font_it_05x07.png fonts/std/font_it_08x10.png fonts/std/font_it_10x14.png fonts/std/font_se_04x06.png fonts/std/font_se_05x07.png fonts/std/font_se_08x10.png fonts/std/font_se_10x14.png
@echo
@@ -1150,6 +1202,7 @@ fonts/std/font_05x07.lbm: fonts/std/font_03x05.png fonts/std/font_04x06.png font
$(IMG2LBM) fonts/std/font_se_05x07.png fonts/std/font_se_05x07.lbm 5x7
$(IMG2LBM) fonts/std/font_se_08x10.png fonts/std/font_se_08x10.lbm 8x10
$(IMG2LBM) fonts/std/font_se_10x14.png fonts/std/font_se_10x14.lbm 10x14
endif
bitmaps/sticks.lbm: bitmaps/sticks_4x1.xbm bitmaps/splash_9x.xbm bitmaps/splash_taranis.png bitmaps/logo_taranis.bmp bitmaps/icons.png bitmaps/asterisk.xbm bitmaps/about_9x.png bitmaps/about_taranis.png bitmaps/asterisk_4bits.png
@echo