TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-04-21 21:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed RGB565 mode & clean up

Browse Source
This commit is contained in:
dqs105 2020-08-28 00:21:09 +08:00
parent ac12bf5f50
commit 78f2e417d6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/common/lcd_ili9341.cpp
View File

@ -426,15 +426,14 @@ void ILI9341::drawBMP(const ui::Point p, const uint8_t * bitmap, const bool tran
RAW image structure: RAW image structure:
First 3 bytes: file header "RAW" First 3 bytes: file header "RAW"
Byte 4: file type, 0: RGB565, 1: RGB, 2: RGBA (alpha ignored) Byte 4: file type, 0: RGB565, 1: RGB, 2: RGBA (alpha ignored)
Byte 5-6: height (not used) Byte 5-6: height
Byte 7-8: width Byte 7-8: width
*/ */
bool ILI9341::drawRAW(const ui::Point p, const std::string file) { bool ILI9341::drawRAW(const ui::Point p, const std::string file) {
File rawimage; File rawimage;
size_t file_pos = 0; size_t file_pos = 0;
uint16_t pointer = 0; uint16_t pointer = 0;
uint16_t color_buffer = 0; uint16_t px = 0, py, width, height;
uint16_t px = 0, py, width;
uint8_t type = 0; uint8_t type = 0;
char buffer[257]; char buffer[257];
ui::Color line_buffer[240]; ui::Color line_buffer[240];
@ -463,6 +462,7 @@ bool ILI9341::drawRAW(const ui::Point p, const std::string file) {
type = buffer[0]; // 0: RGB565, 1: RGB, 2: RGBA(Alpha ignored). Default to RGBA. type = buffer[0]; // 0: RGB565, 1: RGB, 2: RGBA(Alpha ignored). Default to RGBA.
height = (uint16_t)buffer[1] + ((uint16_t)buffer[2] << 8);
width = (uint16_t)buffer[3] + ((uint16_t)buffer[4] << 8); width = (uint16_t)buffer[3] + ((uint16_t)buffer[4] << 8);
py += 16; py += 16;
@ -482,7 +482,7 @@ bool ILI9341::drawRAW(const ui::Point p, const std::string file) {
while(pointer < 256) { while(pointer < 256) {
switch(type) { switch(type) {
case 0: case 0:
line_buffer[px] = (uint16_t)buffer[pointer+ 1] + ((uint16_t)buffer[0] << 8); line_buffer[px] = ui::Color((uint16_t)buffer[pointer] + ((uint16_t)buffer[pointer + 1] << 8));
pointer += 2; pointer += 2;
file_pos += 2; file_pos += 2;
break; break;
@ -510,7 +510,7 @@ bool ILI9341::drawRAW(const ui::Point p, const std::string file) {
px = 0; px = 0;
py++; py++;
if(read_size.value() < 256) if(read_size.value() < 256 || py > height + 16)
break; break;
} }
return true; return true;