Added new custom splash.

- Custom splash now can be loaded from SD card.
This commit is contained in:
dqs105 2020-08-27 23:07:48 +08:00
parent 0852bf89f0
commit 8edaa1e51e
3 changed files with 103 additions and 1 deletions

View File

@ -634,6 +634,7 @@ BMPView::BMPView(NavigationView& nav) {
} }
void BMPView::paint(Painter&) { void BMPView::paint(Painter&) {
if(!portapack::display.drawRAW({ 0, 0 }, "splash.data"))
portapack::display.drawBMP({(240 - 230) / 2, (320 - 50) / 2 - 10}, splash_bmp, false); portapack::display.drawBMP({(240 - 230) / 2, (320 - 50) / 2 - 10}, splash_bmp, false);
} }

View File

@ -30,8 +30,13 @@ using namespace portapack;
#include "ch.h" #include "ch.h"
#include "file.hpp"
#include <complex> #include <complex>
#include <cstring>
#include <string>
namespace lcd { namespace lcd {
namespace { namespace {
@ -416,6 +421,101 @@ void ILI9341::drawBMP(const ui::Point p, const uint8_t * bitmap, const bool tran
} }
} }
/*
Read a RAW image from SD card. (Mainly for spash screen)
RAW image structure:
First 3 bytes: file header "RAW"
Byte 4: file type, 0: RGB565, 1: RGB, 2: RGBA (alpha ignored)
Byte 5-6: height (not used)
Byte 7-8: width
*/
bool ILI9341::drawRAW(const ui::Point p, const std::string file) {
File rawimage;
size_t file_pos = 0;
uint16_t pointer = 0;
uint16_t color_buffer = 0;
uint16_t px = 0, py, width;
uint8_t type = 0;
char buffer[257];
ui::Color line_buffer[240];
auto result = rawimage.open(file);
if(result.is_valid())
return false;
rawimage.seek(file_pos);
memset(buffer, 0, 3);
auto read_size = rawimage.read(buffer, 3);
buffer[3] = '\0';
if(strcmp(buffer, "RAW")) {
return false; // Not a generated RAW file
}
file_pos += 3;
rawimage.seek(file_pos);
memset(buffer, 0, 5);
read_size = rawimage.read(buffer, 5);
if (read_size.is_error())
return false;
py = 0;
type = buffer[0]; // 0: RGB565, 1: RGB, 2: RGBA(Alpha ignored). Default to RGBA.
width = (uint16_t)buffer[3] + ((uint16_t)buffer[4] << 8);
py += 16;
file_pos += 5;
while(1) {
while(px < width) {
rawimage.seek(file_pos);
memset(buffer, 0, 257);
read_size = rawimage.read(buffer, 256);
if (read_size.is_error())
return false; // Read error
pointer = 0;
while(pointer < 256) {
switch(type) {
case 0:
line_buffer[px] = (uint16_t)buffer[pointer+ 1] + ((uint16_t)buffer[0] << 8);
pointer += 2;
file_pos += 2;
break;
case 1:
line_buffer[px] = ui::Color(buffer[pointer], buffer[pointer + 1], buffer[pointer + 2]);
pointer += 3;
file_pos += 3;
break;
case 2:
default:
line_buffer[px] = ui::Color(buffer[pointer], buffer[pointer + 1], buffer[pointer + 2]);
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)
break;
}
return true;
}
void ILI9341::draw_line(const ui::Point start, const ui::Point end, const ui::Color color) { void ILI9341::draw_line(const ui::Point start, const ui::Point end, const ui::Color color) {
int x0 = start.x(); int x0 = start.x();
int y0 = start.y(); int y0 = start.y();

View File

@ -60,6 +60,7 @@ public:
void draw_pixel(const ui::Point p, const ui::Color color); void draw_pixel(const ui::Point p, const ui::Color color);
void drawBMP(const ui::Point p, const uint8_t * bitmap, const bool transparency); void drawBMP(const ui::Point p, const uint8_t * bitmap, const bool transparency);
bool drawRAW(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_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); void render_box(const ui::Point p, const ui::Size s, const ui::Color* line_buffer);