CloneRepos/CYD-Klipper
2
0
Fork 0
mirror of https://github.com/suchmememanyskill/CYD-Klipper.git synced 2026-03-21 05:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix gcode previews with special chars not loading

Browse Source
This commit is contained in:
suchmememanyskill
2024-06-09 00:18:57 +02:00
parent d22a9e1ee4
commit 4a96f7db0b
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
CYD-Klipper/src/ui/gcode_img.cpp
View File

@@ -2,6 +2,7 @@
#include "lvgl.h" #include "lvgl.h"
#include "ui_utils.h" #include "ui_utils.h"
#include <Esp.h> #include <Esp.h>
#include <UrlEncode.h>
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include "../conf/global_config.h" #include "../conf/global_config.h"
#include "../core/http_client.h" #include "../core/http_client.h"
@@ -10,29 +11,27 @@ static unsigned char * data_png = NULL;
static char img_filename_path[256] = {0}; static char img_filename_path[256] = {0};
static lv_img_dsc_t img_header = {0}; static lv_img_dsc_t img_header = {0};
bool has_128_128_gcode(const char* filename) bool has_32_32_gcode_img(const char* filename)
{ {
if (filename == NULL){ if (filename == NULL){
Serial.println("No gcode filename"); Serial.println("No gcode filename");
return false; return false;
} }
SETUP_HTTP_CLIENT("/server/files/thumbnails?filename=" + String(filename)); SETUP_HTTP_CLIENT("/server/files/thumbnails?filename=" + urlEncode(filename));
int httpCode = 0; int httpCode = 0;
try { try {
httpCode = client.GET(); httpCode = client.GET();
} }
catch (...){ catch (...){
Serial.println("Exception while fetching gcode img location"); Serial.println("Exception while fetching gcode img location");
return {0}; return false;
} }
if (httpCode == 200) if (httpCode == 200)
{ {
String payload = client.getString();
JsonDocument doc; JsonDocument doc;
deserializeJson(doc, payload); deserializeJson(doc, client.getStream());
auto result = doc["result"].as<JsonArray>(); auto result = doc["result"].as<JsonArray>();
const char* chosen_thumb = NULL; const char* chosen_thumb = NULL;
@@ -58,6 +57,10 @@ bool has_128_128_gcode(const char* filename)
return true; return true;
} }
} }
else
{
Serial.printf("Failed to fetch gcode image data: %d\n", httpCode);
}
return false; return false;
} }
@@ -71,7 +74,7 @@ lv_obj_t* draw_gcode_img()
return NULL; return NULL;
} }
SETUP_HTTP_CLIENT_FULL("/server/files/gcodes/" + String(img_filename_path), false, 2000); SETUP_HTTP_CLIENT_FULL("/server/files/gcodes/" + urlEncode(img_filename_path), false, 2000);
int httpCode = 0; int httpCode = 0;
try { try {
@@ -121,7 +124,7 @@ lv_obj_t* show_gcode_img(const char* filename)
return NULL; return NULL;
} }
if (!has_128_128_gcode(filename)){ if (!has_32_32_gcode_img(filename)){
Serial.println("No 32x32 gcode img found"); Serial.println("No 32x32 gcode img found");
return NULL; return NULL;
} }

2
CYD-Klipper/src/ui/gcode_img.h
View File

@@ -2,5 +2,5 @@
#include "lvgl.h" #include "lvgl.h"
lv_obj_t* show_gcode_img(const char* filename); lv_obj_t* show_gcode_img(const char* filename);
bool has_128_128_gcode(const char* filename); bool has_32_32_gcode_img(const char* filename);
void clear_img_mem(); void clear_img_mem();