feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added color and fixed json

Browse Source
This commit is contained in:
CommanderRedYT
2021-12-10 10:01:49 +01:00
parent f2e5478106
commit 1f9a53dd7e
2 changed files with 71 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
main/webserver_displaycontrol.cpp
View File

@@ -47,7 +47,52 @@ esp_err_t webserver_root_handler(httpd_req_t *req)
body += fmt::format("\"index\":{},\"items\":[", menuDisplay->selectedIndex()); body += fmt::format("\"index\":{},\"items\":[", menuDisplay->selectedIndex());
menuDisplay->runForEveryMenuItem([&,selectedIndex=menuDisplay->selectedIndex()](const espgui::MenuItem &menuItem){ menuDisplay->runForEveryMenuItem([&,selectedIndex=menuDisplay->selectedIndex()](const espgui::MenuItem &menuItem){
body += "{"; body += "{";
body += fmt::format("\"name\":\"{}\",\"icon\":\"{}\"", menuItem.text(), (menuItem.icon()) ? menuItem.icon()->name : ""); const auto itemName = menuItem.text();
std::string color{};
std::string font{};
switch (menuItem.color()) {
case TFT_RED:
color = "&1";
break;
case TFT_GREEN:
color = "&2";
break;
case TFT_BLUE:
color = "&3";
break;
case TFT_YELLOW:
color = "&4";
break;
case TFT_BLACK:
color = "&5";
break;
case TFT_WHITE:
color = "&6";
break;
case TFT_GREY:
case TFT_DARKGREY:
color = "&7";
break;
default:
color = "";
break;
}
switch (menuItem.font())
{
case 2:
font = "&s";
break;
case 4:
font = "&m";
break;
default:
font = "";
break;
}
std::string menuItemName = font + color + itemName;
body += fmt::format("\"name\":\"{}\",\"icon\":\"{}\",\"index\":{}", menuItemName, (menuItem.icon()) ? menuItem.icon()->name : "", selectedIndex);
body += "},"; body += "},";
}); });
body += "],"; body += "],";
@@ -66,8 +111,16 @@ esp_err_t webserver_root_handler(httpd_req_t *req)
body += "\"err\":\"Currently no screen instantiated.\","; body += "\"err\":\"Currently no screen instantiated.\",";
} }
body += "}"; body += "}";
size_t lastGesch = body.rfind("},");
if (std::string::npos != lastGesch)
body = body.erase(lastGesch+1, 1);
size_t lastEckig = body.rfind("],");
if (std::string::npos != lastEckig)
body = body.erase(lastEckig+1, 1);
} }
else if (tmpBuf != stringSettings.webserver_password) else if (key_result != ESP_ERR_NOT_FOUND && tmpBuf != stringSettings.webserver_password)
{ {
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*"); httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::Unauthorized, "text/plain", ""); CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::Unauthorized, "text/plain", "");

17
main/webserver_ota.cpp
View File

@@ -52,11 +52,19 @@ esp_err_t webserver_ota_percentage_handler(httpd_req_t *req)
body += "}"; body += "}";
} }
else if (tmpBuf != stringSettings.webserver_password) else if (key_result != ESP_ERR_NOT_FOUND && tmpBuf != stringSettings.webserver_password)
{ {
CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::Unauthorized, "text/plain", ""); CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::Unauthorized, "text/plain", "");
} }
size_t lastGesch = body.rfind("},");
if (std::string::npos != lastGesch)
body = body.erase(lastGesch+1, 1);
size_t lastEckig = body.rfind("],");
if (std::string::npos != lastEckig)
body = body.erase(lastEckig+1, 1);
CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::Ok, (key_result == ESP_OK) ? "application/json" : "text/html", body) CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::Ok, (key_result == ESP_OK) ? "application/json" : "text/html", body)
} }
@@ -135,6 +143,13 @@ esp_err_t webserver_ota_handler(httpd_req_t *req)
} }
body += "}}"; body += "}}";
size_t lastGesch = body.rfind("},");
if (std::string::npos != lastGesch)
body = body.erase(lastGesch+1, 1);
size_t lastEckig = body.rfind("],");
if (std::string::npos != lastEckig)
body = body.erase(lastEckig+1, 1);
} }
else if (tmpBuf != stringSettings.webserver_password) else if (tmpBuf != stringSettings.webserver_password)
{ {