lucent/esp32-gameboy-printer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return HTML pages on image deletion and seq reset

Browse source
This commit is contained in:
Tido Klaassen 2018-08-27 18:54:04 +02:00
parent b1cb95d581
commit 881edf2807
1 changed files with 57 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
main/gb_printer.c
View file

@ -88,6 +88,15 @@
#define PR_PARAM_SIZE 4 #define PR_PARAM_SIZE 4
#define PKT_RING_SIZE 4 #define PKT_RING_SIZE 4
#define HTML_HEADER "<html>" \
"<head>" \
"<meta charset=\"utf-8\">" \
"<title>ESP32 GameBoy Printer</title>" \
"<link rel=\"stylesheet\" href=\"style.css\" " \
"media=\"screen\" title=\"no title\" " \
"charset=\"utf-8\">" \
"</head>"
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
#define likely(x) __builtin_expect((x),1) #define likely(x) __builtin_expect((x),1)
#define unlikely(x) __builtin_expect((x),0) #define unlikely(x) __builtin_expect((x),0)
@ -268,15 +277,11 @@ CgiStatus cgi_del_all(HttpdConnData *conn)
goto err_out; goto err_out;
} }
httpdStartResponse(conn, 200);
httpdHeader(conn, "Content-Type", "text/json");
httpdEndHeaders(conn);
dir = opendir(IMGDIR); dir = opendir(IMGDIR);
if(dir == NULL){ if(dir == NULL){
ESP_LOGE(TAG, "[%s] opendir() failed", __func__); ESP_LOGE(TAG, "[%s] opendir() failed", __func__);
result = -1; result = -1;
goto send_data; goto send_reply;
} }
while((ent = readdir(dir)) != NULL){ while((ent = readdir(dir)) != NULL){
@ -284,13 +289,32 @@ CgiStatus cgi_del_all(HttpdConnData *conn)
result = unlink(buff); result = unlink(buff);
if(result != 0){ if(result != 0){
ESP_LOGE(TAG, "[%s] Unlink failed for %s", __func__, buff); ESP_LOGE(TAG, "[%s] Unlink failed for %s", __func__, buff);
goto send_data; goto send_reply;
} }
} }
send_data: send_reply:
snprintf(buff, sizeof(buff), "%s", result == 0 ? "true" : "false"); if(result == 0){
httpdSend(conn, buff, -1); httpdRedirect(conn, "/index.tpl");
} else {
httpdStartResponse(conn, 500);
httpdHeader(conn, "Content-Type", "text/html");
httpdEndHeaders(conn);
httpdSend(conn, HTML_HEADER, -1);
httpdSend(conn, "<body>"
"<h1>ESP32 Gameboy Printer</h1>"
"<p>"
"Error while deleting file ", -1);
httpdSend(conn, buff, -1);
httpdSend(conn, ".<br>"
"<a href=\"/index.tpl\">Go back</a>"
"<br>"
"<a href=\"/remove_all\">Retry</a>"
"</p>"
"</body>"
"</html>", -1);
}
err_out: err_out:
if(dir != NULL){ if(dir != NULL){
@ -302,11 +326,9 @@ err_out:
CgiStatus cgi_reset_seq(HttpdConnData *conn) CgiStatus cgi_reset_seq(HttpdConnData *conn)
{ {
char buff[128];
nvs_handle handle; nvs_handle handle;
int result; int result;
buff[0] = '\0';
result = 0; result = 0;
if(conn->isConnectionClosed){ if(conn->isConnectionClosed){
@ -323,15 +345,28 @@ CgiStatus cgi_reset_seq(HttpdConnData *conn)
nvs_close(handle); nvs_close(handle);
send_reply: send_reply:
httpdStartResponse(conn, 200); if(result == ESP_OK){
httpdHeader(conn, "Content-Type", "text/json"); httpdRedirect(conn, "/index.tpl");
httpdEndHeaders(conn); } else {
httpdStartResponse(conn, 500);
httpdHeader(conn, "Content-Type", "text/html");
httpdEndHeaders(conn);
snprintf(buff, sizeof(buff), "%s", result == ESP_OK ? "true" : "false"); httpdSend(conn, HTML_HEADER, -1);
httpdSend(conn, buff, -1); httpdSend(conn, "<body>"
"<h1>ESP32 Gameboy Printer</h1>"
"<p>"
"Error resetting image sequence."
"<br>"
"<a href=\"/index.tpl\">Go back</a>"
"<br>"
"<a href=\"/reset_seq\">Retry</a>"
"</p>"
"</body>"
"</html>", -1);
}
err_out: err_out:
return HTTPD_CGI_DONE; return HTTPD_CGI_DONE;
} }
@ -355,8 +390,8 @@ esp_err_t http_srv_init(void)
HTTPD_FLAG_NONE); HTTPD_FLAG_NONE);
if(status != InitializationSuccess){ if(status != InitializationSuccess){
result = ESP_FAIL; result = ESP_FAIL;
goto err_out; goto err_out;
} }
httpdFreertosStart(&httpd_instance); httpdFreertosStart(&httpd_instance);
@ -386,7 +421,7 @@ void draw_tile(uint8_t *data, uint8_t *image)
esp_err_t draw_bitmap(struct pr_data *data) esp_err_t draw_bitmap(struct pr_data *data)
{ {
size_t w, h, x, y; size_t w, h, x, y;
uint8_t *tile_data, *tile_image; uint8_t *tile_data, *tile_dest;
unsigned int tile; unsigned int tile;
esp_err_t result; esp_err_t result;
@ -408,8 +443,8 @@ esp_err_t draw_bitmap(struct pr_data *data)
y = 8 * (tile / 20); y = 8 * (tile / 20);
tile_data = &(data->data[tile * 16]); tile_data = &(data->data[tile * 16]);
tile_image = &(render_buff[(x * 2) + (y * 40)]); tile_dest = &(render_buff[(x * 2) + (y * 40)]);
draw_tile(tile_data, tile_image); draw_tile(tile_data, tile_dest);
} }
memmove(data->data, render_buff, data->data_len); memmove(data->data, render_buff, data->data_len);