feedc0de/deckenlampe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated espwifistack

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-07-20 19:38:18 +02:00
parent 4f7997568c
commit 721abe14e8
3 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/espwifistack

Submodule components/espwifistack updated: 581b478de0...79e5736649

2
main/mywifi.cpp
View File

@@ -38,7 +38,7 @@ wifi_stack::config makeWifiConfig()
wifi_stack::wifi_entry { .ssid = {}, .key = {} } wifi_stack::wifi_entry { .ssid = {}, .key = {} }
}, },
.sta_ip = { .sta_ip = {
.dhcpEnabled = true, .staticIpEnabled = false,
// .staticIp = {}, // .staticIp = {},
// .staticGateway = {}, // .staticGateway = {},
// .staticSubnet = {}, // .staticSubnet = {},

39
main/webserver.cpp
View File

@@ -3,6 +3,7 @@
// system includes // system includes
#include <string_view> #include <string_view>
#include <string> #include <string>
#include <atomic>
// esp-idf includes // esp-idf includes
#include <esp_log.h> #include <esp_log.h>
@@ -34,6 +35,8 @@ constexpr const char * const TAG = "WEBSERVER";
template<typename T> T htmlentities(const T &val) { return val; } // TODO template<typename T> T htmlentities(const T &val) { return val; } // TODO
template<typename T> T htmlentities(T &&val) { return val; } // TODO template<typename T> T htmlentities(T &&val) { return val; } // TODO
std::atomic<bool> shouldReboot;
esp_err_t webserver_root_handler(httpd_req_t *req); esp_err_t webserver_root_handler(httpd_req_t *req);
esp_err_t webserver_on_handler(httpd_req_t *req); esp_err_t webserver_on_handler(httpd_req_t *req);
esp_err_t webserver_off_handler(httpd_req_t *req); esp_err_t webserver_off_handler(httpd_req_t *req);
@@ -75,6 +78,12 @@ void update_webserver()
{ {
if (!config::enable_webserver.value()) if (!config::enable_webserver.value())
return; return;
if (shouldReboot)
{
shouldReboot = false;
esp_restart();
}
} }
namespace { namespace {
@@ -132,9 +141,7 @@ esp_err_t webserver_root_handler(httpd_req_t *req)
return result; return result;
CALL_AND_EXIT_ON_ERROR(httpd_resp_set_type, req, "text/html") CALL_AND_EXIT_ON_ERROR(httpd_resp_set_type, req, "text/html")
CALL_AND_EXIT_ON_ERROR(httpd_resp_send, req, body.data(), body.size()) CALL_AND_EXIT(httpd_resp_send, req, body.data(), body.size())
return ESP_OK;
} }
esp_err_t webserver_dht_display(httpd_req_t *req, std::string &body) esp_err_t webserver_dht_display(httpd_req_t *req, std::string &body)
@@ -469,7 +476,7 @@ esp_err_t webserver_on_handler(httpd_req_t *req)
{ {
if (!config::enable_lamp.value()) { if (!config::enable_lamp.value()) {
ESP_LOGW(TAG, "lamp support not enabled!"); ESP_LOGW(TAG, "lamp support not enabled!");
CALL_AND_EXIT_ON_ERROR(httpd_resp_send_err, req, HTTPD_400_BAD_REQUEST, "lamp support not enabled!") CALL_AND_EXIT(httpd_resp_send_err, req, HTTPD_400_BAD_REQUEST, "lamp support not enabled!")
} }
const bool state = (lampState = true); const bool state = (lampState = true);
@@ -480,16 +487,14 @@ esp_err_t webserver_on_handler(httpd_req_t *req)
std::string_view body{"ON called..."}; std::string_view body{"ON called..."};
CALL_AND_EXIT_ON_ERROR(httpd_resp_set_type, req, "text/html") CALL_AND_EXIT_ON_ERROR(httpd_resp_set_type, req, "text/html")
CALL_AND_EXIT_ON_ERROR(httpd_resp_send, req, body.data(), body.size()) CALL_AND_EXIT(httpd_resp_send, req, body.data(), body.size())
return ESP_OK;
} }
esp_err_t webserver_off_handler(httpd_req_t *req) esp_err_t webserver_off_handler(httpd_req_t *req)
{ {
if (!config::enable_lamp.value()) { if (!config::enable_lamp.value()) {
ESP_LOGW(TAG, "lamp support not enabled!"); ESP_LOGW(TAG, "lamp support not enabled!");
CALL_AND_EXIT_ON_ERROR(httpd_resp_send_err, req, HTTPD_400_BAD_REQUEST, "lamp support not enabled!") CALL_AND_EXIT(httpd_resp_send_err, req, HTTPD_400_BAD_REQUEST, "lamp support not enabled!")
} }
const bool state = (lampState = false); const bool state = (lampState = false);
@@ -500,16 +505,14 @@ esp_err_t webserver_off_handler(httpd_req_t *req)
std::string_view body{"OFF called..."}; std::string_view body{"OFF called..."};
CALL_AND_EXIT_ON_ERROR(httpd_resp_set_type, req, "text/html") CALL_AND_EXIT_ON_ERROR(httpd_resp_set_type, req, "text/html")
CALL_AND_EXIT_ON_ERROR(httpd_resp_send, req, body.data(), body.size()) CALL_AND_EXIT(httpd_resp_send, req, body.data(), body.size())
return ESP_OK;
} }
esp_err_t webserver_toggle_handler(httpd_req_t *req) esp_err_t webserver_toggle_handler(httpd_req_t *req)
{ {
if (!config::enable_lamp.value()) { if (!config::enable_lamp.value()) {
ESP_LOGW(TAG, "lamp support not enabled!"); ESP_LOGW(TAG, "lamp support not enabled!");
CALL_AND_EXIT_ON_ERROR(httpd_resp_send_err, req, HTTPD_400_BAD_REQUEST, "lamp support not enabled!") CALL_AND_EXIT(httpd_resp_send_err, req, HTTPD_400_BAD_REQUEST, "lamp support not enabled!")
} }
const bool state = (lampState = !lampState); const bool state = (lampState = !lampState);
@@ -520,20 +523,16 @@ esp_err_t webserver_toggle_handler(httpd_req_t *req)
std::string_view body{"TOGGLE called..."}; std::string_view body{"TOGGLE called..."};
CALL_AND_EXIT_ON_ERROR(httpd_resp_set_type, req, "text/html") CALL_AND_EXIT_ON_ERROR(httpd_resp_set_type, req, "text/html")
CALL_AND_EXIT_ON_ERROR(httpd_resp_send, req, body.data(), body.size()) CALL_AND_EXIT(httpd_resp_send, req, body.data(), body.size())
return ESP_OK;
} }
esp_err_t webserver_reboot_handler(httpd_req_t *req) esp_err_t webserver_reboot_handler(httpd_req_t *req)
{ {
shouldReboot = true;
std::string_view body{"REBOOT called..."}; std::string_view body{"REBOOT called..."};
CALL_AND_EXIT_ON_ERROR(httpd_resp_set_type, req, "text/html") CALL_AND_EXIT_ON_ERROR(httpd_resp_set_type, req, "text/html")
CALL_AND_EXIT_ON_ERROR(httpd_resp_send, req, body.data(), body.size()) CALL_AND_EXIT(httpd_resp_send, req, body.data(), body.size())
esp_restart();
return ESP_OK;
} }
} // namespace } // namespace
} // namespace deckenlampe } // namespace deckenlampe