From 481c18d6fff3d90ec3ae9740c1ee820a4ec0e230 Mon Sep 17 00:00:00 2001 From: "bsongis@gmail.com" Date: Tue, 7 May 2013 08:46:31 +0000 Subject: [PATCH] [Taranis] SMALL font updated for timer switches --- src/Makefile | 3 ++- src/bitmaps/font_small_extra.lbm | 1 + src/bitmaps/font_small_extra.xbm | 6 ++++++ src/lcd.cpp | 4 ++-- src/targets/taranis/trainer_driver.cpp | 1 + src/translations.cpp | 5 +++++ src/translations.h | 1 + 7 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 src/bitmaps/font_small_extra.lbm create mode 100644 src/bitmaps/font_small_extra.xbm diff --git a/src/Makefile b/src/Makefile index 34746e6ec..52fff10ac 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1036,7 +1036,7 @@ arm-stamp: @echo "#define SVN_VERS \"opentx-r$(SVNREV)\"" >> stamp-opentx-arm.txt @cat stamp-opentx-arm.txt -bitmaps/font.lbm: bitmaps/font.xbm bitmaps/font_extra.xbm bitmaps/font_tiny.xbm bitmaps/font_small.xbm bitmaps/font_midsize.xbm bitmaps/font_dblsize.xbm bitmaps/font_dblsize_extra.xbm translations/font_se.xbm translations/font_de.xbm translations/font_it.xbm translations/font_cz.xbm translations/font_fr.xbm translations/font_es.xbm translations/font_dblsize_se.xbm translations/font_dblsize_de.xbm translations/font_dblsize_it.xbm translations/font_dblsize_fr.xbm translations/font_dblsize_es.xbm +bitmaps/font.lbm: bitmaps/font.xbm bitmaps/font_extra.xbm bitmaps/font_tiny.xbm bitmaps/font_small.xbm bitmaps/font_midsize.xbm bitmaps/font_dblsize.xbm bitmaps/font_dblsize_extra.xbm bitmaps/font_small_extra.xbm translations/font_se.xbm translations/font_de.xbm translations/font_it.xbm translations/font_cz.xbm translations/font_fr.xbm translations/font_es.xbm translations/font_dblsize_se.xbm translations/font_dblsize_de.xbm translations/font_dblsize_it.xbm translations/font_dblsize_fr.xbm translations/font_dblsize_es.xbm @echo @echo "Convert fonts from xbm to lbm:" $(IMG2LBM) bitmaps/font.xbm bitmaps/font.lbm 5x7 @@ -1046,6 +1046,7 @@ bitmaps/font.lbm: bitmaps/font.xbm bitmaps/font_extra.xbm bitmaps/font_tiny.xbm $(IMG2LBM) bitmaps/font_midsize.xbm bitmaps/font_midsize.lbm 8x10 $(IMG2LBM) bitmaps/font_dblsize.xbm bitmaps/font_dblsize.lbm 10x14 $(IMG2LBM) bitmaps/font_dblsize_extra.xbm bitmaps/font_dblsize_extra.lbm 10x14 + $(IMG2LBM) bitmaps/font_small_extra.xbm bitmaps/font_small_extra.lbm 4x6 $(IMG2LBM) translations/font_se.xbm translations/font_se.lbm 5x7 $(IMG2LBM) translations/font_de.xbm translations/font_de.lbm 5x7 $(IMG2LBM) translations/font_it.xbm translations/font_it.lbm 5x7 diff --git a/src/bitmaps/font_small_extra.lbm b/src/bitmaps/font_small_extra.lbm new file mode 100644 index 000000000..cce1e9d68 --- /dev/null +++ b/src/bitmaps/font_small_extra.lbm @@ -0,0 +1 @@ +0x04,0x02,0x3b,0x02,0x04,0x08,0x10,0x37,0x10,0x08,0x20,0x12,0x0a,0x02,0x1e,0x02,0x24,0x28,0x20,0x3c,0x3c,0x20,0x28,0x24,0x02,0x1e,0x02,0x0a,0x12,0x20, diff --git a/src/bitmaps/font_small_extra.xbm b/src/bitmaps/font_small_extra.xbm new file mode 100644 index 000000000..b88c68b98 --- /dev/null +++ b/src/bitmaps/font_small_extra.xbm @@ -0,0 +1,6 @@ +#define font_small_extra_width 30 +#define font_small_extra_height 7 +static unsigned char font_small_extra_bits[] = { + 0x84, 0x00, 0x00, 0x00, 0x8e, 0xf8, 0x00, 0x1f, 0x91, 0x40, 0x99, 0x02, + 0x24, 0x52, 0x5a, 0x0a, 0xc4, 0x49, 0x18, 0x12, 0x84, 0x04, 0xff, 0x20, + 0x00, 0x00, 0x00, 0x00 }; diff --git a/src/lcd.cpp b/src/lcd.cpp index 52c6538d6..1bb7d7ae1 100644 --- a/src/lcd.cpp +++ b/src/lcd.cpp @@ -136,7 +136,7 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags) q = &font_8x10[((uint16_t)c-0x20)*16]; for (int8_t i=9; i>=0; i--) { uint8_t b1=0, b2=0; - if (flags & CONDENSED && i<=1) break; + if ((flags & CONDENSED) && i<=1) break; if (i!=0 && i!=9) { b1 = pgm_read_byte(q++); /*top byte*/ b2 = pgm_read_byte(q++); /*top byte*/ @@ -164,7 +164,7 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags) } } else if (flags & SMLSIZE) { - q = &font_4x6[((uint16_t)c-0x20)*5+4]; + q = (c < 0xC0) ? &font_4x6[(c-0x20)*5+4] : &font_4x6_extra[(c-0xC0)*5+4]; uint8_t ym8 = (y & 0x07); p += 4; for (int8_t i=4; i>=0; i--) { diff --git a/src/targets/taranis/trainer_driver.cpp b/src/targets/taranis/trainer_driver.cpp index 0bc63d392..4f9b79b4d 100644 --- a/src/targets/taranis/trainer_driver.cpp +++ b/src/targets/taranis/trainer_driver.cpp @@ -38,6 +38,7 @@ uint8_t currentTrainerMode; uint16_t * TrainerPulsePtr; +extern uint16_t ppmStream[NUM_MODULES+1][20]; #define setupTrainerPulses() setupPulsesPPM(TRAINER_MODULE) diff --git a/src/translations.cpp b/src/translations.cpp index f27cee35d..95f695d0c 100644 --- a/src/translations.cpp +++ b/src/translations.cpp @@ -497,5 +497,10 @@ const pm_uchar font_5x7_extra[] PROGMEM = { const pm_uchar font_10x14_extra[] PROGMEM = { #include "bitmaps/font_dblsize_extra.lbm" }; + +const pm_uchar font_4x6_extra[] PROGMEM = { +#include "bitmaps/font_small_extra.lbm" +}; + #endif diff --git a/src/translations.h b/src/translations.h index 58f02e93f..ec49f1652 100644 --- a/src/translations.h +++ b/src/translations.h @@ -499,6 +499,7 @@ extern const pm_uchar font_4x6[]; extern const pm_uchar font_8x10[]; extern const pm_uchar font_5x7_extra[]; extern const pm_uchar font_10x14_extra[]; +extern const pm_uchar font_4x6_extra[]; #endif extern const pm_char STR_WARNING[];