Skip to content
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

Fix for the year 2036 problem #77

Merged
merged 11 commits into from
Jan 4, 2019
+18 −0
Merged

Fix for the year 2036 problem #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9dd2928
Add library version
lobradov Apr 5, 2018
8437814
correct version number
lobradov Apr 26, 2018
6182563
Merge pull request #65 from lobradov/patch-1
gmag11 Apr 27, 2018
aad24bf
Add simple example to show basic use
gmag11 Jul 22, 2018
446ff48
Version 2.5.1
gmag11 Jul 22, 2018
422bc1d
.gitignore
gmag11 Jul 23, 2018
8a2e0c2
Add files via upload
TomsCircuits Oct 27, 2018
41d77e6
Add files via upload
TomsCircuits Oct 27, 2018
057efe2
Add files via upload
TomsCircuits Oct 28, 2018
260e676
Delete NTPClientLib_org.txt
TomsCircuits Oct 28, 2018
767cd04
Merge branch 'bugfix/year2036' into master
gmag11 Jan 4, 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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,3 +219,5 @@ examples/NTPClient/__vm/

# Visual Studio Code workspace folder
.vscode/
*.bak
**/__vm/**
16 changes: 16 additions & 0 deletions src/NTPClientLib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ time_t NTPClient::getTime () {
DEBUGLOG ("-- Receive NTP Response\n");
udp->read (ntpPacketBuffer, NTP_PACKET_SIZE); // read packet into the buffer
time_t timeValue = decodeNtpMessage (ntpPacketBuffer);
if (timeValue != 0) {
setSyncInterval (getLongInterval ());
if (!_firstSync) {
// if (timeStatus () == timeSet)
Expand All @@ -170,6 +171,15 @@ time_t NTPClient::getTime () {
if (onSyncEvent)
onSyncEvent (timeSyncd);
return timeValue;
}
else {
DEBUGLOG ("-- No valid NTP data :-(\n");
udp->stop ();
setSyncInterval (getShortInterval ()); // Retry connection more often
if (onSyncEvent)
onSyncEvent (noResponse);
return 0; // return 0 if unable to get the time
}
}
#ifdef ARDUINO_ARCH_ESP8266
ESP.wdtFeed ();
Expand Down Expand Up @@ -603,6 +613,12 @@ time_t NTPClient::decodeNtpMessage (uint8_t *messageBuffer) {
secsSince1900 |= (unsigned long)messageBuffer[42] << 8;
secsSince1900 |= (unsigned long)messageBuffer[43];

DEBUGLOG("Secs: %u \n", secsSince1900);

if(secsSince1900 == 0) {
DEBUGLOG ("--Timestamp is Zero\n");
return 0;
}
#define SEVENTY_YEARS 2208988800UL
time_t timeTemp = secsSince1900 - SEVENTY_YEARS + _timeZone * SECS_PER_HOUR + _minutesOffset * SECS_PER_MIN;

Expand Down