andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-04-29 12:05:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3022 from proddy/core3

Browse Source 
fix merge errors
This commit is contained in:
Proddy
2026-04-16 08:46:06 +02:00
committed by GitHub
parent f8257de0dd 5210fab4cb
commit 2c8eb534af
3 changed files with 2030 additions and 1736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -52,13 +52,13 @@ INCLUDES := src/core src/devices src/web src/test lib_standalone lib/* lib/semv
LIBRARIES :=
CPPCHECK = cppcheck
CHECKFLAGS = -q --force --std=gnu++17
CHECKFLAGS = -q --force --std=gnu++20
#----------------------------------------------------------------------
# Languages Standard
#----------------------------------------------------------------------
C_STANDARD := -std=c17
CXX_STANDARD := -std=gnu++17
C_STANDARD := -std=c20
CXX_STANDARD := -std=gnu++20
#----------------------------------------------------------------------
# Defined Symbols

3756
src/core/system.cpp
View File

File diff suppressed because it is too large Load Diff

4
src/web/WebSchedulerService.cpp
View File

@@ -352,7 +352,7 @@ bool WebSchedulerService::command(const char * name, const std::string & command
// parse json
JsonDocument doc;
if (deserializeJson(doc, cmd) == DeserializationError::Ok) {
HTTPClient http;
// HTTPClient http;
std::string url = doc["url"] | "";
// for a GET with parameters replace commands with values
// don't search the complete url, it may contain a devicename in path
@@ -461,7 +461,7 @@ bool WebSchedulerService::command(const char * name, const std::string & command
return true;
} else
#endif
if (Helpers::toLower(url.c_str()).starts_with("http://")) {
if (Helpers::toLower(url.c_str()).starts_with("http://")) {
HTTPClient * http = new HTTPClient;
if (http->begin(url.c_str())) {
bool content_set = false;