Skip to content

Commit

Permalink
Bug-Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
jomjol committed Nov 3, 2020
1 parent 2ab2f07 commit 05a0f6f
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 13 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ A 3d-printable housing can be found here: https://www.thingiverse.com/thing:4571

**General remark:** Beside the `firmware.bin`, typically also the content of `/html` needs to be updated!

##### Rolling - (2020-10-25)
##### Rolling - (2020-11-03)

* Bug-Fix in time sync on warm reboot

* based on v3.1.0 (2020-10-26)

Expand Down
10 changes: 2 additions & 8 deletions code/lib/jomjol_time_sntp/time_sntp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,24 +75,18 @@ void setup_time(void)
time(&now);
localtime_r(&now, &timeinfo);
// Is time set? If not, tm_year will be (1970 - 1900).
if (timeinfo.tm_year < (2016 - 1900)) {
if ((timeinfo.tm_year < (2016 - 1900)) || setTimeAlwaysOnReboot) {
ESP_LOGI(TAG, "Time is not set yet. Connecting to WiFi and getting time over NTP.");
initialize_sntp();
obtain_time();
// update 'now' variable with current time
time(&now);
}
else
{
if (setTimeAlwaysOnReboot)
{
obtain_time();
}
}
char strftime_buf[64];

// Set timezone to Berlin Standard Time
setenv("TZ", "UTC+9", 1);
// setenv("TZ", "Europe/Berlin", 1);
tzset();
localtime_r(&now, &timeinfo);
strftime(strftime_buf, sizeof(strftime_buf), "%c", &timeinfo);
Expand Down
4 changes: 2 additions & 2 deletions code/src/version.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const char* GIT_REV="3cec93e";
const char* GIT_REV="2ab2f07";
const char* GIT_TAG="";
const char* GIT_BRANCH="master";
const char* BUILD_TIME="2020-10-26 18:31";
const char* BUILD_TIME="2020-11-03 22:12";
4 changes: 2 additions & 2 deletions code/version.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const char* GIT_REV="3cec93e";
const char* GIT_REV="2ab2f07";
const char* GIT_TAG="";
const char* GIT_BRANCH="master";
const char* BUILD_TIME="2020-10-26 18:31";
const char* BUILD_TIME="2020-11-03 22:12";
Binary file modified firmware/bootloader.bin
Binary file not shown.
Binary file modified firmware/firmware.bin
Binary file not shown.

0 comments on commit 05a0f6f

Please sign in to comment.