From 87a72e3c31c1c022bb4ee5f3ebfb27a5135e8dc9 Mon Sep 17 00:00:00 2001
From: Eric Duminil <eric.duminil@gmail.com>
Date: Fri, 11 Feb 2022 22:05:44 +0100
Subject: [PATCH] 1970.1.1 -> 2022.1.1
---
ampel-firmware/ampel-firmware.ino | 1 -
ampel-firmware/src/lib/NTPClient/NTPClient.h | 2 +-
ampel-firmware/web_config.cpp | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/ampel-firmware/ampel-firmware.ino b/ampel-firmware/ampel-firmware.ino
index d45326b..7734e62 100644
--- a/ampel-firmware/ampel-firmware.ino
+++ b/ampel-firmware/ampel-firmware.ino
@@ -171,7 +171,6 @@ void loop() {
if (sensor::processData()) {
if (config::csv_active()) {
- //TODO: Check if not in AP mode. Lines get written with 1970 otherwise.
csv_writer::logIfTimeHasCome(sensor::timestamp, sensor::co2, sensor::temperature, sensor::humidity);
}
diff --git a/ampel-firmware/src/lib/NTPClient/NTPClient.h b/ampel-firmware/src/lib/NTPClient/NTPClient.h
index f4eb299..5df9e7a 100755
--- a/ampel-firmware/src/lib/NTPClient/NTPClient.h
+++ b/ampel-firmware/src/lib/NTPClient/NTPClient.h
@@ -20,7 +20,7 @@ class NTPClient {
unsigned long _updateInterval = 60000; // In ms
- unsigned long _currentEpoc = 0; // In s
+ unsigned long _currentEpoc = 1640995200; // NOTE: Custom code for ampel-firmware : Default is 1st January 2020. Better than 1970
unsigned long _lastUpdate = 0; // In ms
byte _packetBuffer[NTP_PACKET_SIZE];
diff --git a/ampel-firmware/web_config.cpp b/ampel-firmware/web_config.cpp
index d165a13..51aa30d 100644
--- a/ampel-firmware/web_config.cpp
+++ b/ampel-firmware/web_config.cpp
@@ -127,7 +127,6 @@ namespace web_config {
* NTP Time
*/
- //NOTE: Save time after first NTP connection, so that time doesn't go back to 1970?
ParameterGroup timeParams = ParameterGroup("NTP", "Time server");
TextTParameter<STRING_LEN> ntpServerParam =
Builder<TextTParameter<STRING_LEN>>("ntp_server").label("NTP Server").defaultValue(NTP_SERVER).build();
--
GitLab