From 34024760d3aec9cfa50d1e4d62fc001b1ad45c2f Mon Sep 17 00:00:00 2001 From: Hendrik Rauh <114620133+HendrikRauh@users.noreply.github.com> Date: Thu, 24 Oct 2024 19:07:52 +0200 Subject: [PATCH 1/5] formatted extensions --- .vscode/extensions.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index e24696e..080e70d 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,6 +1,10 @@ { // See http://go.microsoft.com/fwlink/?LinkId=827846 // for the documentation about the extensions.json format - "recommendations": ["platformio.platformio-ide"], - "unwantedRecommendations": ["ms-vscode.cpptools-extension-pack"] + "recommendations": [ + "platformio.platformio-ide" + ], + "unwantedRecommendations": [ + "ms-vscode.cpptools-extension-pack" + ] } From 705f2026509bede58020741b0f40f2e73700b2c1 Mon Sep 17 00:00:00 2001 From: Hendrik Rauh <114620133+HendrikRauh@users.noreply.github.com> Date: Thu, 31 Oct 2024 22:25:28 +0100 Subject: [PATCH 2/5] defined Async Webserver --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index eec3bd7..a372945 100644 --- a/platformio.ini +++ b/platformio.ini @@ -15,4 +15,4 @@ framework = arduino lib_deps = hideakitai/ArtNet @ ^0.8.0 bblanchon/ArduinoJson @ ^7.2.0 - ESP Async WebServer + me-no-dev/ESP Async WebServer From d8f1bf9111270ec00f77d8583c39228267ffd04c Mon Sep 17 00:00:00 2001 From: Hendrik Rauh <114620133+HendrikRauh@users.noreply.github.com> Date: Thu, 31 Oct 2024 22:53:57 +0100 Subject: [PATCH 3/5] fixed outdated jsonDocument --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 39c9646..eec27b7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -76,7 +76,7 @@ void setup() server.on("/config", HTTP_GET, [&, defaultIp, ssid, pwd, universe](AsyncWebServerRequest *request) { - DynamicJsonDocument doc(1024); + JsonDocument doc; doc["ssid"] = ssid; doc["pwd"] = pwd; From 106dbaf9750cc457cb3f602667a18c7b1c588c25 Mon Sep 17 00:00:00 2001 From: RaffaelW Date: Thu, 31 Oct 2024 23:27:07 +0100 Subject: [PATCH 4/5] added callback for request body --- src/main.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 39c9646..97e4dcb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -87,6 +87,17 @@ void setup() serializeJson(doc, jsonString); request->send(200, "application/json", jsonString); }); + + server.onRequestBody([](AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) + { + if (request->url() == "/config" && request->method() == HTTP_PUT) { + Serial.printf("[REQUEST]\t%s\r\n", (const char *)data); + + StaticJsonDocument<256> doc; + deserializeJson(doc, data); + request->send(200); + } }); + delay(1000); server.begin(); Serial.println("Server started!"); @@ -95,4 +106,4 @@ void setup() void loop() { artnet.parse(); // check if artnet packet has come and execute callback -} \ No newline at end of file +} From 13055b4b320c1b09a42ab347967aceb1e4d6aff4 Mon Sep 17 00:00:00 2001 From: RaffaelW Date: Sat, 2 Nov 2024 00:07:33 +0100 Subject: [PATCH 5/5] added settings.json to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 691739c..6e29f8f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ .vscode/c_cpp_properties.json .vscode/launch.json .vscode/ipch +.vscode/settings.json \ No newline at end of file