diff --git a/radio/src/Makefile b/radio/src/Makefile index 79b46b259..289049eb9 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -1080,7 +1080,7 @@ ifeq ($(PCB), FLAMENCO) OPT = 2 CPPDEFS += -DHSE_VALUE=12000000 -DCOLORLCD -DSTM32F40_41xxx BITMAPS += $(patsubst %.png,%.lbm,$(wildcard bitmaps/Flamenco/*.png)) - FONTS = fonts/font_stdsize.lbm fonts/font_tinsize.lbm fonts/font_smlsize.lbm fonts/font_midsize.lbm fonts/font_dblsize.lbm fonts/font_xxlsize.lbm + FONTS = fonts/Flamenco/font_stdsize.lbm fonts/Flamenco/font_tinsize.lbm fonts/Flamenco/font_smlsize.lbm fonts/Flamenco/font_midsize.lbm fonts/Flamenco/font_dblsize.lbm fonts/Flamenco/font_xxlsize.lbm SDCARD = YES THR_TRACE = YES EXT = FRSKY_SPORT @@ -1202,7 +1202,7 @@ ifeq ($(PCB), HORUS) OPT = 2 CPPDEFS += -DHSE_VALUE=12000000 -DCOLORLCD -DSTM32F429_439xx BITMAPS += $(patsubst %.png,%.lbm,$(wildcard bitmaps/Horus/*.png)) - FONTS = fonts/font_stdsize.lbm fonts/font_tinsize.lbm fonts/font_smlsize.lbm fonts/font_midsize.lbm fonts/font_dblsize.lbm fonts/font_xxlsize.lbm + FONTS = fonts/Horus/font_stdsize.lbm fonts/Horus/font_tinsize.lbm fonts/Horus/font_smlsize.lbm fonts/Horus/font_midsize.lbm fonts/Horus/font_dblsize.lbm fonts/Horus/font_xxlsize.lbm SDCARD = YES THR_TRACE = YES EXT = FRSKY_SPORT @@ -1844,6 +1844,7 @@ translations/se.h: translations/se.h.txt $(TRANSLATE) translations/se.h.txt translations/se.h se ifeq ($(PCB), $(filter $(PCB), HORUS)) + FONTDIR = Horus FONTNAME = DejaVu\ Sans TINSIZE = 9 SMLSIZE = 13 @@ -1854,6 +1855,7 @@ ifeq ($(PCB), $(filter $(PCB), HORUS)) XXLSIZE = 48 MASKFORMAT = 8bits else + FONTDIR = Flamenco FONTNAME = Roboto TINSIZE = 5 SMLSIZE = 7 @@ -1868,26 +1870,26 @@ endif .PHONY: fonts fonts: $(FONTS) -fonts/font_%size.lbm: fonts/font_%size.png +fonts/$(FONTDIR)/font_%size.lbm: fonts/$(FONTDIR)/font_%size.png $(IMG2LBM) $^ $@ $(LCDSIZE) $(MASKFORMAT) -fonts/font_tinsize.png: - $(FONT2PNG) $(FONTNAME) $(TINSIZE) False fonts/font_tinsize +fonts/$(FONTDIR)/font_tinsize.png: + $(FONT2PNG) $(FONTNAME) $(TINSIZE) False fonts/$(FONTDIR)/font_tinsize -fonts/font_smlsize.png: - $(FONT2PNG) $(FONTNAME) $(SMLSIZE) False fonts/font_smlsize +fonts/$(FONTDIR)/font_smlsize.png: + $(FONT2PNG) $(FONTNAME) $(SMLSIZE) False fonts/$(FONTDIR)/font_smlsize -fonts/font_stdsize.png: - $(FONT2PNG) $(FONTNAME) $(STDSIZE) False fonts/font_stdsize +fonts/$(FONTDIR)/font_stdsize.png: + $(FONT2PNG) $(FONTNAME) $(STDSIZE) False fonts/$(FONTDIR)/font_stdsize -fonts/font_midsize.png: - $(FONT2PNG) $(FONTNAME) $(MIDSIZE) False fonts/font_midsize +fonts/$(FONTDIR)/font_midsize.png: + $(FONT2PNG) $(FONTNAME) $(MIDSIZE) False fonts/$(FONTDIR)/font_midsize -fonts/font_dblsize.png: - $(FONT2PNG) $(FONTNAME) $(DBLSIZE) $(DBLBOLD) fonts/font_dblsize +fonts/$(FONTDIR)/font_dblsize.png: + $(FONT2PNG) $(FONTNAME) $(DBLSIZE) $(DBLBOLD) fonts/$(FONTDIR)/font_dblsize -fonts/font_xxlsize.png: - $(FONT2PNG) $(FONTNAME) $(XXLSIZE) False fonts/font_xxlsize +fonts/$(FONTDIR)/font_xxlsize.png: + $(FONT2PNG) $(FONTNAME) $(XXLSIZE) False fonts/$(FONTDIR)/font_xxlsize fonts/%.lbm: fonts/%.png $(IMG2LBM) $^ $@ $(LCDSIZE) @@ -2096,12 +2098,8 @@ clean_list : $(REMOVE) allsrc.cpp $(REMOVE) allsimusrc.cpp $(REMOVE) stamp-opentx.h - $(REMOVE) *.lbm $(REMOVE) bitmaps/*.lbm $(REMOVE) bitmaps/*/*.lbm - $(REMOVE) bitmaps/*/*/*.lbm - $(REMOVE) fonts/*.lbm - $(REMOVE) fonts/font_* $(REMOVE) fonts/*/*.lbm $(REMOVE) lua_exports* lua_fields.txt $(MAKE) -C targets/Taranis/bootloader clean diff --git a/radio/src/fonts/Horus/font_dblsize.png b/radio/src/fonts/Horus/font_dblsize.png new file mode 100644 index 000000000..d617ab223 Binary files /dev/null and b/radio/src/fonts/Horus/font_dblsize.png differ diff --git a/radio/src/fonts/Horus/font_dblsize.specs b/radio/src/fonts/Horus/font_dblsize.specs new file mode 100644 index 000000000..8129cf4ed --- /dev/null +++ b/radio/src/fonts/Horus/font_dblsize.specs @@ -0,0 +1 @@ +{ 0,4,14,28,54,76,110,139,146,160,173,193,217,228,242,251,266,289,310,331,352,375,397,420,441,464,487,497,508,532,556,580,598,613,641,665,689,715,736,757,783,808,818,832,859,880,910,935,963,987,1015,1040,1062,1087,1112,1140,1178,1206,1234,1258,1272,1287,1300,1324,1343,1356,1378,1401,1420,1443,1466,1484,1507,1529,1539,1553,1576,1586,1618,1640,1663,1686,1709,1726,1746,1764,1786,1810,1841,1865,1889,1909,1933,1936,1960,1988,2015,2033,2051,2074,2097,2120,2143,2171 } \ No newline at end of file diff --git a/radio/src/fonts/Horus/font_midsize.png b/radio/src/fonts/Horus/font_midsize.png new file mode 100644 index 000000000..f1bc88d93 Binary files /dev/null and b/radio/src/fonts/Horus/font_midsize.png differ diff --git a/radio/src/fonts/Horus/font_midsize.specs b/radio/src/fonts/Horus/font_midsize.specs new file mode 100644 index 000000000..7244eaedd --- /dev/null +++ b/radio/src/fonts/Horus/font_midsize.specs @@ -0,0 +1 @@ +{ 0,4,10,20,41,56,80,100,106,115,125,140,159,167,177,184,196,212,227,242,258,274,290,306,322,338,354,361,369,388,407,426,440,451,471,487,505,524,539,553,572,589,595,605,623,638,658,675,695,710,730,747,763,782,799,819,845,864,883,901,910,922,931,950,967,976,991,1006,1020,1036,1052,1064,1080,1095,1101,1110,1125,1131,1154,1169,1185,1200,1216,1227,1241,1253,1268,1285,1306,1323,1340,1354,1373,1376,1395,1416,1437,1452,1467,1484,1501,1518,1535,1557 } \ No newline at end of file diff --git a/radio/src/fonts/Horus/font_smlsize.png b/radio/src/fonts/Horus/font_smlsize.png new file mode 100644 index 000000000..338e064bb Binary files /dev/null and b/radio/src/fonts/Horus/font_smlsize.png differ diff --git a/radio/src/fonts/Horus/font_smlsize.specs b/radio/src/fonts/Horus/font_smlsize.specs new file mode 100644 index 000000000..3e3184a10 --- /dev/null +++ b/radio/src/fonts/Horus/font_smlsize.specs @@ -0,0 +1 @@ +{ 0,4,8,13,23,31,44,55,58,63,67,75,85,88,94,97,103,112,120,128,137,146,154,163,171,180,189,192,195,205,215,225,232,238,248,256,266,276,284,291,301,310,313,318,327,335,345,354,365,373,384,393,402,412,421,431,445,455,465,475,479,485,489,499,508,513,521,529,537,546,555,561,570,578,581,586,594,597,609,617,626,634,643,649,657,663,671,680,692,701,710,718,728,729,739,751,763,771,779,789,799,809,819,830 } \ No newline at end of file diff --git a/radio/src/fonts/Horus/font_stdsize.png b/radio/src/fonts/Horus/font_stdsize.png new file mode 100644 index 000000000..02cdc8284 Binary files /dev/null and b/radio/src/fonts/Horus/font_stdsize.png differ diff --git a/radio/src/fonts/Horus/font_stdsize.specs b/radio/src/fonts/Horus/font_stdsize.specs new file mode 100644 index 000000000..fe043dfda --- /dev/null +++ b/radio/src/fonts/Horus/font_stdsize.specs @@ -0,0 +1 @@ +{ 0,4,7,13,26,35,51,63,66,71,76,85,97,101,107,111,118,128,137,146,155,166,175,185,194,204,214,218,222,234,246,258,266,273,285,295,307,319,329,338,351,362,366,372,383,392,405,416,429,439,452,463,473,485,496,508,525,537,549,561,566,573,578,590,601,607,617,627,636,646,656,663,673,682,685,690,700,703,718,727,737,747,757,764,773,780,789,799,813,823,833,842,854,855,867,881,895,904,913,924,935,946,957,971, 986, 1001, 1016, 1031, 1046, 1061, 1076, 1091, 1106, 1121, 1136, 1151, 1166 } \ No newline at end of file diff --git a/radio/src/fonts/Horus/font_tinsize.png b/radio/src/fonts/Horus/font_tinsize.png new file mode 100644 index 000000000..be586e835 Binary files /dev/null and b/radio/src/fonts/Horus/font_tinsize.png differ diff --git a/radio/src/fonts/Horus/font_tinsize.specs b/radio/src/fonts/Horus/font_tinsize.specs new file mode 100644 index 000000000..2fbef2d86 --- /dev/null +++ b/radio/src/fonts/Horus/font_tinsize.specs @@ -0,0 +1 @@ +{ 0,4,7,12,20,26,36,44,47,51,55,61,69,72,76,79,84,91,97,103,109,116,122,129,135,142,149,151,154,162,170,178,184,189,197,204,211,219,226,232,240,247,250,254,262,268,276,283,291,298,306,313,320,328,335,343,353,360,368,375,379,384,388,396,403,407,413,420,426,432,439,444,450,456,459,463,470,473,482,488,495,502,508,513,519,524,530,537,545,552,559,565,573,574,582,591,600,606,612,619,626,633,640,648 } \ No newline at end of file diff --git a/radio/src/fonts/Horus/font_xxlsize.png b/radio/src/fonts/Horus/font_xxlsize.png new file mode 100644 index 000000000..f9752d0a8 Binary files /dev/null and b/radio/src/fonts/Horus/font_xxlsize.png differ diff --git a/radio/src/fonts/Horus/font_xxlsize.specs b/radio/src/fonts/Horus/font_xxlsize.specs new file mode 100644 index 000000000..b3c0b02d3 --- /dev/null +++ b/radio/src/fonts/Horus/font_xxlsize.specs @@ -0,0 +1 @@ +{ 0,4,12,29,66,93,137,173,181,195,210,235,269,280,296,305,325,353,378,404,431,460,487,515,542,570,598,607,618,652,686,720,743,762,798,827,859,893,920,944,979,1010,1019,1035,1067,1093,1129,1160,1197,1224,1261,1292,1320,1354,1384,1420,1468,1502,1536,1568,1582,1602,1616,1650,1679,1695,1722,1749,1774,1802,1830,1850,1878,1904,1912,1925,1952,1960,2002,2028,2056,2083,2111,2130,2154,2174,2200,2229,2268,2297,2326,2351,2385,2388,2422,2461,2500,2525,2550,2581,2612,2643,2674,2714 } \ No newline at end of file diff --git a/radio/src/gui/Horus/fonts.cpp b/radio/src/gui/Horus/fonts.cpp index 2854108b8..08b9ca28b 100644 --- a/radio/src/gui/Horus/fonts.cpp +++ b/radio/src/gui/Horus/fonts.cpp @@ -37,51 +37,51 @@ #include "../../opentx.h" const uint16_t font_tinsize_specs[] PROGMEM = -#include "fonts/font_tinsize.specs" +#include "fonts/Horus/font_tinsize.specs" ; const pm_uchar font_tinsize[] PROGMEM = { -#include "fonts/font_tinsize.lbm" +#include "fonts/Horus/font_tinsize.lbm" }; const uint16_t font_smlsize_specs[] PROGMEM = -#include "fonts/font_smlsize.specs" +#include "fonts/Horus/font_smlsize.specs" ; const pm_uchar font_smlsize[] PROGMEM = { -#include "fonts/font_smlsize.lbm" +#include "fonts/Horus/font_smlsize.lbm" }; const uint16_t font_stdsize_specs[] PROGMEM = -#include "fonts/font_stdsize.specs" +#include "fonts/Horus/font_stdsize.specs" ; const pm_uchar font_stdsize[] PROGMEM = { -#include "fonts/font_stdsize.lbm" +#include "fonts/Horus/font_stdsize.lbm" }; const uint16_t font_midsize_specs[] PROGMEM = -#include "fonts/font_midsize.specs" +#include "fonts/Horus/font_midsize.specs" ; const pm_uchar font_midsize[] PROGMEM = { -#include "fonts/font_midsize.lbm" +#include "fonts/Horus/font_midsize.lbm" }; const uint16_t font_dblsize_specs[] PROGMEM = -#include "fonts/font_dblsize.specs" +#include "fonts/Horus/font_dblsize.specs" ; const pm_uchar font_dblsize[] PROGMEM = { -#include "fonts/font_dblsize.lbm" +#include "fonts/Horus/font_dblsize.lbm" }; const uint16_t font_xxlsize_specs[] PROGMEM = -#include "fonts/font_xxlsize.specs" +#include "fonts/Horus/font_xxlsize.specs" ; const pm_uchar font_xxlsize[] PROGMEM = { -#include "fonts/font_xxlsize.lbm" +#include "fonts/Horus/font_xxlsize.lbm" }; const uint16_t *fontspecsTable[16] = { font_stdsize_specs, font_tinsize_specs, font_smlsize_specs, font_midsize_specs, font_dblsize_specs, font_xxlsize_specs };