From caaba0ab3ff3d401b8aec8d2ec7777bea3dcadc6 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Fri, 29 Jun 2018 09:56:17 +0200 Subject: [PATCH 1/4] img2lbm: added RLE encoding for 1bit, 4bit & 8bit formats MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RLE encoding is triggered by using an output filename with “.rle” extension. --- radio/util/img2lbm.py | 95 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 78 insertions(+), 17 deletions(-) diff --git a/radio/util/img2lbm.py b/radio/util/img2lbm.py index 341502e00..800b9735e 100755 --- a/radio/util/img2lbm.py +++ b/radio/util/img2lbm.py @@ -3,12 +3,60 @@ from __future__ import division, print_function import sys +import os.path from PIL import Image -image = Image.open(sys.argv[1]) -width, height = image.size +class RLE_encoder: + RLE_BYTE = 0 + RLE_SEQ = 1 -image_fmt = image.format + def __init__(self, out): + self.state = self.RLE_BYTE + self.count = 0 + self.prev_byte = None + self.out = out + + def eq_prev_byte(self, in_byte): + if self.prev_byte is None: + return False + return in_byte == self.prev_byte + + def encode_byte(self, in_byte): + + if self.state == self.RLE_BYTE: + self.out(in_byte) + if self.eq_prev_byte(in_byte): + self.state = self.RLE_SEQ + self.count = 0 + else: + self.prev_byte = in_byte + + elif self.state == self.RLE_SEQ: + if self.eq_prev_byte(in_byte): + self.count += 1 + if self.count == 255: + self.out(self.count) + self.prev_byte = None + self.state = self.RLE_BYTE + else: + self.out(self.count) + self.out(in_byte) + self.prev_byte = in_byte + self.state = self.RLE_BYTE + + def encode_end(self): + if self.state == self.RLE_SEQ: + self.out(self.count) + +class dummy_encoder: + def __init__(self, out): + self.out = out + + def encode_byte(self, in_byte): + self.out(in_byte) + + def encode_end(self): + pass def writeSize(f, width, height): if lcdwidth > 255: @@ -16,8 +64,20 @@ def writeSize(f, width, height): else: f.write("%d,%d,\n" % (width, height)) +def F_writeValue(f): + def writeValue(value): + f.write("0x%02x," % value) + return writeValue -with open(sys.argv[2], "w") as f: +## MAIN ## + +image = Image.open(sys.argv[1]) +width, height = image.size + +image_fmt = image.format +output_filename = sys.argv[2] + +with open(output_filename, "w") as f: lcdwidth = int(sys.argv[3]) if len(sys.argv) > 4: @@ -28,6 +88,14 @@ with open(sys.argv[2], "w") as f: what = s break + extension = os.path.splitext(output_filename)[1] + out = F_writeValue(f) + + if extension == ".rle": + encoder = RLE_encoder(out) + else: + encoder = dummy_encoder(out) + if what == "1bit": rows = 1 if len(sys.argv) > 5: @@ -45,8 +113,9 @@ with open(sys.argv[2], "w") as f: else: if image.getpixel((x, y + z)) == 0: value += 1 << z - f.write("0x%02x," % value) + encoder.encode_byte(value) f.write("\n") + encoder.encode_end() elif what == "4/4/4/4": constant = sys.argv[2].upper()[:-4] values = [] @@ -87,15 +156,6 @@ with open(sys.argv[2], "w") as f: values.append(str(val)) f.write("const uint16_t __%s[] __ALIGNED = { %s };\n" % (constant, ",".join(values))) f.write("const Bitmap %s(BMP_RGB565, %d, %d, __%s);\n" % (constant, width, height, constant)) - # elif what == "5/6/5/8": - # colors = [] - # writeSize(f, width, height) - # for y in range(height): - # for x in range(width): - # pixel = image.pixel(x, y) - # val = ((Qt.qRed(pixel) >> 4) << 12) + ((Qt.qGreen(pixel) >> 4) << 7) + ((Qt.qBlue(pixel) >> 4) << 1) - # f.write("%d,%d,%d," % (val % 256, val // 256, Qt.qAlpha(pixel))) - # f.write("\n") elif what == "4bits": colors = [] writeSize(f, width, height) @@ -113,8 +173,9 @@ with open(sys.argv[2], "w") as f: value -= 1 << i if (gray2 & (1 << (4 + i))): value -= 1 << (4 + i) - f.write("0x%02x," % value) + encoder.encode_byte(value) f.write("\n") + encoder.encode_end() elif what == "8bits": colors = [] writeSize(f, width, height) @@ -123,8 +184,9 @@ with open(sys.argv[2], "w") as f: for x in range(width): value = image.getpixel((x, y)) value = 0x0f - (value >> 4) - f.write("0x%02x," % value) + encoder.encode_byte(value) f.write("\n") + encoder.encode_end() elif what == "03x05": image = image.convert(mode='L') for y in range(0, height, 5): @@ -173,7 +235,6 @@ with open(sys.argv[2], "w") as f: if skip and l == 8: value = 0xff f.write("0x%02x," % value) - #print ("0x%02x (%d,%d,%d)" % (value,x,y,l)) f.write("\n") elif what == "10x14": image = image.convert(mode='L') From 96afa57d84482da608d53ae8f9f8873c20fe728f Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Fri, 29 Jun 2018 17:26:04 +0200 Subject: [PATCH 2/4] use RLE compressed fonts on Horus --- radio/src/bitmaps/480x272/CMakeLists.txt | 4 +- radio/src/fonts.h | 14 +++--- radio/src/gui/480x272/fonts.cpp | 45 +++++++++++++++++-- radio/src/gui/480x272/rle.cpp | 38 ++++++++++++++++ radio/src/gui/480x272/rle.h | 7 +++ radio/src/opentx.cpp | 5 +++ .../arm/stm32/bootloader/CMakeLists.txt | 1 + radio/src/targets/horus/CMakeLists.txt | 1 + .../targets/horus/bootloader/boot_menu.cpp | 3 ++ radio/util/img2lbm.py | 2 +- 10 files changed, 106 insertions(+), 14 deletions(-) create mode 100644 radio/src/gui/480x272/rle.cpp create mode 100644 radio/src/gui/480x272/rle.h diff --git a/radio/src/bitmaps/480x272/CMakeLists.txt b/radio/src/bitmaps/480x272/CMakeLists.txt index 26cfd2d44..34a42f37c 100644 --- a/radio/src/bitmaps/480x272/CMakeLists.txt +++ b/radio/src/bitmaps/480x272/CMakeLists.txt @@ -8,7 +8,7 @@ if(PCB STREQUAL X12S) add_bitmaps_target(x12s_slider_masks "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/slider/*.png" 480 8bits) add_bitmaps_target(x12s_layouts_masks "${RADIO_SRC_DIRECTORY}/gui/480x272/layouts/*.png" 480 8bits) add_bitmaps_target(x12s_themes_bitmaps "${RADIO_SRC_DIRECTORY}/gui/480x272/themes/*.png" 480 5/6/5) - add_bitmaps_target(x12s_fonts ${RADIO_SRC_DIRECTORY}/fonts/480x272/*.png 480 8bits) + add_bitmaps_target(x12s_fonts ${RADIO_SRC_DIRECTORY}/fonts/480x272/*.png 480 8bits rle) add_bitmaps_target(x12s_volume_masks ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/volume/*.png 480 8bits) add_bitmaps_target(x12s_bootloader_bitmaps ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/bootloader/bmp_*.png 480 5/6/5) add_bitmaps_target(x12s_bootloader_icons ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/bootloader/icon_*.png 480 8bits) @@ -23,7 +23,7 @@ else() add_bitmaps_target(x10_slider_masks "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/slider/*.png" 480 8bits) add_bitmaps_target(x10_layouts_masks "${RADIO_SRC_DIRECTORY}/gui/480x272/layouts/*.png" 480 8bits) add_bitmaps_target(x10_themes_bitmaps "${RADIO_SRC_DIRECTORY}/gui/480x272/themes/*.png" 480 5/6/5-R) - add_bitmaps_target(x10_fonts ${RADIO_SRC_DIRECTORY}/fonts/480x272/*.png 480 8bits) + add_bitmaps_target(x10_fonts ${RADIO_SRC_DIRECTORY}/fonts/480x272/*.png 480 8bits rle) add_bitmaps_target(x10_volume_masks ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/volume/*.png 480 8bits) add_bitmaps_target(x10_bootloader_bitmaps ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/bootloader/bmp_*.png 480 5/6/5-R) add_bitmaps_target(x10_bootloader_icons ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/bootloader/icon_*.png 480 8bits) diff --git a/radio/src/fonts.h b/radio/src/fonts.h index eb7725181..d102cf67e 100644 --- a/radio/src/fonts.h +++ b/radio/src/fonts.h @@ -24,17 +24,17 @@ #if defined(COLORLCD) #if !defined(BOOT) -extern const uint16_t * const fontspecsTable[16]; -extern const uint8_t * const fontsTable[16]; +#define FONT_TABLE_SIZE 16 #else -extern const uint16_t * const fontspecsTable[1]; -extern const uint8_t * const fontsTable[1]; +#define FONT_TABLE_SIZE 1 #endif -#if defined(PCBHORUS) -extern BitmapBuffer * fontCache[2]; +extern const uint16_t * const fontspecsTable[FONT_TABLE_SIZE]; +extern const uint8_t * fontsTable[FONT_TABLE_SIZE]; +extern BitmapBuffer * fontCache[2]; + void loadFontCache(); -#endif +void loadFonts(); #else diff --git a/radio/src/gui/480x272/fonts.cpp b/radio/src/gui/480x272/fonts.cpp index 75cc2b983..8a3d65112 100644 --- a/radio/src/gui/480x272/fonts.cpp +++ b/radio/src/gui/480x272/fonts.cpp @@ -19,6 +19,7 @@ */ #include "opentx.h" +#include "rle.h" #if !defined(BOOT) const uint16_t font_tinsize_specs[] = { @@ -82,17 +83,18 @@ const pm_uchar font_stdsizebold[] = { #if !defined(BOOT) const uint16_t * const fontspecsTable[16] = { - font_stdsize_specs, font_tinsize_specs, font_smlsize_specs, font_midsize_specs, font_dblsize_specs, font_xxlsize_specs, font_stdsize_specs, font_stdsize_specs, + font_stdsize_specs, font_tinsize_specs, font_smlsize_specs, font_midsize_specs, font_dblsize_specs, font_xxlsize_specs, font_stdsize_specs, font_stdsize_specs, font_stdsizebold_specs, font_tinsize_specs, font_smlsize_specs, font_midsize_specs, font_dblsize_specs, font_xxlsize_specs, font_stdsize_specs, font_stdsize_specs }; -const uint8_t * const fontsTable[16] = { - font_stdsize, font_tinsize, font_smlsize, font_midsize, font_dblsize, font_xxlsize, font_stdsize, font_stdsize, +const uint8_t * fontsTable[16] = { + font_stdsize, font_tinsize, font_smlsize, font_midsize, font_dblsize, font_xxlsize, font_stdsize, font_stdsize, font_stdsizebold, font_tinsize, font_smlsize, font_midsize, font_dblsize, font_xxlsize, font_stdsize, font_stdsize }; + #else const uint16_t * const fontspecsTable[1] = { font_stdsize_specs }; -const uint8_t * const fontsTable[1] = { font_stdsize }; +const uint8_t * fontsTable[1] = { font_stdsize }; #endif BitmapBuffer * fontCache[2] = { NULL, NULL }; @@ -117,3 +119,38 @@ void loadFontCache() fontCache[0] = createFontCache(fontsTable[0], TEXT_COLOR, TEXT_BGCOLOR); fontCache[1] = createFontCache(fontsTable[0], TEXT_INVERTED_COLOR, TEXT_INVERTED_BGCOLOR); } + + +static uint8_t* decompressFont(const uint8_t* font) +{ + uint16_t width = *((uint16_t *)font); + uint16_t height = *(((uint16_t *)font)+1); + + size_t font_size = width * height; + uint8_t* dec_buf = (uint8_t*)malloc(font_size + 4); + + // copy width / height + memcpy(dec_buf,font,4); + + rle_decode_8bit(dec_buf+4, font_size, font+4); + return dec_buf; +} + +void loadFonts() +{ + static bool fonts_loaded = false; + if (fonts_loaded) return; + +#if !defined(BOOT) + int i=0; + for (; i<9; i++) + fontsTable[i] = decompressFont(fontsTable[i]); + + for (; i<16; i++) + fontsTable[i] = fontsTable[i-9]; +#else + fontsTable[0] = decompressFont(fontsTable[0]); +#endif + + fonts_loaded = true; +} diff --git a/radio/src/gui/480x272/rle.cpp b/radio/src/gui/480x272/rle.cpp new file mode 100644 index 000000000..e4be583a5 --- /dev/null +++ b/radio/src/gui/480x272/rle.cpp @@ -0,0 +1,38 @@ +#include "rle.h" +#include "debug.h" + +#include + +int rle_decode_8bit(unsigned char* dest, unsigned int dest_size, const unsigned char* src) +{ + //unsigned char count = 0; + unsigned char prev_byte = 0; + bool prev_byte_valid = false; + + const unsigned char* dest_end = dest + dest_size; + unsigned char* d = dest; + + while(d < dest_end) { + + *d++ = *src; + if (prev_byte_valid && (*src == prev_byte)) { + + src++; + + if (d + *src > dest + dest_size) { + TRACE("rle_decode_8bit: destination overflow!\n"); + return -1; + } + + memset(d, prev_byte, *src); + d += *src++; + prev_byte_valid = false; + } + else { + prev_byte = *src++; + prev_byte_valid = true; + } + } + + return d - dest; +} diff --git a/radio/src/gui/480x272/rle.h b/radio/src/gui/480x272/rle.h new file mode 100644 index 000000000..4781216f0 --- /dev/null +++ b/radio/src/gui/480x272/rle.h @@ -0,0 +1,7 @@ +#ifndef _rle_h_ +#define _rle_h_ + +int rle_decode_8bit(unsigned char* dest, unsigned int dest_size, const unsigned char* src); + + +#endif diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index c07f955d3..de8adb602 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -2201,6 +2201,11 @@ int main() bluetoothInit(BLUETOOTH_DEFAULT_BAUDRATE); //BT is turn on for a brief period to differentiate X7 and X7S #endif +#if defined(PCBHORUS) + loadFonts(); +#endif + + #if defined(GUI) && !defined(PCBTARANIS) && !defined(PCBHORUS) // TODO remove this lcdInit(); diff --git a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt index 770e03d3a..bb55c6af4 100644 --- a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt +++ b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt @@ -93,6 +93,7 @@ else() ../../../../../targets/common/arm/stm32/sdio_sd.c ../../../../../targets/${TARGET_DIR}/haptic_driver.cpp ../../../../../gui/${GUI_DIR}/bitmapbuffer.cpp + ../../../../../gui/${GUI_DIR}/rle.cpp ../../../../../syscalls.c ) diff --git a/radio/src/targets/horus/CMakeLists.txt b/radio/src/targets/horus/CMakeLists.txt index 565b102b6..41782a624 100644 --- a/radio/src/targets/horus/CMakeLists.txt +++ b/radio/src/targets/horus/CMakeLists.txt @@ -101,6 +101,7 @@ set(GUI_SRC ${THEMES_SRC} ${LAYOUTS_SRC} ${WIDGETS_SRC} + rle.cpp ) if(DISK_CACHE) set(SRC ${SRC} disk_cache.cpp) diff --git a/radio/src/targets/horus/bootloader/boot_menu.cpp b/radio/src/targets/horus/bootloader/boot_menu.cpp index b50b9c729..23b711c34 100644 --- a/radio/src/targets/horus/bootloader/boot_menu.cpp +++ b/radio/src/targets/horus/bootloader/boot_menu.cpp @@ -40,6 +40,9 @@ void bootloaderInitScreen() lcdColorTable[BARGRAPH2_COLOR_INDEX] = RGB(73, 219, 62); // green backlightEnable(BACKLIGHT_LEVEL_MAX); + + //TODO: load/decompress bitmaps + loadFonts(); } static void bootloaderDrawTitle(unsigned int x, const char* text) diff --git a/radio/util/img2lbm.py b/radio/util/img2lbm.py index 800b9735e..692a8efd0 100755 --- a/radio/util/img2lbm.py +++ b/radio/util/img2lbm.py @@ -91,7 +91,7 @@ with open(output_filename, "w") as f: extension = os.path.splitext(output_filename)[1] out = F_writeValue(f) - if extension == ".rle": + if extension == ".rle" or ((len(sys.argv) > 5) and (sys.argv[5] == "rle")): encoder = RLE_encoder(out) else: encoder = dummy_encoder(out) From 7806382d8e43a7a189157ab12ac632161a8fb8f8 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Fri, 29 Jun 2018 17:28:03 +0200 Subject: [PATCH 3/4] add RLE support for other bootloader bitmaps as well --- radio/src/bitmaps/480x272/CMakeLists.txt | 51 +++++------ radio/src/gui/480x272/bitmapbuffer.cpp | 4 +- radio/src/gui/480x272/bitmapbuffer.h | 37 ++++++++ radio/src/gui/480x272/splash.cpp | 4 + radio/src/gui/480x272/widgets.cpp | 7 ++ .../targets/horus/bootloader/boot_menu.cpp | 7 ++ radio/util/img2lbm.py | 86 ++++++++++--------- 7 files changed, 126 insertions(+), 70 deletions(-) diff --git a/radio/src/bitmaps/480x272/CMakeLists.txt b/radio/src/bitmaps/480x272/CMakeLists.txt index 34a42f37c..9337292af 100644 --- a/radio/src/bitmaps/480x272/CMakeLists.txt +++ b/radio/src/bitmaps/480x272/CMakeLists.txt @@ -1,31 +1,26 @@ if(PCB STREQUAL X12S) - add_bitmaps_target(x12s_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/bmp_*.png" 480 5/6/5) - add_bitmaps_target(x12s_calibration_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/calibration/bmp_*.png" 480 5/6/5) - add_bitmaps_target(x12s_button_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/button/alpha_*.png" 480 4/4/4/4) - add_bitmaps_target(x12s_alpha_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/alpha_*.png" 480 4/4/4/4) - add_bitmaps_target(x12s_alpha_calibration_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/calibration/alpha_*.png" 480 4/4/4/4) - add_bitmaps_target(x12s_masks ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/mask_*.png 480 8bits) - add_bitmaps_target(x12s_slider_masks "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/slider/*.png" 480 8bits) - add_bitmaps_target(x12s_layouts_masks "${RADIO_SRC_DIRECTORY}/gui/480x272/layouts/*.png" 480 8bits) - add_bitmaps_target(x12s_themes_bitmaps "${RADIO_SRC_DIRECTORY}/gui/480x272/themes/*.png" 480 5/6/5) - add_bitmaps_target(x12s_fonts ${RADIO_SRC_DIRECTORY}/fonts/480x272/*.png 480 8bits rle) - add_bitmaps_target(x12s_volume_masks ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/volume/*.png 480 8bits) - add_bitmaps_target(x12s_bootloader_bitmaps ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/bootloader/bmp_*.png 480 5/6/5) - add_bitmaps_target(x12s_bootloader_icons ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/bootloader/icon_*.png 480 8bits) - add_dependencies(x12s_bitmaps x12s_calibration_bitmaps x12s_button_bitmaps x12s_alpha_bitmaps x12s_alpha_calibration_bitmaps x12s_masks x12s_slider_masks x12s_layouts_masks x12s_themes_bitmaps x12s_fonts x12s_volume_masks x12s_bootloader_bitmaps x12s_bootloader_icons) + set(BITMAP_TARGET_PREFIX x12s) + set(BITMAP_FMT_SUFFIX "") else() - add_bitmaps_target(x10_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/bmp_*.png" 480 5/6/5-R) - add_bitmaps_target(x10_calibration_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/calibration/bmp_*.png" 480 5/6/5-R) - add_bitmaps_target(x10_button_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/button/alpha_*.png" 480 4/4/4/4-R) - add_bitmaps_target(x10_alpha_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/alpha_*.png" 480 4/4/4/4-R) - add_bitmaps_target(x10_alpha_calibration_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/calibration/alpha_*.png" 480 4/4/4/4-R) - add_bitmaps_target(x10_masks ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/mask_*.png 480 8bits) - add_bitmaps_target(x10_slider_masks "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/slider/*.png" 480 8bits) - add_bitmaps_target(x10_layouts_masks "${RADIO_SRC_DIRECTORY}/gui/480x272/layouts/*.png" 480 8bits) - add_bitmaps_target(x10_themes_bitmaps "${RADIO_SRC_DIRECTORY}/gui/480x272/themes/*.png" 480 5/6/5-R) - add_bitmaps_target(x10_fonts ${RADIO_SRC_DIRECTORY}/fonts/480x272/*.png 480 8bits rle) - add_bitmaps_target(x10_volume_masks ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/volume/*.png 480 8bits) - add_bitmaps_target(x10_bootloader_bitmaps ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/bootloader/bmp_*.png 480 5/6/5-R) - add_bitmaps_target(x10_bootloader_icons ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/bootloader/icon_*.png 480 8bits) - add_dependencies(x10_bitmaps x10_calibration_bitmaps x10_button_bitmaps x10_alpha_bitmaps x10_alpha_calibration_bitmaps x10_masks x10_slider_masks x10_layouts_masks x10_themes_bitmaps x10_fonts x10_volume_masks x10_bootloader_bitmaps x10_bootloader_icons) + set(BITMAP_TARGET_PREFIX x10) + set(BITMAP_FMT_SUFFIX "-R") endif() + +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/bmp_*.png" 480 "5/6/5${BITMAP_FMT_SUFFIX}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_calibration_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/calibration/bmp_*.png" 480 "5/6/5${BITMAP_FMT_SUFFIX}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_button_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/button/alpha_*.png" 480 "4/4/4/4${BITMAP_FMT_SUFFIX}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_alpha_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/alpha_*.png" 480 "4/4/4/4${BITMAP_FMT_SUFFIX}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_alpha_calibration_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/calibration/alpha_*.png" 480 "4/4/4/4${BITMAP_FMT_SUFFIX}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_masks ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/mask_*.png 480 8bits) +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_slider_masks "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/slider/*.png" 480 8bits) +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_layouts_masks "${RADIO_SRC_DIRECTORY}/gui/480x272/layouts/*.png" 480 8bits) +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_themes_bitmaps "${RADIO_SRC_DIRECTORY}/gui/480x272/themes/*.png" 480 "5/6/5${BITMAP_FMT_SUFFIX}") +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_fonts ${RADIO_SRC_DIRECTORY}/fonts/480x272/*.png 480 8bits rle) +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_volume_masks ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/volume/*.png 480 8bits) +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bootloader_bitmaps ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/bootloader/bmp_*.png 480 "5/6/5${BITMAP_FMT_SUFFIX}" rle) +add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bootloader_icons ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/bootloader/icon_*.png 480 8bits) + +add_dependencies(${BITMAP_TARGET_PREFIX}_bitmaps ${BITMAP_TARGET_PREFIX}_calibration_bitmaps ${BITMAP_TARGET_PREFIX}_button_bitmaps ${BITMAP_TARGET_PREFIX}_alpha_bitmaps + ${BITMAP_TARGET_PREFIX}_alpha_calibration_bitmaps ${BITMAP_TARGET_PREFIX}_masks ${BITMAP_TARGET_PREFIX}_slider_masks ${BITMAP_TARGET_PREFIX}_layouts_masks + ${BITMAP_TARGET_PREFIX}_themes_bitmaps ${BITMAP_TARGET_PREFIX}_fonts ${BITMAP_TARGET_PREFIX}_volume_masks ${BITMAP_TARGET_PREFIX}_bootloader_bitmaps + ${BITMAP_TARGET_PREFIX}_bootloader_icons) diff --git a/radio/src/gui/480x272/bitmapbuffer.cpp b/radio/src/gui/480x272/bitmapbuffer.cpp index 204249e99..d75334c71 100644 --- a/radio/src/gui/480x272/bitmapbuffer.cpp +++ b/radio/src/gui/480x272/bitmapbuffer.cpp @@ -489,6 +489,8 @@ void BitmapBuffer::drawBitmapPatternPie(coord_t x0, coord_t y0, const uint8_t * } } +#if !defined(BOOT) + BitmapBuffer * BitmapBuffer::load(const char * filename) { const char * ext = getFileExtension(filename); @@ -743,7 +745,6 @@ void *stb_realloc(void *ptr, unsigned int oldsz, unsigned int newsz) } #endif // #if defined(TRACE_STB_MALLOC) - #include "thirdparty/Stb/stb_image.h" // fill 'data' with 'size' bytes. return number of bytes actually read @@ -831,3 +832,4 @@ BitmapBuffer * BitmapBuffer::load_stb(const char * filename) stbi_image_free(img); return bmp; } +#endif diff --git a/radio/src/gui/480x272/bitmapbuffer.h b/radio/src/gui/480x272/bitmapbuffer.h index d4be9dd45..19074f8f7 100644 --- a/radio/src/gui/480x272/bitmapbuffer.h +++ b/radio/src/gui/480x272/bitmapbuffer.h @@ -23,6 +23,7 @@ #include #include "colors.h" +#include "rle.h" #if defined(PCBX10) && !defined(SIMU) #define MOVE_PIXEL_RIGHT(p, count) p -= count @@ -59,6 +60,16 @@ class BitmapBufferBase { } + BitmapBufferBase(uint8_t format, T * data): + format(format), + data(data), + data_end(NULL) + { + width = *((uint16_t*)data); + height = *(((uint16_t*)data)+1); + data_end = data + 4 + (width * height); + } + inline uint8_t getFormat() const { return format; @@ -103,6 +114,28 @@ class BitmapBufferBase typedef BitmapBufferBase Bitmap; +class RLEBitmap: + public BitmapBufferBase +{ +public: + RLEBitmap(uint8_t format, const uint8_t* rle_data) + : BitmapBufferBase(format, 0, 0, NULL) + { + width = *((uint16_t *)rle_data); + height = *(((uint16_t *)rle_data)+1); + + uint32_t pixels = width * height; + data = (uint16_t*)malloc(pixels * sizeof(uint16_t)); + rle_decode_8bit((uint8_t*)data, pixels * sizeof(uint16_t), rle_data+4); + data_end = data + pixels; + } + + ~RLEBitmap() + { + free(data); + } +}; + class BitmapBuffer: public BitmapBufferBase { private: @@ -231,11 +264,13 @@ class BitmapBuffer: public BitmapBufferBase void drawBitmapPatternPie(coord_t x0, coord_t y0, const uint8_t * img, LcdFlags flags, int startAngle, int endAngle); +#if !defined(BOOT) static BitmapBuffer * load(const char * filename); static BitmapBuffer * loadMask(const char * filename); static BitmapBuffer * loadMaskOnBackground(const char * filename, LcdFlags foreground, LcdFlags background); +#endif void drawMask(coord_t x, coord_t y, BitmapBuffer * mask, LcdFlags flags, coord_t offset=0, coord_t width=0); @@ -325,8 +360,10 @@ class BitmapBuffer: public BitmapBufferBase } protected: +#if !defined(BOOT) static BitmapBuffer * load_bmp(const char * filename); static BitmapBuffer * load_stb(const char * filename); +#endif }; extern BitmapBuffer * lcd; diff --git a/radio/src/gui/480x272/splash.cpp b/radio/src/gui/480x272/splash.cpp index 4ed8b200d..64c45efb1 100644 --- a/radio/src/gui/480x272/splash.cpp +++ b/radio/src/gui/480x272/splash.cpp @@ -22,7 +22,10 @@ #if defined(SPLASH) +const uint8_t __bmp_splash[] { #include "bmp_splash.lbm" +}; +Bitmap BMP_SPLASH(BMP_RGB565, (const uint16_t*)__bmp_splash); void drawSplash() { @@ -45,6 +48,7 @@ void drawSplash() splashImg); } else { + // TODO: verify / load / decompress bitmap lcd->drawBitmap((LCD_W - BMP_SPLASH.getWidth())/2, (LCD_H - BMP_SPLASH.getHeight())/2, &BMP_SPLASH); diff --git a/radio/src/gui/480x272/widgets.cpp b/radio/src/gui/480x272/widgets.cpp index b3a56fc58..0557a15fe 100644 --- a/radio/src/gui/480x272/widgets.cpp +++ b/radio/src/gui/480x272/widgets.cpp @@ -34,8 +34,15 @@ void drawColumnHeader(const char * const * headers, const char * const * descrip } } +const uint8_t __alpha_button_on[] { #include "alpha_button_on.lbm" +}; +Bitmap ALPHA_BUTTON_ON(BMP_ARGB4444, (const uint16_t*)__alpha_button_on); + +const uint8_t __alpha_button_off[] { #include "alpha_button_off.lbm" +}; +Bitmap ALPHA_BUTTON_OFF(BMP_ARGB4444, (const uint16_t*)__alpha_button_off); void drawButton(coord_t x, coord_t y, const char * label, LcdFlags attr) { diff --git a/radio/src/targets/horus/bootloader/boot_menu.cpp b/radio/src/targets/horus/bootloader/boot_menu.cpp index 23b711c34..6d6d1fce4 100644 --- a/radio/src/targets/horus/bootloader/boot_menu.cpp +++ b/radio/src/targets/horus/bootloader/boot_menu.cpp @@ -4,8 +4,15 @@ #define SELECTED_COLOR (INVERS | TEXT_COLOR) +const uint8_t __bmp_plug_usb_rle[] { #include "bmp_plug_usb.lbm" +}; +RLEBitmap BMP_PLUG_USB(BMP_RGB565, __bmp_plug_usb_rle); + +const uint8_t __bmp_usb_plugged_rle[] { #include "bmp_usb_plugged.lbm" +}; +RLEBitmap BMP_USB_PLUGGED(BMP_RGB565, __bmp_usb_plugged_rle); const uint8_t LBM_FLASH[] = { #include "icon_flash.lbm" diff --git a/radio/util/img2lbm.py b/radio/util/img2lbm.py index 692a8efd0..40d2dc69c 100755 --- a/radio/util/img2lbm.py +++ b/radio/util/img2lbm.py @@ -69,6 +69,16 @@ def F_writeValue(f): f.write("0x%02x," % value) return writeValue +def F_getPixelCoord(): + def getCoord(x,y): + return (x,y) + return getCoord + +def F_getPixelCoord_R(w,h): + def getCoord(x,y): + return (w-x-1, h-y-1) + return getCoord + ## MAIN ## image = Image.open(sys.argv[1]) @@ -81,7 +91,11 @@ with open(output_filename, "w") as f: lcdwidth = int(sys.argv[3]) if len(sys.argv) > 4: - what = sys.argv[4] + s = sys.argv[4].split('-') + what = s[0] + pixel_coord = F_getPixelCoord() + if (len(s) > 1) and (s[1] == 'R'): + pixel_coord = F_getPixelCoord_R(width,height) else: for s in ("03x05", "04x06", "05x07", "08x10", "10x14", "22x38"): if s in sys.argv[2]: @@ -116,46 +130,6 @@ with open(output_filename, "w") as f: encoder.encode_byte(value) f.write("\n") encoder.encode_end() - elif what == "4/4/4/4": - constant = sys.argv[2].upper()[:-4] - values = [] - for y in range(height): - for x in range(width): - pixel = image.getpixel((x, y)) - val = ((pixel[3] // 16) << 12) + ((pixel[0] // 16) << 8) + ((pixel[1] // 16) << 4) + ((pixel[2] // 16) << 0) - values.append(str(val)) - f.write("const uint16_t __%s[] __ALIGNED = { %s };\n" % (constant, ",".join(values))) - f.write("const Bitmap %s(BMP_ARGB4444, %d, %d, __%s);\n" % (constant, width, height, constant)) - elif what == "4/4/4/4-R": - constant = sys.argv[2].upper()[:-4] - values = [] - for y in range(height): - for x in range(width): - pixel = image.getpixel((width-x-1, height-y-1)) - val = ((pixel[3] // 16) << 12) + ((pixel[0] // 16) << 8) + ((pixel[1] // 16) << 4) + ((pixel[2] // 16) << 0) - values.append(str(val)) - f.write("const uint16_t __%s[] __ALIGNED = { %s };\n" % (constant, ",".join(values))) - f.write("const Bitmap %s(BMP_ARGB4444, %d, %d, __%s);\n" % (constant, width, height, constant)) - elif what == "5/6/5": - constant = sys.argv[2].upper()[:-4] - values = [] - for y in range(height): - for x in range(width): - pixel = image.getpixel((x, y)) - val = ((pixel[0] >> 3) << 11) + ((pixel[1] >> 2) << 5) + ((pixel[2] >> 3) << 0) - values.append(str(val)) - f.write("const uint16_t __%s[] __ALIGNED = { %s };\n" % (constant, ",".join(values))) - f.write("const Bitmap %s(BMP_RGB565, %d, %d, __%s);\n" % (constant, width, height, constant)) - elif what == "5/6/5-R": - constant = sys.argv[2].upper()[:-4] - values = [] - for y in range(height): - for x in range(width): - pixel = image.getpixel((width-x-1, height-y-1)) - val = ((pixel[0] >> 3) << 11) + ((pixel[1] >> 2) << 5) + ((pixel[2] >> 3) << 0) - values.append(str(val)) - f.write("const uint16_t __%s[] __ALIGNED = { %s };\n" % (constant, ",".join(values))) - f.write("const Bitmap %s(BMP_RGB565, %d, %d, __%s);\n" % (constant, width, height, constant)) elif what == "4bits": colors = [] writeSize(f, width, height) @@ -187,6 +161,36 @@ with open(output_filename, "w") as f: encoder.encode_byte(value) f.write("\n") encoder.encode_end() + elif what == "4/4/4/4": + constant = sys.argv[2].upper()[:-4] + values = [] + #f.write("const uint8_t __%s[] __ALIGNED = {\n" % constant) + writeSize(f, width, height) + for y in range(height): + for x in range(width): + pixel = image.getpixel(pixel_coord(x, y)) + val = ((pixel[3] // 16) << 12) + ((pixel[0] // 16) << 8) + ((pixel[1] // 16) << 4) + ((pixel[2] // 16) << 0) + encoder.encode_byte(val & 255) + encoder.encode_byte(val >> 8) + encoder.encode_end() + #f.write("\n};\n") + #if extension != ".rle": + # f.write("const Bitmap %s(BMP_ARGB4444, %d, %d, (uint16_t*)__%s);\n" % (constant, width, height, constant)) + elif what == "5/6/5": + constant = sys.argv[2].upper()[:-4] + values = [] + #f.write("const uint8_t __%s[] __ALIGNED = {\n" % constant) + writeSize(f, width, height) + for y in range(height): + for x in range(width): + pixel = image.getpixel(pixel_coord(x, y)) + val = ((pixel[0] >> 3) << 11) + ((pixel[1] >> 2) << 5) + ((pixel[2] >> 3) << 0) + encoder.encode_byte(val & 255) + encoder.encode_byte(val >> 8) + encoder.encode_end() + #f.write("\n};\n") + #if extension != ".rle": + # f.write("const Bitmap %s(BMP_RGB565, %d, %d, (uint16_t*)__%s);\n" % (constant, width, height, constant)) elif what == "03x05": image = image.convert(mode='L') for y in range(0, height, 5): From 8e39de03682112143ddb0665f126fd970280f462 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Fri, 29 Jun 2018 22:11:10 +0200 Subject: [PATCH 4/4] fix horus LCD tests --- radio/src/tests/lcd_480x272.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/radio/src/tests/lcd_480x272.cpp b/radio/src/tests/lcd_480x272.cpp index 1cd8c2666..486b601f2 100644 --- a/radio/src/tests/lcd_480x272.cpp +++ b/radio/src/tests/lcd_480x272.cpp @@ -82,6 +82,7 @@ bool checkScreenshot_480x272(const QString & test) TEST(Lcd_480x272, vline) { + loadFonts(); lcd->clear(TEXT_BGCOLOR); for (int x=0; x<100; x+=2) { lcdDrawSolidVerticalLine(x, x/2, 12, TEXT_COLOR); @@ -91,6 +92,7 @@ TEST(Lcd_480x272, vline) TEST(Lcd_480x272, primitives) { + loadFonts(); lcd->clear(TEXT_BGCOLOR); lcdDrawText(8, 8, "The quick brown fox jumps over the lazy dog", CURVE_AXIS_COLOR|NO_FONTCACHE); lcdDrawText(5, 5, "The quick brown fox jumps over the lazy dog", TEXT_COLOR|NO_FONTCACHE); @@ -118,6 +120,7 @@ TEST(Lcd_480x272, primitives) TEST(Lcd_480x272, transparency) { + loadFonts(); lcd->clear(TEXT_BGCOLOR); lcdDrawText(8, 8, "The quick brown fox jumps over the lazy dog", TEXT_COLOR|OPACITY(4)|NO_FONTCACHE); lcdDrawText(5, 5, "The quick brown fox jumps over the lazy dog", TEXT_COLOR|OPACITY(12)|NO_FONTCACHE); @@ -154,6 +157,7 @@ TEST(Lcd_480x272, transparency) TEST(Lcd_480x272, fonts) { + loadFonts(); loadFontCache(); lcd->clear(TEXT_BGCOLOR); @@ -171,4 +175,4 @@ TEST(Lcd_480x272, fonts) } -#endif \ No newline at end of file +#endif