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

Changed html to json export

Browse Source
This commit is contained in:
CommanderRedYT
2021-11-14 18:05:20 +01:00
parent b81afae5be
commit 249ab13d73
1 changed files with 57 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

221
main/webserver_dumpnvs.h
View File

@ -13,6 +13,7 @@
#include <esphttpdutils.h> #include <esphttpdutils.h>
#include <lockhelper.h> #include <lockhelper.h>
#include <tickchrono.h> #include <tickchrono.h>
#include <ArduinoJson.h>
// local includes // local includes
#include "globals.h" #include "globals.h"
@ -32,12 +33,12 @@ template<typename T>
typename std::enable_if< typename std::enable_if<
!std::is_same<T, bool>::value && !std::is_same<T, bool>::value &&
!std::is_integral<T>::value && !std::is_integral<T>::value &&
!std::is_same<T, std::array<int8_t, 4>>::value !std::is_same<T, std::array<int8_t, 4>>::value &&
!std::is_same<T, std::string>::value
, bool>::type , bool>::type
showInputForSetting(std::string_view key, T value, std::string &body) showInputForSetting(std::string_view key, T value, JsonObject &body)
{ {
HtmlTag spanTag{"span", "style=\"color: red;\"", body}; body[key] = nullptr;
body += "Unsupported config type";
return false; return false;
} }
@ -45,13 +46,9 @@ template<typename T>
typename std::enable_if< typename std::enable_if<
std::is_same<T, bool>::value std::is_same<T, bool>::value
, bool>::type , bool>::type
showInputForSetting(std::string_view key, T value, std::string &body) showInputForSetting(std::string_view key, T value, JsonObject &body)
{ {
body += fmt::format("<input type=\"checkbox\" readonly name=\"{}\" value=\"true\" {}/>" body[key] = value;
"<input type=\"hidden\" readonly name=\"{}\" value=\"false\" />",
esphttpdutils::htmlentities(key),
value ? "checked " : "",
esphttpdutils::htmlentities(key));
return true; return true;
} }
@ -60,13 +57,9 @@ typename std::enable_if<
!std::is_same<T, bool>::value && !std::is_same<T, bool>::value &&
std::is_integral<T>::value std::is_integral<T>::value
, bool>::type , bool>::type
showInputForSetting(std::string_view key, T value, std::string &body) showInputForSetting(std::string_view key, T value, JsonObject &body)
{ {
body += fmt::format("<input type=\"number\" name=\"{}\" value=\"{}\" min=\"{}\" max=\"{}\" step=\"1\" required readonly/>", body[key] = value;
esphttpdutils::htmlentities(key),
value,
std::numeric_limits<T>::min(),
std::numeric_limits<T>::max());
return true; return true;
} }
@ -74,17 +67,24 @@ template<typename T>
typename std::enable_if< typename std::enable_if<
std::is_same<T, std::array<int8_t, 4>>::value std::is_same<T, std::array<int8_t, 4>>::value
, bool>::type , bool>::type
showInputForSetting(std::string_view key, T value, std::string &body) showInputForSetting(std::string_view key, T value, JsonObject &body)
{ {
body += fmt::format("<input type=\"text\" name=\"{}\" value=\"{}{}{}{}\" pattern=\"[0-9]{{4}}\" required readonly/>", std::string array_str = fmt::format("{}{}{}{}", value[0], value[1], value[2], value[3]);
esphttpdutils::htmlentities(key), body[key] = array_str;
value[0],
value[1],
value[2],
value[3]);
return true; return true;
} }
template<typename T>
typename std::enable_if<
std::is_same<T, std::string>::value
, bool>::type
showInputForSetting(std::string_view key, T value, JsonObject &body)
{
body[key] = value;
return true;
}
esp_err_t webserver_dump_nvs_handler(httpd_req_t *req) esp_err_t webserver_dump_nvs_handler(httpd_req_t *req)
{ {
espcpputils::LockHelper helper{webserver_lock->handle, std::chrono::ceil<espcpputils::ticks>(5s).count()}; espcpputils::LockHelper helper{webserver_lock->handle, std::chrono::ceil<espcpputils::ticks>(5s).count()};
@ -95,160 +95,53 @@ esp_err_t webserver_dump_nvs_handler(httpd_req_t *req)
CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::BadRequest, "text/plain", msg); CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::BadRequest, "text/plain", msg);
} }
std::string body; DynamicJsonDocument doc(6144);
body.reserve(1024*60);
const auto profile = settingsPersister.currentlyOpenProfileIndex(); const auto profile = settingsPersister.currentlyOpenProfileIndex();
const auto switchBackProfile = profile ? int(*profile) : 0; const auto switchBackProfile = profile ? int(*profile) : 0;
{ JsonObject json_settings = doc.createNestedObject("settings");
HtmlTag htmlTag{"html", body}; settings.executeForEveryCommonSetting([&](std::string_view key, const auto &value){
showInputForSetting(key, value, json_settings);
});
{ JsonObject json_stringSettings = doc.createNestedObject("stringSettings");
HtmlTag headTag{"head", body}; stringSettings.executeForEveryCommonSetting([&](std::string_view key, const auto &value){
showInputForSetting(key, value, json_stringSettings);
});
{ JsonObject profiles = doc.createNestedObject("profiles");
HtmlTag titleTag{"title", body};
body += "NVS dump";
}
body += "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\" />"; // Profile settings
for (uint8_t profile_num = 0; profile_num < 4; profile_num++) {
HtmlTag styleTag{"style", "type=\"text/css\"", body};
body +=
".form-table {"
"display: table;"
"border-collapse: separate;"
"border-spacing: 10px 0;"
"}"
".form-table .form-table-row {"
"display: table-row;"
"}"
".form-table .form-table-row .form-table-cell {"
"display: table-cell;"
"}";
}
{
HtmlTag bodyTag{"body", body};
{
HtmlTag h1Tag{"h1", body};
body += "NVS dump";
}
{
HtmlTag pTag{"p", body};
body += "<a href=\"/\">Display control</a> - "
#ifdef FEATURE_OTA
"<a href=\"/ota\">Update</a> - "
#endif
"<a href=\"/settings\">Settings</a> - "
"<a href=\"/stringSettings\">String Settings</a> - "
"<b>Dump NVS</b>";
}
HtmlTag divTag{"div", "class=\"form-table\"", body};
// Common setting
{
HtmlTag h1Tag{"h1", body};
body += "stringSettings";
}
stringSettings.executeForEveryCommonSetting([&](std::string_view key, const auto &value){
HtmlTag divTag{"div", "class=\"form-table-row\"", body};
{
HtmlTag divTag{"div", "class=\"form-table\"", body};
HtmlTag bTag{"b", body};
body += esphttpdutils::htmlentities(key);
}
{
HtmlTag divTag{"div", "class=\"form-table-cell\"", body};
body += fmt::format("<input type=\"text\" name=\"{}\" value=\"{}\" required readonly/>",
esphttpdutils::htmlentities(key),
esphttpdutils::htmlentities(value));
}
});
{
HtmlTag h1Tag{"h1", body};
body += "settings";
}
settings.executeForEveryCommonSetting([&](std::string_view key, const auto &value){
HtmlTag divTag{"div", "class=\"form-table-row\"", body};
{
HtmlTag divTag{"div", "class=\"form-table\"", body};
HtmlTag bTag{"b", body};
body += esphttpdutils::htmlentities(key);
}
{
HtmlTag divTag{"div", "class=\"form-table-cell\"", body};
showInputForSetting(key, value, body);
}
});
// Profile settings
for (uint8_t profile_num = 0; profile_num < 4; profile_num++) {
#ifdef SIMPLIFIED_TRIGGER_TRIGGERONPRESET #ifdef SIMPLIFIED_TRIGGER_TRIGGERONPRESET
if (profile_num == SIMPLIFIED_TRIGGER_TRIGGERONPRESET) { if (profile_num == SIMPLIFIED_TRIGGER_TRIGGERONPRESET) {
continue; continue;
}
#endif
switchProfile(profile_num);
const auto cur_profile = settingsPersister.currentlyOpenProfileIndex();
const auto cur_profile_int = profile ? int(*cur_profile) : 0;
{
HtmlTag h1Tag{"h1", body};
body += fmt::format("stringSettings (Profile {})", cur_profile_int);
}
stringSettings.executeForEveryProfileSetting([&](const char *key, auto &value){
HtmlTag divTag{"div", "class=\"form-table-row\"", body};
{
HtmlTag divTag{"div", "class=\"form-table\"", body};
HtmlTag bTag{"b", body};
body += esphttpdutils::htmlentities(key);
}
{
HtmlTag divTag{"div", "class=\"form-table-cell\"", body};
body += fmt::format("<input type=\"text\" name=\"{}\" value=\"{}\" required readonly/>",
esphttpdutils::htmlentities(key),
esphttpdutils::htmlentities(value));
}
});
{
HtmlTag h1Tag{"h1", body};
body += fmt::format("settings (Profile {})", cur_profile_int);
}
settings.executeForEveryProfileSetting([&](const char *key, auto &value){
HtmlTag divTag{"div", "class=\"form-table-row\"", body};
{
HtmlTag divTag{"div", "class=\"form-table\"", body};
HtmlTag bTag{"b", body};
body += esphttpdutils::htmlentities(key);
}
{
HtmlTag divTag{"div", "class=\"form-table-cell\"", body};
showInputForSetting(key, value, body);
}
});
}
} }
#endif
switchProfile(profile_num);
const auto cur_profile = settingsPersister.currentlyOpenProfileIndex();
const auto profile_str = cur_profile ? std::to_string(*cur_profile) : "-";
JsonObject profile = profiles.createNestedObject(profile_str);
JsonObject profile_stringSettings = profile.createNestedObject("stringSettings");
JsonObject profile_settings = profile.createNestedObject("settings");
stringSettings.executeForEveryProfileSetting([&](const char *key, auto &value){
showInputForSetting(key, value, profile_stringSettings);
});
settings.executeForEveryProfileSetting([&](const char *key, auto &value){
showInputForSetting(key, value, profile_settings);
});
} }
switchProfile(switchBackProfile); switchProfile(switchBackProfile);
CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::Ok, "text/html", body) std::string body;
serializeJson(doc, body);
CALL_AND_EXIT(esphttpdutils::webserver_resp_send, req, esphttpdutils::ResponseStatus::Ok, "application/json", body)
} }
} // namespace } // namespace