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

Is mir egal ob der webserver korrekt arbeitet (keine locks)

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-12-28 19:57:55 +01:00
parent 9d09c9ceaf
commit 27863b2bf0
9 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config_allfeatures.cmake
View File

@@ -119,6 +119,5 @@ set(BOBBYCAR_BUILDFLAGS
-DOLD_NVS -DOLD_NVS
-DFEATURE_DNS_NS -DFEATURE_DNS_NS
-DSWITCH_BLINK -DSWITCH_BLINK
-DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_FUNKTIONIERT
-DFEATURE_ESPNOW -DFEATURE_ESPNOW
) )

2
config_comred.cmake
View File

@@ -119,7 +119,7 @@ set(BOBBYCAR_BUILDFLAGS
-DOLD_NVS -DOLD_NVS
-DFEATURE_DNS_NS -DFEATURE_DNS_NS
-DSWITCH_BLINK -DSWITCH_BLINK
# -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_FUNKTIONIERT -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
-DFEATURE_ESPNOW -DFEATURE_ESPNOW
) )

1
config_feedc0de.cmake
View File

@@ -100,6 +100,5 @@ set(BOBBYCAR_BUILDFLAGS
-DOLD_NVS -DOLD_NVS
# -DFEATURE_DNS_NS # -DFEATURE_DNS_NS
# -DSWITCH_BLINK # -DSWITCH_BLINK
-DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_FUNKTIONIERT
# -DFEATURE_ESPNOW # -DFEATURE_ESPNOW
) )

2
config_nofeatures.cmake
View File

@@ -119,6 +119,6 @@ set(BOBBYCAR_BUILDFLAGS
-DOLD_NVS -DOLD_NVS
# -DFEATURE_DNS_NS # -DFEATURE_DNS_NS
# -DSWITCH_BLINK # -DSWITCH_BLINK
# -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_FUNKTIONIERT -DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
# -DFEATURE_ESPNOW # -DFEATURE_ESPNOW
) )

1
config_peter.cmake
View File

@@ -99,6 +99,7 @@ set(BOBBYCAR_BUILDFLAGS
-DOLD_NVS -DOLD_NVS
-DFEATURE_DNS_NS -DFEATURE_DNS_NS
-DFEATURE_ESPNOW -DFEATURE_ESPNOW
-DFEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
) )
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake") if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake")

6
main/webserver.cpp
View File

@@ -19,8 +19,8 @@ httpd_handle_t httpdHandle;
void initWebserver() void initWebserver()
{ {
#ifndef FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
webserver_lock.construct(); webserver_lock.construct();
#ifdef FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_FUNKTIONIERT
webserver_lock->take(portMAX_DELAY); webserver_lock->take(portMAX_DELAY);
#endif #endif
@@ -66,7 +66,7 @@ void initWebserver()
void handleWebserver() void handleWebserver()
{ {
#ifdef FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_FUNKTIONIERT #ifndef FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
webserver_lock->give(); webserver_lock->give();
webserver_lock->take(portMAX_DELAY); webserver_lock->take(portMAX_DELAY);
#endif #endif
@@ -129,7 +129,7 @@ bool menuDisplayChanged()
esp_err_t webserver_status_handler(httpd_req_t *req) esp_err_t webserver_status_handler(httpd_req_t *req)
{ {
#ifdef FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_FUNKTIONIERT #ifndef FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
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()};
if (!helper.locked()) if (!helper.locked())
{ {

2
main/webserver_lock.cpp
View File

@@ -1,3 +1,5 @@
#include "webserver_lock.h" #include "webserver_lock.h"
#ifndef FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
cpputils::DelayedConstruction<espcpputils::mutex_semaphore> webserver_lock; cpputils::DelayedConstruction<espcpputils::mutex_semaphore> webserver_lock;
#endif

2
main/webserver_lock.h
View File

@@ -4,4 +4,6 @@
#include <delayedconstruction.h> #include <delayedconstruction.h>
#include <wrappers/mutex_semaphore.h> #include <wrappers/mutex_semaphore.h>
#ifndef FEATURE_IS_MIR_EGAL_OB_DER_WEBSERVER_KORREKT_ARBEITET
extern cpputils::DelayedConstruction<espcpputils::mutex_semaphore> webserver_lock; extern cpputils::DelayedConstruction<espcpputils::mutex_semaphore> webserver_lock;
#endif