Skip to content

Feature/arduinojson6 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
c-klinger merged 2 commits into from
Jun 5, 2022
Merged

Feature/arduinojson6 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01b58bd
#11 Adjustments for arduinojson 6
c-klinger Jan 14, 2020
2eabe81
#11 ArduinoJSON updated to version 6 in readme
c-klinger Jan 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ The circuit uses an LD1117V33 voltage regulator with two capacitors as specified
## Code
### Dependencies
The mentioned versions are tested, other may work as well but may lead to compile issues.
* [esp8266 v.2.4.2](https://github.com/esp8266/Arduino)
* [ArduinoJSON v.5.13.3](https://github.com/bblanchon/ArduinoJson)
* [esp8266 v.2.4.2](https://github.com/esp8266/Arduino)
* [ArduinoJSON v.6.13.0](https://github.com/bblanchon/ArduinoJson)

### Configuration

Expand Down
11 changes: 6 additions & 5 deletions WifiRGB/WifiRGB.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,14 @@ void handleApiRequest() {
*/

const size_t bufferSize = JSON_OBJECT_SIZE(3) + JSON_OBJECT_SIZE(4) + 70;
DynamicJsonBuffer jsonBuffer(bufferSize);
JsonObject& root = jsonBuffer.parseObject(server.arg("plain"));
DynamicJsonDocument jsonDocument(bufferSize);
deserializeJson(jsonDocument, server.arg("plain"));

Serial.println("JSON Body: ");
root.printTo(Serial);
serializeJson(jsonDocument, Serial);
Serial.println();

JsonObject root = jsonDocument.as<JsonObject>();
const char* state = root["state"]; // "ON" or "OFF"
if(strcmp("OFF", state) == 0) {
Serial.println("State OFF found: switching off");
Expand All @@ -165,12 +166,12 @@ void handleApiRequest() {

// DEBUG: color
Serial.print("Color: ");
root["color"].printTo(Serial);
serializeJson(root["color"], Serial);
Serial.println();

RGB rgb = {0, 0, 0};
JsonObject& color = root["color"];

JsonObject color = root["color"];
// If RGB mode: Parse RGB values
if(color["mode"] == "rgb") {
// Indeed, the JsonVariant returned by root["..."] has a special implementation of the == operator that knows how to compare string safely.
Expand Down