Skip to content

Commit

Permalink
Reboot/Reset pin, build 20101 patch
Browse files Browse the repository at this point in the history
  • Loading branch information
martinusGH committed Apr 11, 2018
1 parent c7a6ca4 commit 2ee5136
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/ESPEasy-Globals.h
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
#define VERSION 3 // Change in config.dat mapping needs a full reset
#endif

#define BUILD 20100 // git version 2.1.0
#define BUILD 20101 // git version 2.1.01
#if defined(ESP8266)
#define BUILD_NOTES " - Mega"
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/ESPEasy.ino
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ void runOncePerSecond()
timerAPoff = 0;
WifiAPMode(false);
}
//checkResetFactoryPin(); // wait for buildfix solution before enabling!
checkResetFactoryPin();
}

/*********************************************************************************************\
Expand Down
7 changes: 7 additions & 0 deletions src/Misc.ino
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,13 @@ String BuildFixes()
f.close();
}
}

if (Settings.Build < 20101)
{
Serial.println(F("Fix reset Pin"));
Settings.Pin_Reset = -1;
}

Settings.Build = BUILD;
return(SaveSettings());
}
Expand Down

3 comments on commit 2ee5136

@Grovkillen
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is part of the problem that we're now experiencing with corrupt settings?

@TD-er
Copy link
Member

@TD-er TD-er commented on 2ee5136 Apr 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the corrupt settings message is related to some other issue and I will try to see if the message is always correct.
For example if the settings store the MD5 of the executable, then the checksum will always fail when loading settings which were saved with a previous build.

I am not sure the warning is always correct.

@Grovkillen
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aha, I understand. We need to have @psy0rz look into the build script as well...

Please sign in to comment.