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

Added json versions of websites

Browse Source
This commit is contained in:
CommanderRedYT
2021-12-09 00:33:40 +01:00
parent 98641cfc04
commit 8caf8789dd
2 changed files with 114 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
main/webserver_displaycontrol.cpp
View File

@ -19,6 +19,54 @@ esp_err_t webserver_root_handler(httpd_req_t *req)
std::string body;
std::string wants_json_query;
if (auto result = esphttpdutils::webserver_get_query(req))
wants_json_query = *result;
else
{
ESP_LOGE(TAG, "%.*s", result.error().size(), result.error().data());
CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::BadRequest, "text/plain", result.error());
}
char tmpBuf[256];
const auto key_result = httpd_query_key_value(wants_json_query.data(), "json", tmpBuf, 256);
if (key_result == ESP_OK)
{
body += "{";
if (auto currentDisplay = static_cast<const espgui::Display *>(espgui::currentDisplay.get()))
{
body.reserve(4096);
if (const auto *textInterface = currentDisplay->asTextInterface())
{
body += fmt::format("\"name:\"{}\",", textInterface->text());
}
if (const auto *menuDisplay = currentDisplay->asMenuDisplay())
{
body += fmt::format("\"index\":{},\"items\":[", menuDisplay->selectedIndex());
menuDisplay->runForEveryMenuItem([&,selectedIndex=menuDisplay->selectedIndex()](const espgui::MenuItem &menuItem){
body += "{";
body += fmt::format("\"name\":\"{}\",\"icon\":\"{}\"", menuItem.text(), "none"); // menuItem.icon()->name
body += "},";
});
body += "],";
}
else if (const auto *changeValueDisplay = currentDisplay->asChangeValueDisplayInterface())
{
body += fmt::format("\"value\":\"{}\",", changeValueDisplay->shownValue());
}
else
{
body += "\"err\":\"Screen not implemented yet.\",";
}
}
else
{
body += "\"err\":\"Currently no screen instantiated.\",";
}
body += "}";
}
else
{
HtmlTag htmlTag{"html", body};
@ -105,7 +153,7 @@ esp_err_t webserver_root_handler(httpd_req_t *req)
}
}
CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::Ok, "text/html", body)
CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::Ok, (key_result == ESP_OK) ? "application/json":"text/html", body)
}
esp_err_t webserver_triggerButton_handler(httpd_req_t *req)

66
main/webserver_ota.cpp
View File

@ -23,6 +23,70 @@ esp_err_t webserver_ota_handler(httpd_req_t *req)
std::string body;
std::string wants_json_query;
if (auto result = esphttpdutils::webserver_get_query(req))
wants_json_query = *result;
else
{
ESP_LOGE(TAG, "%.*s", result.error().size(), result.error().data());
CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::BadRequest, "text/plain", result.error());
}
char tmpBuf[256];
const auto key_result = httpd_query_key_value(wants_json_query.data(), "json", tmpBuf, 256);
if (key_result == ESP_OK)
{
body += "{";
if (const esp_app_desc_t *app_desc = esp_ota_get_app_description())
{
body += fmt::format("\"cur_name\":\"{}\",", app_desc->project_name);
body += fmt::format("\"cur_ver\":\"{}\",", app_desc->version);
body += fmt::format("\"cur_secver\":\"{}\",", app_desc->secure_version);
body += fmt::format("\"cur_ts\":\"{}\",", app_desc->time);
body += fmt::format("\"cur_idf\":\"{}\",", app_desc->idf_ver);
body += fmt::format("\"cur_sha\":\"{}\",", espcpputils::toHexString({app_desc->app_elf_sha256, 8}));
}
else
{
body += "\"err\":\"Could not access esp_ota_get_app_description()\",";
}
body += "\"updater\":{";
if (asyncOta)
{
body += fmt::format("\"status\":\"{}\"", toString(asyncOta->status()));
if (const auto &appDesc = asyncOta->appDesc())
{
const auto progress = asyncOta->progress();
const auto totalSize = asyncOta->totalSize();
body += fmt::format("\"cur_ota_percent\":\"{}\",", (totalSize && *totalSize > 0) ? fmt::format("{:.02f}", float(progress) / *totalSize * 100) : "?");
body += fmt::format("\"cur_ota_progress\":\"{}\",", progress);
body += fmt::format("\"cur_ota_total\":\"{}\",", totalSize ? std::to_string(*totalSize) : "?");
body += fmt::format("\"new_name\":\"{}\",", appDesc->project_name);
body += fmt::format("\"new_ver\":\"{}\",", appDesc->version);
body += fmt::format("\"new_secver\":\"{}\",", appDesc->secure_version);
body += fmt::format("\"new_ts\":\"{}\",", appDesc->time);
body += fmt::format("\"new_idf\":\"{}\",", appDesc->idf_ver);
body += fmt::format("\"new_sha\":\"{}\",", espcpputils::toHexString({appDesc->app_elf_sha256, 8}));
}
else
{
body += "\"err\":\"Could not access asyncOta->appDesc()\",";
}
}
else
{
body += "\"info\":\"Updater is not constructed.\"";
}
body += "}}";
}
else
{
HtmlTag htmlTag{"html", body};
@ -197,7 +261,7 @@ esp_err_t webserver_ota_handler(httpd_req_t *req)
}
}
CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::Ok, "text/html", body)
CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::Ok, (key_result == ESP_OK) ? "application/json" : "text/html", body)
}
esp_err_t webserver_trigger_ota_handler(httpd_req_t *req)