jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use PSram and more debug info

Browse Source
This commit is contained in:
fvanroie 2021-06-13 02:05:49 +02:00
parent 1cca0873fd
commit aa2a97090b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/hasp/hasp_attribute.cpp
View File

@ -20,6 +20,7 @@
#if HASP_USE_PNGDECODE > 0 #if HASP_USE_PNGDECODE > 0
#include "lv_png.h" #include "lv_png.h"
#include "lodepng.h" #include "lodepng.h"
#include "hasp_png.h"
#endif #endif
/*** Image Improvement ***/ /*** Image Improvement ***/
@ -969,7 +970,7 @@ static hasp_attribute_type_t special_attribute_src(lv_obj_t* obj, const char* pa
if(src_type == LV_IMG_SRC_VARIABLE) { if(src_type == LV_IMG_SRC_VARIABLE) {
lv_img_dsc_t* img_dsc = (lv_img_dsc_t*)src; lv_img_dsc_t* img_dsc = (lv_img_dsc_t*)src;
free((uint8_t*)img_dsc->data); lodepng_free((uint8_t*)img_dsc->data);
lv_mem_free(img_dsc); lv_mem_free(img_dsc);
} }
@ -984,7 +985,7 @@ static hasp_attribute_type_t special_attribute_src(lv_obj_t* obj, const char* pa
int len = total; int len = total;
int read = 0; int read = 0;
lv_img_dsc_t* img_dsc = (lv_img_dsc_t*)lv_mem_alloc(sizeof(lv_img_dsc_t)); lv_img_dsc_t* img_dsc = (lv_img_dsc_t*)lv_mem_alloc(sizeof(lv_img_dsc_t));
uint8_t* img_buf = (uint8_t*)(len > 0 ? malloc(len) : NULL); uint8_t* img_buf = (uint8_t*)(len > 0 ? lodepng_malloc(len) : NULL);
LOG_VERBOSE(TAG_ATTR, "HTTP OK: buffer created of %d bytes", len); LOG_VERBOSE(TAG_ATTR, "HTTP OK: buffer created of %d bytes", len);
@ -998,7 +999,8 @@ static hasp_attribute_type_t special_attribute_src(lv_obj_t* obj, const char* pa
if(size) { if(size) {
if(read == 0 && size >= sizeof(lv_img_header_t)) { // read 4-byte header first if(read == 0 && size >= sizeof(lv_img_header_t)) { // read 4-byte header first
c = stream->readBytes((uint8_t*)img_dsc, sizeof(lv_img_header_t)); c = stream->readBytes((uint8_t*)img_dsc, sizeof(lv_img_header_t));
LOG_VERBOSE(TAG_ATTR, D_BULLET "HEADER READ: %d bytes", c); LOG_VERBOSE(TAG_ATTR, D_BULLET "HEADER READ: %d bytes w=%d h=%d", c,
img_dsc->header.w, img_dsc->header.h);
} else if(read != 0) { // header has been read } else if(read != 0) { // header has been read
c = stream->readBytes(img_buf + read - sizeof(lv_img_header_t), size); c = stream->readBytes(img_buf + read - sizeof(lv_img_header_t), size);
LOG_VERBOSE(TAG_ATTR, D_BULLET "HTTP READ: %d bytes", c); LOG_VERBOSE(TAG_ATTR, D_BULLET "HTTP READ: %d bytes", c);
@ -1011,7 +1013,8 @@ static hasp_attribute_type_t special_attribute_src(lv_obj_t* obj, const char* pa
} }
delay(1); delay(1);
} }
LOG_VERBOSE(TAG_ATTR, D_BULLET "HTTP DONE: %d bytes", read); LOG_VERBOSE(TAG_ATTR, D_BULLET "HTTP TOTAL READ: %d bytes, %d expected", read,
img_dsc->header.w * img_dsc->header.h * 2 + 4);
img_dsc->data_size = total - 4; img_dsc->data_size = total - 4;
img_dsc->data = img_buf; img_dsc->data = img_buf;