From a6aed8d30efe60ab6868af1b734b868b8976db2c Mon Sep 17 00:00:00 2001 From: jpirnay Date: Mon, 20 Apr 2026 20:40:38 +0200 Subject: [PATCH] Add additional timezones --- lib/hal/HalClock.cpp | 3 ++ src/CrossPointSettings.h | 3 ++ .../settings/ClockSettingsActivity.cpp | 39 +++++++++++++++---- .../settings/DetectTimezoneActivity.cpp | 9 +++++ src/activities/settings/SettingInfo.cpp | 6 ++- src/activities/settings/SettingInfo.h | 1 + src/network/CrossPointWebServer.cpp | 10 ++++- 7 files changed, 60 insertions(+), 11 deletions(-) diff --git a/lib/hal/HalClock.cpp b/lib/hal/HalClock.cpp index 0264556b..c6f7ce0a 100644 --- a/lib/hal/HalClock.cpp +++ b/lib/hal/HalClock.cpp @@ -111,6 +111,9 @@ static constexpr TimeZoneEntry TIMEZONES[] = { {"CST6CDT,M3.2.0/2,M11.1.0/2"}, {"MST7MDT,M3.2.0/2,M11.1.0/2"}, {"PST8PDT,M3.2.0/2,M11.1.0/2"}, + {"AST4ADT,M3.2.0/2,M11.1.0/2"}, + {"ACST-9:30ACDT,M10.1.0/2,M4.1.0/3"}, + {"AKST9AKDT,M3.2.0/2,M11.1.0/2"}, }; // ---- NVS helpers ---------------------------------------------------------- diff --git a/src/CrossPointSettings.h b/src/CrossPointSettings.h index 7334ca71..e19eaf29 100644 --- a/src/CrossPointSettings.h +++ b/src/CrossPointSettings.h @@ -184,6 +184,9 @@ class CrossPointSettings { TZ_CST = 13, TZ_MST = 14, TZ_PST = 15, + TZ_AST_ADT = 16, + TZ_ACST_ACDT = 17, + TZ_AKST_AKDT = 18, TIMEZONE_COUNT }; diff --git a/src/activities/settings/ClockSettingsActivity.cpp b/src/activities/settings/ClockSettingsActivity.cpp index ca9c2aeb..06026083 100644 --- a/src/activities/settings/ClockSettingsActivity.cpp +++ b/src/activities/settings/ClockSettingsActivity.cpp @@ -15,7 +15,8 @@ const StrId timeZoneNames[CrossPointSettings::TIMEZONE_COUNT] = { StrId::STR_TZ_UTC, StrId::STR_TZ_CET, StrId::STR_TZ_EET, StrId::STR_TZ_MSK, StrId::STR_TZ_UTC_PLUS4, StrId::STR_TZ_IST, StrId::STR_TZ_UTC_PLUS7, StrId::STR_TZ_UTC_PLUS8, StrId::STR_TZ_UTC_PLUS9, StrId::STR_TZ_AEST, StrId::STR_TZ_NZST, StrId::STR_TZ_UTC_MINUS3, - StrId::STR_TZ_EST, StrId::STR_TZ_CST, StrId::STR_TZ_MST, StrId::STR_TZ_PST}; + StrId::STR_TZ_EST, StrId::STR_TZ_CST, StrId::STR_TZ_MST, StrId::STR_TZ_PST, + StrId::STR_TZ_UTC, StrId::STR_TZ_UTC, StrId::STR_TZ_UTC}; } // namespace void ClockSettingsActivity::buildMenuItems() { @@ -25,13 +26,35 @@ void ClockSettingsActivity::buildMenuItems() { SettingInfo::Toggle(StrId::STR_USE_CLOCK, &CrossPointSettings::useClock, "useClock", StrId::STR_CAT_SYSTEM)); menuItems.push_back(SettingInfo::Enum(StrId::STR_CLOCK_FORMAT, &CrossPointSettings::clockFormat12h, {StrId::STR_24H, StrId::STR_12H}, "clockFormat12h", StrId::STR_CAT_SYSTEM)); - menuItems.push_back( - SettingInfo::Enum(StrId::STR_TIMEZONE, &CrossPointSettings::timeZone, - {StrId::STR_TZ_UTC, StrId::STR_TZ_CET, StrId::STR_TZ_EET, StrId::STR_TZ_MSK, - StrId::STR_TZ_UTC_PLUS4, StrId::STR_TZ_IST, StrId::STR_TZ_UTC_PLUS7, StrId::STR_TZ_UTC_PLUS8, - StrId::STR_TZ_UTC_PLUS9, StrId::STR_TZ_AEST, StrId::STR_TZ_NZST, StrId::STR_TZ_UTC_MINUS3, - StrId::STR_TZ_EST, StrId::STR_TZ_CST, StrId::STR_TZ_MST, StrId::STR_TZ_PST}, - "timeZone", StrId::STR_CAT_SYSTEM)); + { + auto tzSetting = SettingInfo::Enum( + StrId::STR_TIMEZONE, &CrossPointSettings::timeZone, + {StrId::STR_TZ_UTC, StrId::STR_TZ_CET, StrId::STR_TZ_EET, StrId::STR_TZ_MSK, StrId::STR_TZ_UTC_PLUS4, + StrId::STR_TZ_IST, StrId::STR_TZ_UTC_PLUS7, StrId::STR_TZ_UTC_PLUS8, StrId::STR_TZ_UTC_PLUS9, + StrId::STR_TZ_AEST, StrId::STR_TZ_NZST, StrId::STR_TZ_UTC_MINUS3, StrId::STR_TZ_EST, StrId::STR_TZ_CST, + StrId::STR_TZ_MST, StrId::STR_TZ_PST, StrId::STR_TZ_UTC, StrId::STR_TZ_UTC, StrId::STR_TZ_UTC}, + "timeZone", StrId::STR_CAT_SYSTEM); + tzSetting.enumLabels = {"UTC (GMT/BST)", + "Central European (CET/CEST)", + "Eastern European (EET/EEST)", + "Moscow (MSK)", + "UTC+4", + "India (IST)", + "UTC+7", + "UTC+8", + "UTC+9", + "Australia Eastern (AEST/AEDT)", + "New Zealand (NZST/NZDT)", + "UTC-3", + "Eastern US/Canada (EST/EDT)", + "Central US/Canada (CST/CDT)", + "Mountain US/Canada (MST/MDT)", + "Pacific US/Canada (PST/PDT)", + "Atlantic Canada (AST/ADT)", + "Australia Central (ACST/ACDT)", + "Alaska (AKST/AKDT)"}; + menuItems.push_back(std::move(tzSetting)); + } menuItems.push_back(SettingInfo::Action(StrId::STR_DETECT_TIMEZONE, SettingAction::DetectTimezone) .withSubcategory(StrId::STR_READER_TOOLS)); diff --git a/src/activities/settings/DetectTimezoneActivity.cpp b/src/activities/settings/DetectTimezoneActivity.cpp index e5ec6a9d..ed2110cf 100644 --- a/src/activities/settings/DetectTimezoneActivity.cpp +++ b/src/activities/settings/DetectTimezoneActivity.cpp @@ -56,6 +56,15 @@ bool mapIanaTimezone(const std::string& tz, uint8_t& outSetting) { outSetting = TZ::TZ_PST; return true; } + if (tz == "America/Halifax" || tz == "America/Glace_Bay" || tz == "America/Moncton" || tz == "America/Thule") { + outSetting = TZ::TZ_AST_ADT; + return true; + } + if (tz == "America/Anchorage" || tz == "America/Juneau" || tz == "America/Nome" || tz == "America/Sitka" || + tz == "America/Yakutat" || tz == "America/Metlakatla") { + outSetting = TZ::TZ_AKST_AKDT; + return true; + } if (tz == "America/Sao_Paulo" || tz == "America/Argentina/Buenos_Aires" || tz == "America/Montevideo") { outSetting = TZ::TZ_UTC_MINUS3; return true; diff --git a/src/activities/settings/SettingInfo.cpp b/src/activities/settings/SettingInfo.cpp index f7f40825..912f8556 100644 --- a/src/activities/settings/SettingInfo.cpp +++ b/src/activities/settings/SettingInfo.cpp @@ -32,6 +32,10 @@ std::string SettingInfo::getDisplayValue() const { value = callValueGetter(); else return {}; + if (!enumLabels.empty()) { + if (value < enumLabels.size()) return enumLabels[value]; + return {}; + } if (value < enumValues.size()) return std::string(I18N.get(enumValues[value])); return {}; } @@ -61,7 +65,7 @@ void SettingInfo::toggleValue() const { break; case SettingType::ENUM: { - const auto count = static_cast(enumValues.size()); + const auto count = static_cast(enumLabels.empty() ? enumValues.size() : enumLabels.size()); if (count == 0) break; if (valuePtr) { SETTINGS.*(valuePtr) = (SETTINGS.*(valuePtr) + 1) % count; diff --git a/src/activities/settings/SettingInfo.h b/src/activities/settings/SettingInfo.h index 4a46d2ed..9baaecdc 100644 --- a/src/activities/settings/SettingInfo.h +++ b/src/activities/settings/SettingInfo.h @@ -32,6 +32,7 @@ struct SettingInfo { SettingType type; uint8_t CrossPointSettings::* valuePtr = nullptr; std::vector enumValues; + std::vector enumLabels; SettingAction action = SettingAction::None; struct ValueRange { diff --git a/src/network/CrossPointWebServer.cpp b/src/network/CrossPointWebServer.cpp index 1d922ce8..ad04dc13 100644 --- a/src/network/CrossPointWebServer.cpp +++ b/src/network/CrossPointWebServer.cpp @@ -1238,8 +1238,14 @@ void CrossPointWebServer::handleGetSettings() const { doc["value"] = static_cast(s.callValueGetter()); } JsonArray options = doc["options"].to(); - for (const auto& opt : s.enumValues) { - options.add(I18N.get(opt)); + if (!s.enumLabels.empty()) { + for (const auto& opt : s.enumLabels) { + options.add(opt); + } + } else { + for (const auto& opt : s.enumValues) { + options.add(I18N.get(opt)); + } } break; }