Skip to content

Update to ArduinoJson 6 and bug fixes that avoid Exception(2) crash #8

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to ArduinoJson 6 and bug fixes that avoid Exception(2) crash #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 19 additions & 8 deletions AlarmClock/AlarmClock.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ bool alarmHandled = false;
bool buttonPressed = false;

void handleGetAlarm() {
char alarmString[5];
char alarmString[6];
if(alarmActive==true){
sprintf(alarmString, "%02d:%02d", alarmHour, alarmMinute);
}
Expand Down Expand Up @@ -279,11 +279,15 @@ bool loadConfig() {
std::unique_ptr<char[]> buf(new char[size]);

configFile.readBytes(buf.get(), size);

#if ARDUINOJSON_VERSION_MAJOR < 6
StaticJsonBuffer<200> jsonBuffer;
JsonObject& json = jsonBuffer.parseObject(buf.get());

if (!json.success()) {
#else
StaticJsonDocument<200> json;
auto error = deserializeJson(json, buf.get());
if (error) {
#endif
Serial.println("Failed to parse config file");
return false;
}
Expand All @@ -295,8 +299,12 @@ bool loadConfig() {
}

bool saveConfig() {
#if ARDUINOJSON_VERSION_MAJOR < 6
StaticJsonBuffer<200> jsonBuffer;
JsonObject& json = jsonBuffer.createObject();
#else
StaticJsonDocument<200> json;
#endif
json["alarmHour"] = alarmHour;
json["alarmMinute"] = alarmMinute;
json["alarmActive"] = alarmActive;
Expand All @@ -306,8 +314,11 @@ bool saveConfig() {
Serial.println("Failed to open config file for writing");
return false;
}

#if ARDUINOJSON_VERSION_MAJOR < 6
json.printTo(configFile);
#else
serializeJson(json, configFile);
#endif
return true;
}

Expand All @@ -328,7 +339,7 @@ void handleSetAlarm() {
Serial.println(alarmMinute);
}
}
char alarmString[5];
char alarmString[6];
sprintf(alarmString, "%02d:%02d", alarmHour, alarmMinute);
server.send(200, "text/html",alarmString );
}
Expand All @@ -337,8 +348,8 @@ void handleDeleteAlarm() {

Serial.println("Deleting Alarm");

alarmHour = '--';
alarmMinute = '--';
alarmHour = 0;
alarmMinute = 0;
alarmActive = false;
saveConfig();
Serial.print("Alarm deleted");
Expand Down Expand Up @@ -424,7 +435,7 @@ int timeMinutes;

int lastEffectiveAlarm = 0;

bool checkForAlarm()
void checkForAlarm()
{
if (alarmActive && timeHour == alarmHour && timeMinutes == alarmMinute) {
if (!alarmHandled)
Expand Down