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

Removed -DOLD_NVS; Implemented dump-nvs for new config system

Browse Source
This commit is contained in:
CommanderRedYT
2022-01-18 09:07:27 +01:00
parent 777134eaf1
commit 3ccccc81a9
8 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config_allfeatures.cmake
View File

@ -73,7 +73,6 @@ set(BOBBYCAR_BUILDFLAGS
-DPINS_LEDSTRIP=33 -DPINS_LEDSTRIP=33
-DHEAP_LRGST_CRASH_TEXT_FIX -DHEAP_LRGST_CRASH_TEXT_FIX
-DLEDSTRIP_WRONG_DIRECTION -DLEDSTRIP_WRONG_DIRECTION
-DOLD_NVS
-DFEATURE_DNS_NS -DFEATURE_DNS_NS
-DFEATURE_ESPNOW -DFEATURE_ESPNOW
) )

1
config_comred.cmake
View File

@ -66,7 +66,6 @@ set(BOBBYCAR_BUILDFLAGS
-DPINS_LEDSTRIP=33 -DPINS_LEDSTRIP=33
-DHEAP_LRGST_CRASH_TEXT_FIX -DHEAP_LRGST_CRASH_TEXT_FIX
# -DLEDSTRIP_WRONG_DIRECTION # -DLEDSTRIP_WRONG_DIRECTION
-DOLD_NVS
-DFEATURE_DNS_NS -DFEATURE_DNS_NS
-DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
-DFEATURE_ESPNOW -DFEATURE_ESPNOW

1
config_feedc0de.cmake
View File

@ -64,7 +64,6 @@ set(BOBBYCAR_BUILDFLAGS
-DPINS_LEDSTRIP=26 -DPINS_LEDSTRIP=26
# -DHEAP_LRGST_CRASH_TEXT_FIX # -DHEAP_LRGST_CRASH_TEXT_FIX
# -DLEDSTRIP_WRONG_DIRECTION # -DLEDSTRIP_WRONG_DIRECTION
-DOLD_NVS
-DFEATURE_DNS_NS -DFEATURE_DNS_NS
# -DSWITCH_BLINK # -DSWITCH_BLINK
# -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET # -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET

1
config_mick.cmake
View File

@ -63,7 +63,6 @@ set(BOBBYCAR_BUILDFLAGS
-DFEATURE_WIRELESS_CONFIG -DFEATURE_WIRELESS_CONFIG
-DPINS_LEDSTRIP=33 -DPINS_LEDSTRIP=33
# -DLEDSTRIP_WRONG_DIRECTION # -DLEDSTRIP_WRONG_DIRECTION
-DOLD_NVS
-DFEATURE_DNS_NS -DFEATURE_DNS_NS
-DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
) )

1
config_nofeatures.cmake
View File

@ -73,7 +73,6 @@ set(BOBBYCAR_BUILDFLAGS
-DPINS_LEDSTRIP=33 -DPINS_LEDSTRIP=33
# -DHEAP_LRGST_CRASH_TEXT_FIX # -DHEAP_LRGST_CRASH_TEXT_FIX
# -DLEDSTRIP_WRONG_DIRECTION # -DLEDSTRIP_WRONG_DIRECTION
-DOLD_NVS
# -DFEATURE_DNS_NS # -DFEATURE_DNS_NS
# -DSWITCH_BLINK # -DSWITCH_BLINK
-DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET

1
config_peter.cmake
View File

@ -64,7 +64,6 @@ set(BOBBYCAR_BUILDFLAGS
-DPINS_LEDSTRIP=33 -DPINS_LEDSTRIP=33
# -DHEAP_LRGST_CRASH_TEXT_FIX # -DHEAP_LRGST_CRASH_TEXT_FIX
# -DLEDSTRIP_WRONG_DIRECTION # -DLEDSTRIP_WRONG_DIRECTION
-DOLD_NVS
-DFEATURE_DNS_NS -DFEATURE_DNS_NS
# -DSWITCH_BLINK # -DSWITCH_BLINK
-DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET

4
main/webserver.cpp
View File

@ -25,9 +25,7 @@
#endif #endif
#include "webserver_settings.h" #include "webserver_settings.h"
#include "webserver_newsettings.h" #include "webserver_newsettings.h"
#ifdef OLD_NVS
#include "webserver_dumpnvs.h" #include "webserver_dumpnvs.h"
#endif
#include "globals.h" #include "globals.h"
#include "newsettings.h" #include "newsettings.h"
@ -86,9 +84,7 @@ void initWebserver()
httpd_uri_t { .uri = "/newSettings", .method = HTTP_GET, .handler = webserver_newSettings_handler, .user_ctx = NULL }, httpd_uri_t { .uri = "/newSettings", .method = HTTP_GET, .handler = webserver_newSettings_handler, .user_ctx = NULL },
httpd_uri_t { .uri = "/saveNewSettings", .method = HTTP_GET, .handler = webserver_saveNewSettings_handler, .user_ctx = NULL }, httpd_uri_t { .uri = "/saveNewSettings", .method = HTTP_GET, .handler = webserver_saveNewSettings_handler, .user_ctx = NULL },
httpd_uri_t { .uri = "/resetNewSettings", .method = HTTP_GET, .handler = webserver_resetNewSettings_handler, .user_ctx = NULL }, httpd_uri_t { .uri = "/resetNewSettings", .method = HTTP_GET, .handler = webserver_resetNewSettings_handler, .user_ctx = NULL },
#ifdef OLD_NVS
httpd_uri_t { .uri = "/dumpnvs", .method = HTTP_GET, .handler = webserver_dump_nvs_handler, .user_ctx = NULL }, httpd_uri_t { .uri = "/dumpnvs", .method = HTTP_GET, .handler = webserver_dump_nvs_handler, .user_ctx = NULL },
#endif
httpd_uri_t { .uri = "/check", .method = HTTP_GET, .handler = webserver_status_handler, .user_ctx = NULL }, httpd_uri_t { .uri = "/check", .method = HTTP_GET, .handler = webserver_status_handler, .user_ctx = NULL },
}) })
{ {

11
main/webserver_dumpnvs.cpp
View File

@ -146,6 +146,14 @@ esp_err_t webserver_dump_nvs_handler(httpd_req_t *req)
} }
} }
DynamicJsonDocument doc(6144); DynamicJsonDocument doc(6144);
JsonObject settings = doc.createNestedObject("settings");
configs.callForEveryConfig([&](auto &config){
const std::string_view nvsName{config.nvsName()};
showInputForSetting(nvsName, config.value, settings);
});
const auto profile = settingsPersister.currentlyOpenProfileIndex(); const auto profile = settingsPersister.currentlyOpenProfileIndex();
const auto switchBackProfile = profile ? int(*profile) : 0; const auto switchBackProfile = profile ? int(*profile) : 0;
@ -165,10 +173,9 @@ esp_err_t webserver_dump_nvs_handler(httpd_req_t *req)
const auto profile_str = cur_profile ? std::to_string(*cur_profile) : "-"; const auto profile_str = cur_profile ? std::to_string(*cur_profile) : "-";
JsonObject profile = profiles.createNestedObject(profile_str); JsonObject profile = profiles.createNestedObject(profile_str);
JsonObject profile_settings = profile.createNestedObject("settings");
profileSettings.executeForEveryProfileSetting([&](const char *key, auto &value){ profileSettings.executeForEveryProfileSetting([&](const char *key, auto &value){
showInputForSetting(key, value, profile_settings); showInputForSetting(key, value, profile);
}); });
} }