From d634b0db9360e84d5904bfa7f12138b158a7be69 Mon Sep 17 00:00:00 2001
From: Eric Duminil <eric.duminil@gmail.com>
Date: Tue, 15 Feb 2022 14:49:34 +0100
Subject: [PATCH] Config update
---
ampel-firmware/config.public.h | 8 +++++---
ampel-firmware/web_config.cpp | 6 +++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ampel-firmware/config.public.h b/ampel-firmware/config.public.h
index 4b74321..dcd50ee 100644
--- a/ampel-firmware/config.public.h
+++ b/ampel-firmware/config.public.h
@@ -20,8 +20,9 @@
* WIFI
*/
-# define WIFI_SSID "MY_SSID"
-# define WIFI_PASSWORD "P4SSW0RD"
+// SSID and PASSWORD need to be defined, but can be empty.
+# define WIFI_SSID ""
+# define WIFI_PASSWORD ""
# define WIFI_TIMEOUT 30 // [s]
/**
@@ -150,6 +151,7 @@
*/
# define NTP_SERVER "pool.ntp.org"
-# define UTC_OFFSET_IN_SECONDS 7200 // [s] 3600 for UTC+1, 7200 for UTC+1 and daylight saving time
+# define UTC_OFFSET 1 // [h] +1 for Paris/Berlin, -5 for NYC
+# define DAYLIGHT_SAVING_TIME false // true in summer, false in winter
#endif
diff --git a/ampel-firmware/web_config.cpp b/ampel-firmware/web_config.cpp
index 2ce6a1e..853cf7d 100644
--- a/ampel-firmware/web_config.cpp
+++ b/ampel-firmware/web_config.cpp
@@ -136,9 +136,9 @@ namespace web_config {
TextTParameter<STRING_LEN> ntpServerParam =
Builder<TextTParameter<STRING_LEN>>("ntp_server").label("NTP Server").defaultValue(NTP_SERVER).build();
IntTParameter<int16_t> timeOffsetParam = Builder<IntTParameter<int16_t>>("timezone").label("Timezone").defaultValue(
- (UTC_OFFSET_IN_SECONDS) / 3600).min(-23).max(23).step(1).placeholder("[h]").build();
- CheckboxTParameter dstParam =
- Builder<CheckboxTParameter>("dst").label("Daylight Saving Time?").defaultValue(false).build();
+ UTC_OFFSET).min(-23).max(23).step(1).placeholder("[h]").build();
+ CheckboxTParameter dstParam = Builder<CheckboxTParameter>("dst").label("Daylight Saving Time?").defaultValue(
+ DAYLIGHT_SAVING_TIME).build();
/**
* LoRaWAN
--
GitLab