diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp index e5f7f573..435a7b73 100644 --- a/firmware/application/ui_navigation.cpp +++ b/firmware/application/ui_navigation.cpp @@ -670,7 +670,8 @@ BMPView::BMPView(NavigationView& nav) { } void BMPView::paint(Painter&) { - portapack::display.drawBMP({(240 - 230) / 2, (320 - 50) / 2 - 10}, splash_bmp, false); + if(!portapack::display.drawBMP2({ 0, 0 }, "splash.bmp")) + portapack::display.drawBMP({(240 - 230) / 2, (320 - 50) / 2 - 10}, splash_bmp, false); } /* NotImplementedView ****************************************************/ diff --git a/firmware/common/lcd_ili9341.cpp b/firmware/common/lcd_ili9341.cpp index db7a808b..58b3f5dd 100644 --- a/firmware/common/lcd_ili9341.cpp +++ b/firmware/common/lcd_ili9341.cpp @@ -30,8 +30,13 @@ using namespace portapack; #include "ch.h" +#include "file.hpp" + #include +#include +#include + namespace lcd { namespace { @@ -416,6 +421,113 @@ void ILI9341::drawBMP(const ui::Point p, const uint8_t * bitmap, const bool tran } } +/* + Draw BMP from SD card. + Currently supported formats: + 16bpp ARGB, RGB565 + 24bpp RGB + 32bpp ARGB +*/ +bool ILI9341::drawBMP2(const ui::Point p, const std::string file) { + File bmpimage; + size_t file_pos = 0; + uint16_t pointer = 0; + int16_t px = 0, py, width, height; + bmp_header_t bmp_header; + uint8_t type = 0; + char buffer[257]; + ui::Color line_buffer[240]; + + auto result = bmpimage.open(file); + if(result.is_valid()) + return false; + + bmpimage.seek(file_pos); + auto read_size = bmpimage.read(&bmp_header, sizeof(bmp_header)); + if (!((bmp_header.signature == 0x4D42) && // "BM" Signature + (bmp_header.planes == 1) && // Seems always to be 1 + (bmp_header.compression == 0 || bmp_header.compression == 3 ))) { // No compression + return false; + } + + switch(bmp_header.bpp) { + case 16: + file_pos = 0x36; + memset(buffer, 0, 16); + bmpimage.read(buffer, 16); + if(buffer[1] == 0x7C) + type = 3; // A1R5G5B5 + else + type = 0; // R5G6B5 + break; + case 24: + type = 1; + break; + case 32: + default: + type = 2; + break; + } + + width = bmp_header.width; + height = bmp_header.height; + + file_pos = bmp_header.image_data; + + py = height + 16; + + while(1) { + while(px < width) { + bmpimage.seek(file_pos); + memset(buffer, 0, 257); + read_size = bmpimage.read(buffer, 256); + if (read_size.is_error()) + return false; // Read error + + pointer = 0; + while(pointer < 256) { + if(pointer + 4 > 256) + break; + switch(type) { + case 0: + case 3: + if(!type) + line_buffer[px] = ui::Color((uint16_t)buffer[pointer] | ((uint16_t)buffer[pointer + 1] << 8)); + else + line_buffer[px] = ui::Color(((uint16_t)buffer[pointer] & 0x1F) | ((uint16_t)buffer[pointer] & 0xE0) << 1 | ((uint16_t)buffer[pointer + 1] & 0x7F) << 9); + pointer += 2; + file_pos += 2; + break; + case 1: + default: + line_buffer[px] = ui::Color(buffer[pointer + 2], buffer[pointer + 1], buffer[pointer]); + pointer += 3; + file_pos += 3; + break; + case 2: + line_buffer[px] = ui::Color(buffer[pointer + 2], buffer[pointer + 1], buffer[pointer]); + pointer += 4; + file_pos += 4; + break; + } + px++; + if(px >= width) { + break; + } + } + if(read_size.value() != 256) + break; + } + render_line({ p.x(), p.y() + py }, px, line_buffer); + px = 0; + py--; + + if(read_size.value() < 256 || py < 0) + break; + } + return true; +} + void ILI9341::draw_line(const ui::Point start, const ui::Point end, const ui::Color color) { int x0 = start.x(); int y0 = start.y(); diff --git a/firmware/common/lcd_ili9341.hpp b/firmware/common/lcd_ili9341.hpp index ddcb12ef..d564a5c2 100644 --- a/firmware/common/lcd_ili9341.hpp +++ b/firmware/common/lcd_ili9341.hpp @@ -60,6 +60,7 @@ public: void draw_pixel(const ui::Point p, const ui::Color color); void drawBMP(const ui::Point p, const uint8_t * bitmap, const bool transparency); + bool drawBMP2(const ui::Point p, const std::string file); void render_line(const ui::Point p, const uint8_t count, const ui::Color* line_buffer); void render_box(const ui::Point p, const ui::Size s, const ui::Color* line_buffer);