starred/OpenEPaperLink
1
0
Fork 0
mirror of https://github.com/OpenEPaperLink/OpenEPaperLink.git synced 2026-03-23 15:07:38 +01:00
Code Issues 4.3k Packages Projects Releases 10 Wiki Activity

Added fallback, updated types

Browse Source
This commit is contained in:
Jelmer
2024-12-01 10:41:24 +01:00
parent 78e097738a
commit 573ba8c424
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ESP32_AP-Flasher/src/makeimage.cpp
View File

@@ -15,6 +15,7 @@
#include "ips_display.h"
#endif
#include "commstructs.h"
#include "g5/Group5.h"
#include "g5/g5enc.inl"
@@ -297,15 +298,12 @@ uint8_t *g5Compress(uint16_t width, uint16_t height, uint8_t *buffer, uint16_t b
return nullptr;
}
printf("G5 Compress: %d x %d\n", width, height);
rc = g5_encode_init(&g5enc, width, height, outbuffer, buffersize + 16384);
for (int y = 0; y < height && rc == G5_SUCCESS; y++) {
rc = g5_encode_encodeLine(&g5enc, buffer);
buffer += (width / 8);
}
if (rc == G5_ENCODE_COMPLETE) {
printf("Encode succeeded!\n");
outBufferSize = g5_encode_getOutSize(&g5enc);
} else {
printf("Encode failed! rc=%d\n", rc);
@@ -413,7 +411,6 @@ void spr2buffer(TFT_eSprite &spr, String &fileout, imgParam &imageParams) {
uint16_t height = imageParams.height; // spr.height();
uint16_t width = imageParams.width;
spr.width();
// uint8_t *buffer = (uint8_t *)ps_malloc(buffer_size);
if (imageParams.hasRed && imageParams.bpp > 1) {
uint8_t *newbuffer = (uint8_t *)ps_realloc(buffer, 2 * buffer_size);
if (newbuffer == NULL) {
@@ -426,14 +423,17 @@ void spr2buffer(TFT_eSprite &spr, String &fileout, imgParam &imageParams) {
buffer = newbuffer;
spr2color(spr, imageParams, buffer + buffer_size, buffer_size, true);
buffer_size *= 2;
// double the height, to do two layers sequentially
if (imageParams.rotatebuffer % 2) {
width *= 2;
} else {
height *= 2;
}
}
uint16_t outbufferSize = 0;
uint8_t *outBuffer;
bool compressionSuccessful = true;
if (imageParams.rotatebuffer % 2) {
outBuffer = g5Compress(height, width, buffer, buffer_size, outbufferSize);
} else {
@@ -441,10 +441,26 @@ void spr2buffer(TFT_eSprite &spr, String &fileout, imgParam &imageParams) {
}
if (outBuffer == NULL) {
Serial.println("Failed to compress G5");
compressionSuccessful = false;
} else {
printf("Compressed %d to %d bytes\n", buffer_size, outbufferSize);
f_out.write(outBuffer, outbufferSize);
free(outBuffer);
if (outbufferSize > buffer_size) {
printf("That wasn't very useful, falling back to raw\n");
free(outBuffer);
compressionSuccessful = false;
} else {
f_out.write(outBuffer, outbufferSize);
}
}
if (!compressionSuccessful) {
// if we failed to compress the image, or the resulting image was larger than a raw file, fallback
imageParams.g5 = false;
if (imageParams.hasRed && imageParams.bpp > 1) {
imageParams.dataType = DATATYPE_IMG_RAW_2BPP;
} else {
imageParams.dataType = DATATYPE_IMG_RAW_1BPP;
}
f_out.write(buffer, buffer_size);
}
} else {
f_out.write(buffer, buffer_size);

1
resources/tagtypes/00.json
View File

@@ -10,6 +10,7 @@
"black": [ 0, 0, 0 ],
"red": [ 255, 0, 0 ]
},
"g5_compression": "29",
"shortlut": 2,
"options": [ "button", "customlut" ],
"contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 10, 14, 15, 17, 18, 19, 20, 21, 27 ],

1
resources/tagtypes/01.json
View File

@@ -10,6 +10,7 @@
"black": [ 0, 0, 0 ],
"red": [ 255, 0, 0 ]
},
"g5_compression": "29",
"shortlut": 2,
"options": [ "button", "customlut" ],
"contentids": [ 22, 23, 1, 2, 3, 4, 5, 7, 8, 9, 10, 11, 15, 16, 17, 18, 19, 20, 21, 27 ],

1
resources/tagtypes/02.json
View File

@@ -10,6 +10,7 @@
"black": [ 0, 0, 0 ],
"red": [ 255, 0, 0 ]
},
"g5_compression": "29",
"shortlut": 1,
"options": [ "button" ],
"contentids": [ 22, 23, 1, 4, 5, 7, 8, 9, 10, 11, 17, 18, 19, 20, 27 ],