Skip to content

Support ArduinoJson version 6 #2

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

Open
clevertrack1 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support ArduinoJson version 6 #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
602770d
Make project file same as folder name for Arduino.
Sep 6, 2019
d3e1f91
Update code for ArduinoJson V6
Sep 6, 2019
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
18 changes: 9 additions & 9 deletions ESP.ino → ESP32-Captive.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

//************** Auxillary functions******************//
WebServer server(80);
StaticJsonBuffer<234> jsonBuffer;
StaticJsonDocument<234> jsonBuffer;

//**********softAPconfig Timer*************//
unsigned long APTimer = 0;
Expand Down Expand Up @@ -74,17 +74,17 @@ void setup() {
}
file.close();
if(debugLogData.length()>10){
JsonObject& readRoot =jsonBuffer.parseObject(debugLogData);
deserializeJson(jsonBuffer, debugLogData);
Serial.println("=====================================");
Serial.println(debugLogData);
Serial.println("=====================================");
if(readRoot.containsKey("staticSet")){
if(jsonBuffer.containsKey("staticSet")){
Serial.println("Static IP Started ");
staticAPConfig(readRoot["staticIP"],readRoot["staticGate"],readRoot["staticSub"],readRoot["ssidStatic"],readRoot["staticPass"]);
staticAPConfig(jsonBuffer["staticIP"],jsonBuffer["staticGate"],jsonBuffer["staticSub"],jsonBuffer["ssidStatic"],jsonBuffer["staticPass"]);
}
else if(readRoot.containsKey("dhcpSet")){
else if(jsonBuffer.containsKey("dhcpSet")){
Serial.println("DHCP IP Started" );
dhcpAPConfig(readRoot["ssidDHCP"],readRoot["passDHCP"]);
dhcpAPConfig(jsonBuffer["ssidDHCP"],jsonBuffer["passDHCP"]);
}
else{
handleClientAP();
Expand Down Expand Up @@ -294,17 +294,17 @@ void dhcpAPConfig(String ssid, String pass){
//****************************HANDLE STATIC FORM***************************//

void handleStaticForm() {
JsonObject& root =jsonBuffer.createObject();
JsonObject root =jsonBuffer.to<JsonObject>();
root["no"]= "";
root.printTo(Serial);
serializeJson(root, Serial);
if(server.hasArg("ssid") && server.hasArg("passkey")){
if(server.arg("configure") != ""){
File fileToWrite = SPIFFS.open("/ip_set.txt", FILE_WRITE);
if(!fileToWrite){
Serial.println("Error opening SPIFFS");
return;
}
if(root.printTo(fileToWrite)){
if (serializeJson(root, fileToWrite)){
Serial.println("--File Written");
esp_sleep_enable_timer_wakeup(TIME_TO_SLEEP * uS_TO_S_FACTOR);
esp_deep_sleep_start();
Expand Down