mgeppert/Tasmota
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix displaytext draw picture (#24179)

Browse Source
This commit is contained in:
Jason2866 2025-12-07 20:54:03 +01:00 committed by GitHub
parent 017357e9cf
commit d22d493edb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tasmota/tasmota_xdrv_driver/xdrv_13_display.ino
View File

@ -2432,13 +2432,15 @@ void Draw_RGB_Bitmap(char *file, uint16_t xp, uint16_t yp, uint8_t scale, bool i
estr[cnt] = tolower(ending[cnt]); estr[cnt] = tolower(ending[cnt]);
} }
uint16_t xsize;
uint16_t ysize;
if (!strcmp(estr,"rgb")) { if (!strcmp(estr,"rgb")) {
// special rgb format // special rgb format
fp = ufsp->open(file, FS_FILE_READ); fp = ufsp->open(file, FS_FILE_READ);
if (!fp) return; if (!fp) return;
uint16_t xsize;
fp.read((uint8_t*)&xsize, 2); fp.read((uint8_t*)&xsize, 2);
uint16_t ysize;
fp.read((uint8_t*)&ysize, 2); fp.read((uint8_t*)&ysize, 2);
uint16_t xoffs; uint16_t xoffs;
uint16_t yoffs; uint16_t yoffs;
@ -2451,12 +2453,13 @@ void Draw_RGB_Bitmap(char *file, uint16_t xp, uint16_t yp, uint8_t scale, bool i
} }
#ifndef SLOW_RGB16 #ifndef SLOW_RGB16
renderer->setAddrWindow(xp, yp, xp + xsize, yp + ysize); //renderer->setAddrWindow(xp, yp, xp + xsize, yp + ysize);
uint16_t *rgb = (uint16_t *)special_malloc(xsize * 2); uint16_t *rgb = (uint16_t *)special_malloc(xsize * 2);
if (rgb) { if (rgb) {
//uint16_t rgb[xsize]; //uint16_t rgb[xsize];
for (int16_t j = 0; j < ysize; j++) { for (int16_t j = 0; j < ysize; j++) {
fp.read((uint8_t*)rgb, xsize * 2); fp.read((uint8_t*)rgb, xsize * 2);
renderer->setAddrWindow(xp, yp + j, xp + xsize, yp + j + 1);
renderer->pushColors(rgb, xsize, true); renderer->pushColors(rgb, xsize, true);
OsWatchLoop(); OsWatchLoop();
} }
@ -2476,6 +2479,9 @@ void Draw_RGB_Bitmap(char *file, uint16_t xp, uint16_t yp, uint8_t scale, bool i
yp++; yp++;
} }
#endif #endif
if (scale) {
if (renderer) renderer->drawRect(xp, yp, xsize, ysize, GetColorFromIndex(scale));
}
fp.close(); fp.close();
} else if (!strcmp(estr,"jpg") || !strcmp(estr,"jpeg")) { } else if (!strcmp(estr,"jpg") || !strcmp(estr,"jpeg")) {
// jpeg files on ESP32 with more memory // jpeg files on ESP32 with more memory
@ -2492,8 +2498,6 @@ void Draw_RGB_Bitmap(char *file, uint16_t xp, uint16_t yp, uint8_t scale, bool i
if (mem) { if (mem) {
uint8_t res = fp.read(mem, size); uint8_t res = fp.read(mem, size);
if (res) { if (res) {
uint16_t xsize;
uint16_t ysize;
uint16_t xoffs; uint16_t xoffs;
uint16_t yoffs; uint16_t yoffs;
if (mem[0] == 0xff && mem[1] == 0xd8) { if (mem[0] == 0xff && mem[1] == 0xd8) {
@ -2513,7 +2517,7 @@ void Draw_RGB_Bitmap(char *file, uint16_t xp, uint16_t yp, uint8_t scale, bool i
if (pixb) { if (pixb) {
uint8_t *ob = out_buf; uint8_t *ob = out_buf;
if (jpg2rgb888(mem, size, out_buf, (jpg_scale_t)JPG_SCALE_NONE)) { if (jpg2rgb888(mem, size, out_buf, (jpg_scale_t)JPG_SCALE_NONE)) {
renderer->setAddrWindow(xp, yp, xp + xsize, yp + ysize); //renderer->setAddrWindow(xp, yp, xp + xsize, yp + ysize);
for (int32_t j = 0; j < ysize; j++) { for (int32_t j = 0; j < ysize; j++) {
if (inverted == false) { if (inverted == false) {
rgb888_to_565(ob, pixb, xsize); rgb888_to_565(ob, pixb, xsize);
@ -2521,6 +2525,7 @@ void Draw_RGB_Bitmap(char *file, uint16_t xp, uint16_t yp, uint8_t scale, bool i
rgb888_to_565i(ob, pixb, xsize); rgb888_to_565i(ob, pixb, xsize);
} }
ob += xsize * 3; ob += xsize * 3;
renderer->setAddrWindow(xp, yp + j, xp + xsize, yp + j + 1);
renderer->pushColors(pixb, xsize, true); renderer->pushColors(pixb, xsize, true);
OsWatchLoop(); OsWatchLoop();
} }
@ -2533,12 +2538,12 @@ void Draw_RGB_Bitmap(char *file, uint16_t xp, uint16_t yp, uint8_t scale, bool i
} }
} }
} }
if (scale) {
if (renderer) renderer->drawRect(xp, yp, xsize, ysize, GetColorFromIndex(scale));
}
} }
free(mem); free(mem);
} }
if (scale) {
if (renderer) renderer->drawRect(xp, yp, xsize, ysize, GetColorFromIndex(scale));
}
fp.close(); fp.close();
} }
#endif // JPEG_PICTS #endif // JPEG_PICTS