From 360b579d94a2f30c59c055fe834602abb5827d39 Mon Sep 17 00:00:00 2001 From: JeffWDH Date: Wed, 19 Jul 2023 13:15:43 -0400 Subject: [PATCH 1/6] Added manual Posix timezone string option. --- firmware/lib/cw-commons/CWDateTime.cpp | 14 +++++++++++--- firmware/lib/cw-commons/CWDateTime.h | 2 +- firmware/lib/cw-commons/CWPreferences.h | 4 ++++ firmware/lib/cw-commons/CWWebServer.h | 3 +++ firmware/lib/cw-commons/SettingsWebPage.h | 8 ++++++++ 5 files changed, 27 insertions(+), 4 deletions(-) diff --git a/firmware/lib/cw-commons/CWDateTime.cpp b/firmware/lib/cw-commons/CWDateTime.cpp index 5645eef..e0aa9f2 100644 --- a/firmware/lib/cw-commons/CWDateTime.cpp +++ b/firmware/lib/cw-commons/CWDateTime.cpp @@ -1,11 +1,19 @@ #include "CWDateTime.h" -void CWDateTime::begin(const char *timeZone, bool use24format, const char *ntpServer = NTP_SERVER) +void CWDateTime::begin(const char *timeZone, bool use24format, const char *ntpServer = NTP_SERVER, const char *posixTZ = "") { Serial.printf("[Time] NTP Server: %s, Timezone: %s\n", ntpServer, timeZone); - ezt::setServer(String(ntpServer)); - myTZ.setLocation(timeZone); + + if (strlen(posixTZ) > 1) { + // An empty value still contains a null character so not empty is a value greater than 1. + // Set to defined Posix TZ + myTZ.setPosix(posixTZ); + } else { + // Use automatic eztime remote lookup + myTZ.setLocation(timeZone); + } + this->use24hFormat = use24format; ezt::updateNTP(); waitForSync(); diff --git a/firmware/lib/cw-commons/CWDateTime.h b/firmware/lib/cw-commons/CWDateTime.h index d3eb583..6add607 100644 --- a/firmware/lib/cw-commons/CWDateTime.h +++ b/firmware/lib/cw-commons/CWDateTime.h @@ -11,7 +11,7 @@ class CWDateTime bool use24hFormat = true; public: - void begin(const char *timeZone, bool use24format, const char *ntpServer); + void begin(const char *timeZone, bool use24format, const char *ntpServer, const char *posixTZ); String getFormattedTime(); String getFormattedTime(const char* format); diff --git a/firmware/lib/cw-commons/CWPreferences.h b/firmware/lib/cw-commons/CWPreferences.h index d1d7a67..1fbd61b 100644 --- a/firmware/lib/cw-commons/CWPreferences.h +++ b/firmware/lib/cw-commons/CWPreferences.h @@ -24,6 +24,7 @@ struct ClockwiseParams const char* const PREF_NTP_SERVER = "ntpServer"; const char* const PREF_CANVAS_FILE = "canvasFile"; const char* const PREF_CANVAS_SERVER = "canvasServer"; + const char* const PREF_MANUAL_POSIX = "manualPosix"; bool swapBlueGreen; @@ -38,6 +39,7 @@ struct ClockwiseParams String ntpServer; String canvasFile; String canvasServer; + String manualPosix; ClockwiseParams() { @@ -65,6 +67,7 @@ struct ClockwiseParams preferences.putString(PREF_NTP_SERVER, ntpServer); preferences.putString(PREF_CANVAS_FILE, canvasFile); preferences.putString(PREF_CANVAS_SERVER, canvasServer); + preferences.putString(PREF_MANUAL_POSIX, manualPosix); } void load() @@ -81,6 +84,7 @@ struct ClockwiseParams ntpServer = preferences.getString(PREF_NTP_SERVER, NTP_SERVER); canvasFile = preferences.getString(PREF_CANVAS_FILE, ""); canvasServer = preferences.getString(PREF_CANVAS_SERVER, "raw.githubusercontent.com"); + manualPosix = preferences.getString(PREF_MANUAL_POSIX, ""); } }; diff --git a/firmware/lib/cw-commons/CWWebServer.h b/firmware/lib/cw-commons/CWWebServer.h index c5f95f3..12590c6 100644 --- a/firmware/lib/cw-commons/CWWebServer.h +++ b/firmware/lib/cw-commons/CWWebServer.h @@ -123,6 +123,8 @@ struct ClockwiseWebServer ClockwiseParams::getInstance()->canvasFile = value; } else if (key == ClockwiseParams::getInstance()->PREF_CANVAS_SERVER) { ClockwiseParams::getInstance()->canvasServer = value; + } else if (key == ClockwiseParams::getInstance()->PREF_MANUAL_POSIX) { + ClockwiseParams::getInstance()->manualPosix = value; } ClockwiseParams::getInstance()->save(); client.println("HTTP/1.0 204 No Content"); @@ -157,6 +159,7 @@ struct ClockwiseWebServer client.printf(HEADER_TEMPLATE_S, ClockwiseParams::getInstance()->PREF_NTP_SERVER, ClockwiseParams::getInstance()->ntpServer.c_str()); client.printf(HEADER_TEMPLATE_S, ClockwiseParams::getInstance()->PREF_CANVAS_FILE, ClockwiseParams::getInstance()->canvasFile.c_str()); client.printf(HEADER_TEMPLATE_S, ClockwiseParams::getInstance()->PREF_CANVAS_SERVER, ClockwiseParams::getInstance()->canvasServer.c_str()); + client.printf(HEADER_TEMPLATE_S, ClockwiseParams::getInstance()->PREF_MANUAL_POSIX, ClockwiseParams::getInstance()->manualPosix.c_str()); client.printf(HEADER_TEMPLATE_S, "CW_FW_VERSION", CW_FW_VERSION); client.printf(HEADER_TEMPLATE_S, "CW_FW_NAME", CW_FW_NAME); diff --git a/firmware/lib/cw-commons/SettingsWebPage.h b/firmware/lib/cw-commons/SettingsWebPage.h index 5798be4..a46335c 100644 --- a/firmware/lib/cw-commons/SettingsWebPage.h +++ b/firmware/lib/cw-commons/SettingsWebPage.h @@ -127,6 +127,14 @@ const char SETTINGS_PAGE[] PROGMEM = R""""( save: "updatePreference('canvasServer', serverAddress.value)", property: "canvasServer", exclusive: "cw-cf-0x07" + }, + { + title: "[Advanced] Posix Timezone String", + description: "To avoid remote lookups, provide a Posix string that corresponds to your timezone. Leave empty to disable.", + formInput: "", + icon: "fa-globe", + save: "updatePreference('manualPosix', posixString.value)", + property: "manualPosix" } ]; From 600f199bd1b28774fcdf556831ab83fb36c7e922 Mon Sep 17 00:00:00 2001 From: JeffWDH Date: Thu, 20 Jul 2023 08:15:07 -0400 Subject: [PATCH 2/6] Compiled list of Posix timezone strings using the ezTime server script --- PosixTimezoneStrings.txt | 552 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 552 insertions(+) create mode 100644 PosixTimezoneStrings.txt diff --git a/PosixTimezoneStrings.txt b/PosixTimezoneStrings.txt new file mode 100644 index 0000000..a80efc8 --- /dev/null +++ b/PosixTimezoneStrings.txt @@ -0,0 +1,552 @@ +Africa/Abidjan GMT0 +Africa/Accra GMT0 +Africa/Addis_Ababa EAT-3 +Africa/Algiers CET-1 +Africa/Asmara EAT-3 +Africa/Asmera EAT-3 +Africa/Bamako GMT0 +Africa/Bangui WAT-1 +Africa/Banjul GMT0 +Africa/Bissau GMT0 +Africa/Blantyre CAT-2 +Africa/Brazzaville WAT-1 +Africa/Bujumbura CAT-2 +Africa/Cairo EET-2EEST,M4.5.5/0,M10.5.4/24 +Africa/Casablanca <+01>-1 +Africa/Ceuta CET-1CEST,M3.5.0,M10.5.0/3 +Africa/Conakry GMT0 +Africa/Dakar GMT0 +Africa/Dar_es_Salaam EAT-3 +Africa/Djibouti EAT-3 +Africa/Douala WAT-1 +Africa/El_Aaiun <+01>-1 +Africa/Freetown GMT0 +Africa/Gaborone CAT-2 +Africa/Harare CAT-2 +Africa/Johannesburg SAST-2 +Africa/Juba CAT-2 +Africa/Kampala EAT-3 +Africa/Khartoum CAT-2 +Africa/Kigali CAT-2 +Africa/Kinshasa WAT-1 +Africa/Lagos WAT-1 +Africa/Libreville WAT-1 +Africa/Lome GMT0 +Africa/Luanda WAT-1 +Africa/Lubumbashi CAT-2 +Africa/Lusaka CAT-2 +Africa/Malabo WAT-1 +Africa/Maputo CAT-2 +Africa/Maseru SAST-2 +Africa/Mbabane SAST-2 +Africa/Mogadishu EAT-3 +Africa/Monrovia GMT0 +Africa/Nairobi EAT-3 +Africa/Ndjamena WAT-1 +Africa/Niamey WAT-1 +Africa/Nouakchott GMT0 +Africa/Ouagadougou GMT0 +Africa/Porto-Novo WAT-1 +Africa/Sao_Tome GMT0 +Africa/Timbuktu GMT0 +Africa/Tripoli EET-2 +Africa/Tunis CET-1 +Africa/Windhoek CAT-2 +America/Adak HST10HDT,M3.2.0,M11.1.0 +America/Anchorage AKST9AKDT,M3.2.0,M11.1.0 +America/Anguilla AST4 +America/Antigua AST4 +America/Araguaina <-03>3 +America/Argentina/Buenos_Aires <-03>3 +America/Argentina/Catamarca <-03>3 +America/Argentina/ComodRivadavia <-03>3 +America/Argentina/Cordoba <-03>3 +America/Argentina/Jujuy <-03>3 +America/Argentina/La_Rioja <-03>3 +America/Argentina/Mendoza <-03>3 +America/Argentina/Rio_Gallegos <-03>3 +America/Argentina/Salta <-03>3 +America/Argentina/San_Juan <-03>3 +America/Argentina/San_Luis <-03>3 +America/Argentina/Tucuman <-03>3 +America/Argentina/Ushuaia <-03>3 +America/Aruba AST4 +America/Asuncion <-04>4<-03>,M10.1.0/0,M3.4.0/0 +America/Atikokan EST5 +America/Atka HST10HDT,M3.2.0,M11.1.0 +America/Bahia <-03>3 +America/Bahia_Banderas CST6 +America/Barbados AST4 +America/Belem <-03>3 +America/Belize CST6 +America/Blanc-Sablon AST4 +America/Boa_Vista <-04>4 +America/Bogota <-05>5 +America/Boise MST7MDT,M3.2.0,M11.1.0 +America/Buenos_Aires <-03>3 +America/Cambridge_Bay MST7MDT,M3.2.0,M11.1.0 +America/Campo_Grande <-04>4 +America/Cancun EST5 +America/Caracas <-04>4 +America/Catamarca <-03>3 +America/Cayenne <-03>3 +America/Cayman EST5 +America/Chicago CST6CDT,M3.2.0,M11.1.0 +America/Chihuahua CST6 +America/Ciudad_Juarez MST7MDT,M3.2.0,M11.1.0 +America/Coral_Harbour EST5 +America/Cordoba <-03>3 +America/Costa_Rica CST6 +America/Creston MST7 +America/Cuiaba <-04>4 +America/Curacao AST4 +America/Danmarkshavn GMT0 +America/Dawson MST7 +America/Dawson_Creek MST7 +America/Denver MST7MDT,M3.2.0,M11.1.0 +America/Detroit EST5EDT,M3.2.0,M11.1.0 +America/Dominica AST4 +America/Edmonton MST7MDT,M3.2.0,M11.1.0 +America/Eirunepe <-05>5 +America/El_Salvador CST6 +America/Ensenada PST8PDT,M3.2.0,M11.1.0 +America/Fortaleza <-03>3 +America/Fort_Nelson MST7 +America/Fort_Wayne EST5EDT,M3.2.0,M11.1.0 +America/Glace_Bay AST4ADT,M3.2.0,M11.1.0 +America/Godthab <-02>2<-01>,M3.5.0/-1,M10.5.0/0 +America/Goose_Bay AST4ADT,M3.2.0,M11.1.0 +America/Grand_Turk EST5EDT,M3.2.0,M11.1.0 +America/Grenada AST4 +America/Guadeloupe AST4 +America/Guatemala CST6 +America/Guayaquil <-05>5 +America/Guyana <-04>4 +America/Halifax AST4ADT,M3.2.0,M11.1.0 +America/Havana CST5CDT,M3.2.0/0,M11.1.0/1 +America/Hermosillo MST7 +America/Indiana/Indianapolis EST5EDT,M3.2.0,M11.1.0 +America/Indiana/Knox CST6CDT,M3.2.0,M11.1.0 +America/Indiana/Marengo EST5EDT,M3.2.0,M11.1.0 +America/Indiana/Petersburg EST5EDT,M3.2.0,M11.1.0 +America/Indiana/Tell_City CST6CDT,M3.2.0,M11.1.0 +America/Indiana/Vevay EST5EDT,M3.2.0,M11.1.0 +America/Indiana/Vincennes EST5EDT,M3.2.0,M11.1.0 +America/Indiana/Winamac EST5EDT,M3.2.0,M11.1.0 +America/Indianapolis EST5EDT,M3.2.0,M11.1.0 +America/Inuvik MST7MDT,M3.2.0,M11.1.0 +America/Iqaluit EST5EDT,M3.2.0,M11.1.0 +America/Jamaica EST5 +America/Jujuy <-03>3 +America/Juneau AKST9AKDT,M3.2.0,M11.1.0 +America/Kentucky/Louisville EST5EDT,M3.2.0,M11.1.0 +America/Kentucky/Monticello EST5EDT,M3.2.0,M11.1.0 +America/Knox_IN CST6CDT,M3.2.0,M11.1.0 +America/Kralendijk AST4 +America/La_Paz <-04>4 +America/Lima <-05>5 +America/Los_Angeles PST8PDT,M3.2.0,M11.1.0 +America/Louisville EST5EDT,M3.2.0,M11.1.0 +America/Lower_Princes AST4 +America/Maceio <-03>3 +America/Managua CST6 +America/Manaus <-04>4 +America/Marigot AST4 +America/Martinique AST4 +America/Matamoros CST6CDT,M3.2.0,M11.1.0 +America/Mazatlan MST7 +America/Mendoza <-03>3 +America/Menominee CST6CDT,M3.2.0,M11.1.0 +America/Merida CST6 +America/Metlakatla AKST9AKDT,M3.2.0,M11.1.0 +America/Mexico_City CST6 +America/Miquelon <-03>3<-02>,M3.2.0,M11.1.0 +America/Moncton AST4ADT,M3.2.0,M11.1.0 +America/Monterrey CST6 +America/Montevideo <-03>3 +America/Montreal EST5EDT,M3.2.0,M11.1.0 +America/Montserrat AST4 +America/Nassau EST5EDT,M3.2.0,M11.1.0 +America/New_York EST5EDT,M3.2.0,M11.1.0 +America/Nipigon EST5EDT,M3.2.0,M11.1.0 +America/Nome AKST9AKDT,M3.2.0,M11.1.0 +America/Noronha <-02>2 +America/North_Dakota/Beulah CST6CDT,M3.2.0,M11.1.0 +America/North_Dakota/Center CST6CDT,M3.2.0,M11.1.0 +America/North_Dakota/New_Salem CST6CDT,M3.2.0,M11.1.0 +America/Nuuk <-02>2<-01>,M3.5.0/-1,M10.5.0/0 +America/Ojinaga CST6CDT,M3.2.0,M11.1.0 +America/Panama EST5 +America/Pangnirtung EST5EDT,M3.2.0,M11.1.0 +America/Paramaribo <-03>3 +America/Phoenix MST7 +America/Port-au-Prince EST5EDT,M3.2.0,M11.1.0 +America/Porto_Acre <-05>5 +America/Porto_Velho <-04>4 +America/Port_of_Spain AST4 +America/Puerto_Rico AST4 +America/Punta_Arenas <-03>3 +America/Rainy_River CST6CDT,M3.2.0,M11.1.0 +America/Rankin_Inlet CST6CDT,M3.2.0,M11.1.0 +America/Recife <-03>3 +America/Regina CST6 +America/Resolute CST6CDT,M3.2.0,M11.1.0 +America/Rio_Branco <-05>5 +America/Rosario <-03>3 +America/Santarem <-03>3 +America/Santa_Isabel PST8PDT,M3.2.0,M11.1.0 +America/Santiago <-04>4<-03>,M9.1.6/24,M4.1.6/24 +America/Santo_Domingo AST4 +America/Sao_Paulo <-03>3 +America/Scoresbysund <-01>1<+00>,M3.5.0/0,M10.5.0/1 +America/Shiprock MST7MDT,M3.2.0,M11.1.0 +America/Sitka AKST9AKDT,M3.2.0,M11.1.0 +America/St_Barthelemy AST4 +America/St_Johns NST3:30NDT,M3.2.0,M11.1.0 +America/St_Kitts AST4 +America/St_Lucia AST4 +America/St_Thomas AST4 +America/St_Vincent AST4 +America/Swift_Current CST6 +America/Tegucigalpa CST6 +America/Thule AST4ADT,M3.2.0,M11.1.0 +America/Thunder_Bay EST5EDT,M3.2.0,M11.1.0 +America/Tijuana PST8PDT,M3.2.0,M11.1.0 +America/Toronto EST5EDT,M3.2.0,M11.1.0 +America/Tortola AST4 +America/Vancouver PST8PDT,M3.2.0,M11.1.0 +America/Virgin AST4 +America/Whitehorse MST7 +America/Winnipeg CST6CDT,M3.2.0,M11.1.0 +America/Yakutat AKST9AKDT,M3.2.0,M11.1.0 +America/Yellowknife MST7MDT,M3.2.0,M11.1.0 +Antarctica/Casey <+11>-11 +Antarctica/Davis <+07>-7 +Antarctica/DumontDUrville <+10>-10 +Antarctica/Macquarie AEST-10AEDT,M10.1.0,M4.1.0/3 +Antarctica/Mawson <+05>-5 +Antarctica/McMurdo NZST-12NZDT,M9.5.0,M4.1.0/3 +Antarctica/Palmer <-03>3 +Antarctica/Rothera <-03>3 +Antarctica/South_Pole NZST-12NZDT,M9.5.0,M4.1.0/3 +Antarctica/Syowa <+03>-3 +Antarctica/Troll <+00>0<+02>-2,M3.5.0/1,M10.5.0/3 +Antarctica/Vostok <+06>-6 +Arctic/Longyearbyen CET-1CEST,M3.5.0,M10.5.0/3 +Asia/Aden <+03>-3 +Asia/Almaty <+06>-6 +Asia/Amman <+03>-3 +Asia/Anadyr <+12>-12 +Asia/Aqtau <+05>-5 +Asia/Aqtobe <+05>-5 +Asia/Ashgabat <+05>-5 +Asia/Ashkhabad <+05>-5 +Asia/Atyrau <+05>-5 +Asia/Baghdad <+03>-3 +Asia/Bahrain <+03>-3 +Asia/Baku <+04>-4 +Asia/Bangkok <+07>-7 +Asia/Barnaul <+07>-7 +Asia/Beirut EET-2EEST,M3.5.0/0,M10.5.0/0 +Asia/Bishkek <+06>-6 +Asia/Brunei <+08>-8 +Asia/Calcutta IST-5:30 +Asia/Chita <+09>-9 +Asia/Choibalsan <+08>-8 +Asia/Chongqing CST-8 +Asia/Chungking CST-8 +Asia/Colombo <+0530>-5:30 +Asia/Dacca <+06>-6 +Asia/Damascus <+03>-3 +Asia/Dhaka <+06>-6 +Asia/Dili <+09>-9 +Asia/Dubai <+04>-4 +Asia/Dushanbe <+05>-5 +Asia/Famagusta EET-2EEST,M3.5.0/3,M10.5.0/4 +Asia/Gaza EET-2EEST,M3.4.4/50,M10.4.4/50 +Asia/Harbin CST-8 +Asia/Hebron EET-2EEST,M3.4.4/50,M10.4.4/50 +Asia/Hong_Kong HKT-8 +Asia/Hovd <+07>-7 +Asia/Ho_Chi_Minh <+07>-7 +Asia/Irkutsk <+08>-8 +Asia/Istanbul <+03>-3 +Asia/Jakarta WIB-7 +Asia/Jayapura WIT-9 +Asia/Jerusalem IST-2IDT,M3.4.4/26,M10.5.0 +Asia/Kabul <+0430>-4:30 +Asia/Kamchatka <+12>-12 +Asia/Karachi PKT-5 +Asia/Kashgar <+06>-6 +Asia/Kathmandu <+0545>-5:45 +Asia/Katmandu <+0545>-5:45 +Asia/Khandyga <+09>-9 +Asia/Kolkata IST-5:30 +Asia/Krasnoyarsk <+07>-7 +Asia/Kuala_Lumpur <+08>-8 +Asia/Kuching <+08>-8 +Asia/Kuwait <+03>-3 +Asia/Macao CST-8 +Asia/Macau CST-8 +Asia/Magadan <+11>-11 +Asia/Makassar WITA-8 +Asia/Manila PST-8 +Asia/Muscat <+04>-4 +Asia/Nicosia EET-2EEST,M3.5.0/3,M10.5.0/4 +Asia/Novokuznetsk <+07>-7 +Asia/Novosibirsk <+07>-7 +Asia/Omsk <+06>-6 +Asia/Oral <+05>-5 +Asia/Phnom_Penh <+07>-7 +Asia/Pontianak WIB-7 +Asia/Pyongyang KST-9 +Asia/Qatar <+03>-3 +Asia/Qostanay <+06>-6 +Asia/Qyzylorda <+05>-5 +Asia/Rangoon <+0630>-6:30 +Asia/Riyadh <+03>-3 +Asia/Saigon <+07>-7 +Asia/Sakhalin <+11>-11 +Asia/Samarkand <+05>-5 +Asia/Seoul KST-9 +Asia/Shanghai CST-8 +Asia/Singapore <+08>-8 +Asia/Srednekolymsk <+11>-11 +Asia/Taipei CST-8 +Asia/Tashkent <+05>-5 +Asia/Tbilisi <+04>-4 +Asia/Tehran <+0330>-3:30 +Asia/Tel_Aviv IST-2IDT,M3.4.4/26,M10.5.0 +Asia/Thimbu <+06>-6 +Asia/Thimphu <+06>-6 +Asia/Tokyo JST-9 +Asia/Tomsk <+07>-7 +Asia/Ujung_Pandang WITA-8 +Asia/Ulaanbaatar <+08>-8 +Asia/Ulan_Bator <+08>-8 +Asia/Urumqi <+06>-6 +Asia/Ust-Nera <+10>-10 +Asia/Vientiane <+07>-7 +Asia/Vladivostok <+10>-10 +Asia/Yakutsk <+09>-9 +Asia/Yangon <+0630>-6:30 +Asia/Yekaterinburg <+05>-5 +Asia/Yerevan <+04>-4 +Atlantic/Azores <-01>1<+00>,M3.5.0/0,M10.5.0/1 +Atlantic/Bermuda AST4ADT,M3.2.0,M11.1.0 +Atlantic/Canary WET0WEST,M3.5.0/1,M10.5.0 +Atlantic/Cape_Verde <-01>1 +Atlantic/Faeroe WET0WEST,M3.5.0/1,M10.5.0 +Atlantic/Faroe WET0WEST,M3.5.0/1,M10.5.0 +Atlantic/Jan_Mayen CET-1CEST,M3.5.0,M10.5.0/3 +Atlantic/Madeira WET0WEST,M3.5.0/1,M10.5.0 +Atlantic/Reykjavik GMT0 +Atlantic/South_Georgia <-02>2 +Atlantic/Stanley <-03>3 +Atlantic/St_Helena GMT0 +Australia/ACT AEST-10AEDT,M10.1.0,M4.1.0/3 +Australia/Adelaide ACST-9:30ACDT,M10.1.0,M4.1.0/3 +Australia/Brisbane AEST-10 +Australia/Broken_Hill ACST-9:30ACDT,M10.1.0,M4.1.0/3 +Australia/Canberra AEST-10AEDT,M10.1.0,M4.1.0/3 +Australia/Currie AEST-10AEDT,M10.1.0,M4.1.0/3 +Australia/Darwin ACST-9:30 +Australia/Eucla <+0845>-8:45 +Australia/Hobart AEST-10AEDT,M10.1.0,M4.1.0/3 +Australia/LHI <+1030>-10:30<+11>-11,M10.1.0,M4.1.0 +Australia/Lindeman AEST-10 +Australia/Lord_Howe <+1030>-10:30<+11>-11,M10.1.0,M4.1.0 +Australia/Melbourne AEST-10AEDT,M10.1.0,M4.1.0/3 +Australia/North ACST-9:30 +Australia/NSW AEST-10AEDT,M10.1.0,M4.1.0/3 +Australia/Perth AWST-8 +Australia/Queensland AEST-10 +Australia/South ACST-9:30ACDT,M10.1.0,M4.1.0/3 +Australia/Sydney AEST-10AEDT,M10.1.0,M4.1.0/3 +Australia/Tasmania AEST-10AEDT,M10.1.0,M4.1.0/3 +Australia/Victoria AEST-10AEDT,M10.1.0,M4.1.0/3 +Australia/West AWST-8 +Australia/Yancowinna ACST-9:30ACDT,M10.1.0,M4.1.0/3 +Brazil/Acre <-05>5 +Brazil/DeNoronha <-02>2 +Brazil/East <-03>3 +Brazil/West <-04>4 +Canada/Atlantic AST4ADT,M3.2.0,M11.1.0 +Canada/Central CST6CDT,M3.2.0,M11.1.0 +Canada/Eastern EST5EDT,M3.2.0,M11.1.0 +Canada/Mountain MST7MDT,M3.2.0,M11.1.0 +Canada/Newfoundland NST3:30NDT,M3.2.0,M11.1.0 +Canada/Pacific PST8PDT,M3.2.0,M11.1.0 +Canada/Saskatchewan CST6 +Canada/Yukon MST7 +Chile/Continental <-04>4<-03>,M9.1.6/24,M4.1.6/24 +Chile/EasterIsland <-06>6<-05>,M9.1.6/22,M4.1.6/22 +Etc/GMT GMT0 +Etc/GMT+0 GMT0 +Etc/GMT+1 <-01>1 +Etc/GMT+10 <-10>10 +Etc/GMT+11 <-11>11 +Etc/GMT+12 <-12>12 +Etc/GMT+2 <-02>2 +Etc/GMT+3 <-03>3 +Etc/GMT+4 <-04>4 +Etc/GMT+5 <-05>5 +Etc/GMT+6 <-06>6 +Etc/GMT+7 <-07>7 +Etc/GMT+8 <-08>8 +Etc/GMT+9 <-09>9 +Etc/GMT-0 GMT0 +Etc/GMT-1 <+01>-1 +Etc/GMT-10 <+10>-10 +Etc/GMT-11 <+11>-11 +Etc/GMT-12 <+12>-12 +Etc/GMT-13 <+13>-13 +Etc/GMT-14 <+14>-14 +Etc/GMT-2 <+02>-2 +Etc/GMT-3 <+03>-3 +Etc/GMT-4 <+04>-4 +Etc/GMT-5 <+05>-5 +Etc/GMT-6 <+06>-6 +Etc/GMT-7 <+07>-7 +Etc/GMT-8 <+08>-8 +Etc/GMT-9 <+09>-9 +Etc/GMT0 GMT0 +Etc/Greenwich GMT0 +Etc/UCT UTC0 +Etc/Universal UTC0 +Etc/UTC UTC0 +Etc/Zulu UTC0 +Europe/Amsterdam CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Andorra CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Astrakhan <+04>-4 +Europe/Athens EET-2EEST,M3.5.0/3,M10.5.0/4 +Europe/Belfast GMT0BST,M3.5.0/1,M10.5.0 +Europe/Belgrade CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Berlin CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Bratislava CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Brussels CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Bucharest EET-2EEST,M3.5.0/3,M10.5.0/4 +Europe/Budapest CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Busingen CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Chisinau EET-2EEST,M3.5.0,M10.5.0/3 +Europe/Copenhagen CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Dublin IST-1GMT0,M10.5.0,M3.5.0/1 +Europe/Gibraltar CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Guernsey GMT0BST,M3.5.0/1,M10.5.0 +Europe/Helsinki EET-2EEST,M3.5.0/3,M10.5.0/4 +Europe/Isle_of_Man GMT0BST,M3.5.0/1,M10.5.0 +Europe/Istanbul <+03>-3 +Europe/Jersey GMT0BST,M3.5.0/1,M10.5.0 +Europe/Kaliningrad EET-2 +Europe/Kiev EET-2EEST,M3.5.0/3,M10.5.0/4 +Europe/Kirov MSK-3 +Europe/Kyiv EET-2EEST,M3.5.0/3,M10.5.0/4 +Europe/Lisbon WET0WEST,M3.5.0/1,M10.5.0 +Europe/Ljubljana CET-1CEST,M3.5.0,M10.5.0/3 +Europe/London GMT0BST,M3.5.0/1,M10.5.0 +Europe/Luxembourg CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Madrid CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Malta CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Mariehamn EET-2EEST,M3.5.0/3,M10.5.0/4 +Europe/Minsk <+03>-3 +Europe/Monaco CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Moscow MSK-3 +Europe/Nicosia EET-2EEST,M3.5.0/3,M10.5.0/4 +Europe/Oslo CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Paris CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Podgorica CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Prague CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Riga EET-2EEST,M3.5.0/3,M10.5.0/4 +Europe/Rome CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Samara <+04>-4 +Europe/San_Marino CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Sarajevo CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Saratov <+04>-4 +Europe/Simferopol MSK-3 +Europe/Skopje CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Sofia EET-2EEST,M3.5.0/3,M10.5.0/4 +Europe/Stockholm CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Tallinn EET-2EEST,M3.5.0/3,M10.5.0/4 +Europe/Tirane CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Tiraspol EET-2EEST,M3.5.0,M10.5.0/3 +Europe/Ulyanovsk <+04>-4 +Europe/Uzhgorod EET-2EEST,M3.5.0/3,M10.5.0/4 +Europe/Vaduz CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Vatican CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Vienna CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Vilnius EET-2EEST,M3.5.0/3,M10.5.0/4 +Europe/Volgograd MSK-3 +Europe/Warsaw CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Zagreb CET-1CEST,M3.5.0,M10.5.0/3 +Europe/Zaporozhye EET-2EEST,M3.5.0/3,M10.5.0/4 +Europe/Zurich CET-1CEST,M3.5.0,M10.5.0/3 +Indian/Antananarivo EAT-3 +Indian/Chagos <+06>-6 +Indian/Christmas <+07>-7 +Indian/Cocos <+0630>-6:30 +Indian/Comoro EAT-3 +Indian/Kerguelen <+05>-5 +Indian/Mahe <+04>-4 +Indian/Maldives <+05>-5 +Indian/Mauritius <+04>-4 +Indian/Mayotte EAT-3 +Indian/Reunion <+04>-4 +Mexico/BajaNorte PST8PDT,M3.2.0,M11.1.0 +Mexico/BajaSur MST7 +Mexico/General CST6 +Pacific/Apia <+13>-13 +Pacific/Auckland NZST-12NZDT,M9.5.0,M4.1.0/3 +Pacific/Bougainville <+11>-11 +Pacific/Chatham <+1245>-12:45<+1345>,M9.5.0/2:45,M4.1.0/3:45 +Pacific/Chuuk <+10>-10 +Pacific/Easter <-06>6<-05>,M9.1.6/22,M4.1.6/22 +Pacific/Efate <+11>-11 +Pacific/Enderbury <+13>-13 +Pacific/Fakaofo <+13>-13 +Pacific/Fiji <+12>-12 +Pacific/Funafuti <+12>-12 +Pacific/Galapagos <-06>6 +Pacific/Gambier <-09>9 +Pacific/Guadalcanal <+11>-11 +Pacific/Guam ChST-10 +Pacific/Honolulu HST10 +Pacific/Johnston HST10 +Pacific/Kanton <+13>-13 +Pacific/Kiritimati <+14>-14 +Pacific/Kosrae <+11>-11 +Pacific/Kwajalein <+12>-12 +Pacific/Majuro <+12>-12 +Pacific/Marquesas <-0930>9:30 +Pacific/Midway SST11 +Pacific/Nauru <+12>-12 +Pacific/Niue <-11>11 +Pacific/Norfolk <+11>-11<+12>,M10.1.0,M4.1.0/3 +Pacific/Noumea <+11>-11 +Pacific/Pago_Pago SST11 +Pacific/Palau <+09>-9 +Pacific/Pitcairn <-08>8 +Pacific/Pohnpei <+11>-11 +Pacific/Ponape <+11>-11 +Pacific/Port_Moresby <+10>-10 +Pacific/Rarotonga <-10>10 +Pacific/Saipan ChST-10 +Pacific/Samoa SST11 +Pacific/Tahiti <-10>10 +Pacific/Tarawa <+12>-12 +Pacific/Tongatapu <+13>-13 +Pacific/Truk <+10>-10 +Pacific/Wake <+12>-12 +Pacific/Wallis <+12>-12 +Pacific/Yap <+10>-10 +US/Alaska AKST9AKDT,M3.2.0,M11.1.0 +US/Aleutian HST10HDT,M3.2.0,M11.1.0 +US/Arizona MST7 +US/Central CST6CDT,M3.2.0,M11.1.0 +US/East-Indiana EST5EDT,M3.2.0,M11.1.0 +US/Eastern EST5EDT,M3.2.0,M11.1.0 +US/Hawaii HST10 +US/Indiana-Starke CST6CDT,M3.2.0,M11.1.0 +US/Michigan EST5EDT,M3.2.0,M11.1.0 +US/Mountain MST7MDT,M3.2.0,M11.1.0 +US/Pacific PST8PDT,M3.2.0,M11.1.0 +US/Samoa SST11 From e6a763e04f3b32f7cbd6fb067c96fcf796e2ed78 Mon Sep 17 00:00:00 2001 From: JeffWDH Date: Fri, 21 Jul 2023 07:53:28 -0400 Subject: [PATCH 3/6] Reworded settings card --- firmware/lib/cw-commons/SettingsWebPage.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/firmware/lib/cw-commons/SettingsWebPage.h b/firmware/lib/cw-commons/SettingsWebPage.h index a46335c..2f30ed3 100644 --- a/firmware/lib/cw-commons/SettingsWebPage.h +++ b/firmware/lib/cw-commons/SettingsWebPage.h @@ -129,8 +129,8 @@ const char SETTINGS_PAGE[] PROGMEM = R""""( exclusive: "cw-cf-0x07" }, { - title: "[Advanced] Posix Timezone String", - description: "To avoid remote lookups, provide a Posix string that corresponds to your timezone. Leave empty to disable.", + title: "Posix Timezone String", + description: "To avoid remote lookups, provide a Posix string that corresponds to your timezone. Leave empty to obtain this automatically from the server. Click here for a list.", formInput: "", icon: "fa-globe", save: "updatePreference('manualPosix', posixString.value)", From 592f8f8792178c100bccdcf1410c809117d05ac3 Mon Sep 17 00:00:00 2001 From: JeffWDH Date: Fri, 21 Jul 2023 18:11:56 -0400 Subject: [PATCH 4/6] Updated link to Posix strings Linked to https://github.com/nayarsystems/posix_tz_db/blob/master/zones.csv --- firmware/lib/cw-commons/SettingsWebPage.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/lib/cw-commons/SettingsWebPage.h b/firmware/lib/cw-commons/SettingsWebPage.h index 2f30ed3..7bd6272 100644 --- a/firmware/lib/cw-commons/SettingsWebPage.h +++ b/firmware/lib/cw-commons/SettingsWebPage.h @@ -130,7 +130,7 @@ const char SETTINGS_PAGE[] PROGMEM = R""""( }, { title: "Posix Timezone String", - description: "To avoid remote lookups, provide a Posix string that corresponds to your timezone. Leave empty to obtain this automatically from the server. Click here for a list.", + description: "To avoid remote lookups, provide a Posix string that corresponds to your timezone. Leave empty to obtain this automatically from the server. Click here for a list.", formInput: "", icon: "fa-globe", save: "updatePreference('manualPosix', posixString.value)", From 07a36f638f3fff63790bdf812bf68eafac210f0a Mon Sep 17 00:00:00 2001 From: JeffWDH Date: Fri, 21 Jul 2023 18:12:46 -0400 Subject: [PATCH 5/6] Delete PosixTimezoneStrings.txt --- PosixTimezoneStrings.txt | 552 --------------------------------------- 1 file changed, 552 deletions(-) delete mode 100644 PosixTimezoneStrings.txt diff --git a/PosixTimezoneStrings.txt b/PosixTimezoneStrings.txt deleted file mode 100644 index a80efc8..0000000 --- a/PosixTimezoneStrings.txt +++ /dev/null @@ -1,552 +0,0 @@ -Africa/Abidjan GMT0 -Africa/Accra GMT0 -Africa/Addis_Ababa EAT-3 -Africa/Algiers CET-1 -Africa/Asmara EAT-3 -Africa/Asmera EAT-3 -Africa/Bamako GMT0 -Africa/Bangui WAT-1 -Africa/Banjul GMT0 -Africa/Bissau GMT0 -Africa/Blantyre CAT-2 -Africa/Brazzaville WAT-1 -Africa/Bujumbura CAT-2 -Africa/Cairo EET-2EEST,M4.5.5/0,M10.5.4/24 -Africa/Casablanca <+01>-1 -Africa/Ceuta CET-1CEST,M3.5.0,M10.5.0/3 -Africa/Conakry GMT0 -Africa/Dakar GMT0 -Africa/Dar_es_Salaam EAT-3 -Africa/Djibouti EAT-3 -Africa/Douala WAT-1 -Africa/El_Aaiun <+01>-1 -Africa/Freetown GMT0 -Africa/Gaborone CAT-2 -Africa/Harare CAT-2 -Africa/Johannesburg SAST-2 -Africa/Juba CAT-2 -Africa/Kampala EAT-3 -Africa/Khartoum CAT-2 -Africa/Kigali CAT-2 -Africa/Kinshasa WAT-1 -Africa/Lagos WAT-1 -Africa/Libreville WAT-1 -Africa/Lome GMT0 -Africa/Luanda WAT-1 -Africa/Lubumbashi CAT-2 -Africa/Lusaka CAT-2 -Africa/Malabo WAT-1 -Africa/Maputo CAT-2 -Africa/Maseru SAST-2 -Africa/Mbabane SAST-2 -Africa/Mogadishu EAT-3 -Africa/Monrovia GMT0 -Africa/Nairobi EAT-3 -Africa/Ndjamena WAT-1 -Africa/Niamey WAT-1 -Africa/Nouakchott GMT0 -Africa/Ouagadougou GMT0 -Africa/Porto-Novo WAT-1 -Africa/Sao_Tome GMT0 -Africa/Timbuktu GMT0 -Africa/Tripoli EET-2 -Africa/Tunis CET-1 -Africa/Windhoek CAT-2 -America/Adak HST10HDT,M3.2.0,M11.1.0 -America/Anchorage AKST9AKDT,M3.2.0,M11.1.0 -America/Anguilla AST4 -America/Antigua AST4 -America/Araguaina <-03>3 -America/Argentina/Buenos_Aires <-03>3 -America/Argentina/Catamarca <-03>3 -America/Argentina/ComodRivadavia <-03>3 -America/Argentina/Cordoba <-03>3 -America/Argentina/Jujuy <-03>3 -America/Argentina/La_Rioja <-03>3 -America/Argentina/Mendoza <-03>3 -America/Argentina/Rio_Gallegos <-03>3 -America/Argentina/Salta <-03>3 -America/Argentina/San_Juan <-03>3 -America/Argentina/San_Luis <-03>3 -America/Argentina/Tucuman <-03>3 -America/Argentina/Ushuaia <-03>3 -America/Aruba AST4 -America/Asuncion <-04>4<-03>,M10.1.0/0,M3.4.0/0 -America/Atikokan EST5 -America/Atka HST10HDT,M3.2.0,M11.1.0 -America/Bahia <-03>3 -America/Bahia_Banderas CST6 -America/Barbados AST4 -America/Belem <-03>3 -America/Belize CST6 -America/Blanc-Sablon AST4 -America/Boa_Vista <-04>4 -America/Bogota <-05>5 -America/Boise MST7MDT,M3.2.0,M11.1.0 -America/Buenos_Aires <-03>3 -America/Cambridge_Bay MST7MDT,M3.2.0,M11.1.0 -America/Campo_Grande <-04>4 -America/Cancun EST5 -America/Caracas <-04>4 -America/Catamarca <-03>3 -America/Cayenne <-03>3 -America/Cayman EST5 -America/Chicago CST6CDT,M3.2.0,M11.1.0 -America/Chihuahua CST6 -America/Ciudad_Juarez MST7MDT,M3.2.0,M11.1.0 -America/Coral_Harbour EST5 -America/Cordoba <-03>3 -America/Costa_Rica CST6 -America/Creston MST7 -America/Cuiaba <-04>4 -America/Curacao AST4 -America/Danmarkshavn GMT0 -America/Dawson MST7 -America/Dawson_Creek MST7 -America/Denver MST7MDT,M3.2.0,M11.1.0 -America/Detroit EST5EDT,M3.2.0,M11.1.0 -America/Dominica AST4 -America/Edmonton MST7MDT,M3.2.0,M11.1.0 -America/Eirunepe <-05>5 -America/El_Salvador CST6 -America/Ensenada PST8PDT,M3.2.0,M11.1.0 -America/Fortaleza <-03>3 -America/Fort_Nelson MST7 -America/Fort_Wayne EST5EDT,M3.2.0,M11.1.0 -America/Glace_Bay AST4ADT,M3.2.0,M11.1.0 -America/Godthab <-02>2<-01>,M3.5.0/-1,M10.5.0/0 -America/Goose_Bay AST4ADT,M3.2.0,M11.1.0 -America/Grand_Turk EST5EDT,M3.2.0,M11.1.0 -America/Grenada AST4 -America/Guadeloupe AST4 -America/Guatemala CST6 -America/Guayaquil <-05>5 -America/Guyana <-04>4 -America/Halifax AST4ADT,M3.2.0,M11.1.0 -America/Havana CST5CDT,M3.2.0/0,M11.1.0/1 -America/Hermosillo MST7 -America/Indiana/Indianapolis EST5EDT,M3.2.0,M11.1.0 -America/Indiana/Knox CST6CDT,M3.2.0,M11.1.0 -America/Indiana/Marengo EST5EDT,M3.2.0,M11.1.0 -America/Indiana/Petersburg EST5EDT,M3.2.0,M11.1.0 -America/Indiana/Tell_City CST6CDT,M3.2.0,M11.1.0 -America/Indiana/Vevay EST5EDT,M3.2.0,M11.1.0 -America/Indiana/Vincennes EST5EDT,M3.2.0,M11.1.0 -America/Indiana/Winamac EST5EDT,M3.2.0,M11.1.0 -America/Indianapolis EST5EDT,M3.2.0,M11.1.0 -America/Inuvik MST7MDT,M3.2.0,M11.1.0 -America/Iqaluit EST5EDT,M3.2.0,M11.1.0 -America/Jamaica EST5 -America/Jujuy <-03>3 -America/Juneau AKST9AKDT,M3.2.0,M11.1.0 -America/Kentucky/Louisville EST5EDT,M3.2.0,M11.1.0 -America/Kentucky/Monticello EST5EDT,M3.2.0,M11.1.0 -America/Knox_IN CST6CDT,M3.2.0,M11.1.0 -America/Kralendijk AST4 -America/La_Paz <-04>4 -America/Lima <-05>5 -America/Los_Angeles PST8PDT,M3.2.0,M11.1.0 -America/Louisville EST5EDT,M3.2.0,M11.1.0 -America/Lower_Princes AST4 -America/Maceio <-03>3 -America/Managua CST6 -America/Manaus <-04>4 -America/Marigot AST4 -America/Martinique AST4 -America/Matamoros CST6CDT,M3.2.0,M11.1.0 -America/Mazatlan MST7 -America/Mendoza <-03>3 -America/Menominee CST6CDT,M3.2.0,M11.1.0 -America/Merida CST6 -America/Metlakatla AKST9AKDT,M3.2.0,M11.1.0 -America/Mexico_City CST6 -America/Miquelon <-03>3<-02>,M3.2.0,M11.1.0 -America/Moncton AST4ADT,M3.2.0,M11.1.0 -America/Monterrey CST6 -America/Montevideo <-03>3 -America/Montreal EST5EDT,M3.2.0,M11.1.0 -America/Montserrat AST4 -America/Nassau EST5EDT,M3.2.0,M11.1.0 -America/New_York EST5EDT,M3.2.0,M11.1.0 -America/Nipigon EST5EDT,M3.2.0,M11.1.0 -America/Nome AKST9AKDT,M3.2.0,M11.1.0 -America/Noronha <-02>2 -America/North_Dakota/Beulah CST6CDT,M3.2.0,M11.1.0 -America/North_Dakota/Center CST6CDT,M3.2.0,M11.1.0 -America/North_Dakota/New_Salem CST6CDT,M3.2.0,M11.1.0 -America/Nuuk <-02>2<-01>,M3.5.0/-1,M10.5.0/0 -America/Ojinaga CST6CDT,M3.2.0,M11.1.0 -America/Panama EST5 -America/Pangnirtung EST5EDT,M3.2.0,M11.1.0 -America/Paramaribo <-03>3 -America/Phoenix MST7 -America/Port-au-Prince EST5EDT,M3.2.0,M11.1.0 -America/Porto_Acre <-05>5 -America/Porto_Velho <-04>4 -America/Port_of_Spain AST4 -America/Puerto_Rico AST4 -America/Punta_Arenas <-03>3 -America/Rainy_River CST6CDT,M3.2.0,M11.1.0 -America/Rankin_Inlet CST6CDT,M3.2.0,M11.1.0 -America/Recife <-03>3 -America/Regina CST6 -America/Resolute CST6CDT,M3.2.0,M11.1.0 -America/Rio_Branco <-05>5 -America/Rosario <-03>3 -America/Santarem <-03>3 -America/Santa_Isabel PST8PDT,M3.2.0,M11.1.0 -America/Santiago <-04>4<-03>,M9.1.6/24,M4.1.6/24 -America/Santo_Domingo AST4 -America/Sao_Paulo <-03>3 -America/Scoresbysund <-01>1<+00>,M3.5.0/0,M10.5.0/1 -America/Shiprock MST7MDT,M3.2.0,M11.1.0 -America/Sitka AKST9AKDT,M3.2.0,M11.1.0 -America/St_Barthelemy AST4 -America/St_Johns NST3:30NDT,M3.2.0,M11.1.0 -America/St_Kitts AST4 -America/St_Lucia AST4 -America/St_Thomas AST4 -America/St_Vincent AST4 -America/Swift_Current CST6 -America/Tegucigalpa CST6 -America/Thule AST4ADT,M3.2.0,M11.1.0 -America/Thunder_Bay EST5EDT,M3.2.0,M11.1.0 -America/Tijuana PST8PDT,M3.2.0,M11.1.0 -America/Toronto EST5EDT,M3.2.0,M11.1.0 -America/Tortola AST4 -America/Vancouver PST8PDT,M3.2.0,M11.1.0 -America/Virgin AST4 -America/Whitehorse MST7 -America/Winnipeg CST6CDT,M3.2.0,M11.1.0 -America/Yakutat AKST9AKDT,M3.2.0,M11.1.0 -America/Yellowknife MST7MDT,M3.2.0,M11.1.0 -Antarctica/Casey <+11>-11 -Antarctica/Davis <+07>-7 -Antarctica/DumontDUrville <+10>-10 -Antarctica/Macquarie AEST-10AEDT,M10.1.0,M4.1.0/3 -Antarctica/Mawson <+05>-5 -Antarctica/McMurdo NZST-12NZDT,M9.5.0,M4.1.0/3 -Antarctica/Palmer <-03>3 -Antarctica/Rothera <-03>3 -Antarctica/South_Pole NZST-12NZDT,M9.5.0,M4.1.0/3 -Antarctica/Syowa <+03>-3 -Antarctica/Troll <+00>0<+02>-2,M3.5.0/1,M10.5.0/3 -Antarctica/Vostok <+06>-6 -Arctic/Longyearbyen CET-1CEST,M3.5.0,M10.5.0/3 -Asia/Aden <+03>-3 -Asia/Almaty <+06>-6 -Asia/Amman <+03>-3 -Asia/Anadyr <+12>-12 -Asia/Aqtau <+05>-5 -Asia/Aqtobe <+05>-5 -Asia/Ashgabat <+05>-5 -Asia/Ashkhabad <+05>-5 -Asia/Atyrau <+05>-5 -Asia/Baghdad <+03>-3 -Asia/Bahrain <+03>-3 -Asia/Baku <+04>-4 -Asia/Bangkok <+07>-7 -Asia/Barnaul <+07>-7 -Asia/Beirut EET-2EEST,M3.5.0/0,M10.5.0/0 -Asia/Bishkek <+06>-6 -Asia/Brunei <+08>-8 -Asia/Calcutta IST-5:30 -Asia/Chita <+09>-9 -Asia/Choibalsan <+08>-8 -Asia/Chongqing CST-8 -Asia/Chungking CST-8 -Asia/Colombo <+0530>-5:30 -Asia/Dacca <+06>-6 -Asia/Damascus <+03>-3 -Asia/Dhaka <+06>-6 -Asia/Dili <+09>-9 -Asia/Dubai <+04>-4 -Asia/Dushanbe <+05>-5 -Asia/Famagusta EET-2EEST,M3.5.0/3,M10.5.0/4 -Asia/Gaza EET-2EEST,M3.4.4/50,M10.4.4/50 -Asia/Harbin CST-8 -Asia/Hebron EET-2EEST,M3.4.4/50,M10.4.4/50 -Asia/Hong_Kong HKT-8 -Asia/Hovd <+07>-7 -Asia/Ho_Chi_Minh <+07>-7 -Asia/Irkutsk <+08>-8 -Asia/Istanbul <+03>-3 -Asia/Jakarta WIB-7 -Asia/Jayapura WIT-9 -Asia/Jerusalem IST-2IDT,M3.4.4/26,M10.5.0 -Asia/Kabul <+0430>-4:30 -Asia/Kamchatka <+12>-12 -Asia/Karachi PKT-5 -Asia/Kashgar <+06>-6 -Asia/Kathmandu <+0545>-5:45 -Asia/Katmandu <+0545>-5:45 -Asia/Khandyga <+09>-9 -Asia/Kolkata IST-5:30 -Asia/Krasnoyarsk <+07>-7 -Asia/Kuala_Lumpur <+08>-8 -Asia/Kuching <+08>-8 -Asia/Kuwait <+03>-3 -Asia/Macao CST-8 -Asia/Macau CST-8 -Asia/Magadan <+11>-11 -Asia/Makassar WITA-8 -Asia/Manila PST-8 -Asia/Muscat <+04>-4 -Asia/Nicosia EET-2EEST,M3.5.0/3,M10.5.0/4 -Asia/Novokuznetsk <+07>-7 -Asia/Novosibirsk <+07>-7 -Asia/Omsk <+06>-6 -Asia/Oral <+05>-5 -Asia/Phnom_Penh <+07>-7 -Asia/Pontianak WIB-7 -Asia/Pyongyang KST-9 -Asia/Qatar <+03>-3 -Asia/Qostanay <+06>-6 -Asia/Qyzylorda <+05>-5 -Asia/Rangoon <+0630>-6:30 -Asia/Riyadh <+03>-3 -Asia/Saigon <+07>-7 -Asia/Sakhalin <+11>-11 -Asia/Samarkand <+05>-5 -Asia/Seoul KST-9 -Asia/Shanghai CST-8 -Asia/Singapore <+08>-8 -Asia/Srednekolymsk <+11>-11 -Asia/Taipei CST-8 -Asia/Tashkent <+05>-5 -Asia/Tbilisi <+04>-4 -Asia/Tehran <+0330>-3:30 -Asia/Tel_Aviv IST-2IDT,M3.4.4/26,M10.5.0 -Asia/Thimbu <+06>-6 -Asia/Thimphu <+06>-6 -Asia/Tokyo JST-9 -Asia/Tomsk <+07>-7 -Asia/Ujung_Pandang WITA-8 -Asia/Ulaanbaatar <+08>-8 -Asia/Ulan_Bator <+08>-8 -Asia/Urumqi <+06>-6 -Asia/Ust-Nera <+10>-10 -Asia/Vientiane <+07>-7 -Asia/Vladivostok <+10>-10 -Asia/Yakutsk <+09>-9 -Asia/Yangon <+0630>-6:30 -Asia/Yekaterinburg <+05>-5 -Asia/Yerevan <+04>-4 -Atlantic/Azores <-01>1<+00>,M3.5.0/0,M10.5.0/1 -Atlantic/Bermuda AST4ADT,M3.2.0,M11.1.0 -Atlantic/Canary WET0WEST,M3.5.0/1,M10.5.0 -Atlantic/Cape_Verde <-01>1 -Atlantic/Faeroe WET0WEST,M3.5.0/1,M10.5.0 -Atlantic/Faroe WET0WEST,M3.5.0/1,M10.5.0 -Atlantic/Jan_Mayen CET-1CEST,M3.5.0,M10.5.0/3 -Atlantic/Madeira WET0WEST,M3.5.0/1,M10.5.0 -Atlantic/Reykjavik GMT0 -Atlantic/South_Georgia <-02>2 -Atlantic/Stanley <-03>3 -Atlantic/St_Helena GMT0 -Australia/ACT AEST-10AEDT,M10.1.0,M4.1.0/3 -Australia/Adelaide ACST-9:30ACDT,M10.1.0,M4.1.0/3 -Australia/Brisbane AEST-10 -Australia/Broken_Hill ACST-9:30ACDT,M10.1.0,M4.1.0/3 -Australia/Canberra AEST-10AEDT,M10.1.0,M4.1.0/3 -Australia/Currie AEST-10AEDT,M10.1.0,M4.1.0/3 -Australia/Darwin ACST-9:30 -Australia/Eucla <+0845>-8:45 -Australia/Hobart AEST-10AEDT,M10.1.0,M4.1.0/3 -Australia/LHI <+1030>-10:30<+11>-11,M10.1.0,M4.1.0 -Australia/Lindeman AEST-10 -Australia/Lord_Howe <+1030>-10:30<+11>-11,M10.1.0,M4.1.0 -Australia/Melbourne AEST-10AEDT,M10.1.0,M4.1.0/3 -Australia/North ACST-9:30 -Australia/NSW AEST-10AEDT,M10.1.0,M4.1.0/3 -Australia/Perth AWST-8 -Australia/Queensland AEST-10 -Australia/South ACST-9:30ACDT,M10.1.0,M4.1.0/3 -Australia/Sydney AEST-10AEDT,M10.1.0,M4.1.0/3 -Australia/Tasmania AEST-10AEDT,M10.1.0,M4.1.0/3 -Australia/Victoria AEST-10AEDT,M10.1.0,M4.1.0/3 -Australia/West AWST-8 -Australia/Yancowinna ACST-9:30ACDT,M10.1.0,M4.1.0/3 -Brazil/Acre <-05>5 -Brazil/DeNoronha <-02>2 -Brazil/East <-03>3 -Brazil/West <-04>4 -Canada/Atlantic AST4ADT,M3.2.0,M11.1.0 -Canada/Central CST6CDT,M3.2.0,M11.1.0 -Canada/Eastern EST5EDT,M3.2.0,M11.1.0 -Canada/Mountain MST7MDT,M3.2.0,M11.1.0 -Canada/Newfoundland NST3:30NDT,M3.2.0,M11.1.0 -Canada/Pacific PST8PDT,M3.2.0,M11.1.0 -Canada/Saskatchewan CST6 -Canada/Yukon MST7 -Chile/Continental <-04>4<-03>,M9.1.6/24,M4.1.6/24 -Chile/EasterIsland <-06>6<-05>,M9.1.6/22,M4.1.6/22 -Etc/GMT GMT0 -Etc/GMT+0 GMT0 -Etc/GMT+1 <-01>1 -Etc/GMT+10 <-10>10 -Etc/GMT+11 <-11>11 -Etc/GMT+12 <-12>12 -Etc/GMT+2 <-02>2 -Etc/GMT+3 <-03>3 -Etc/GMT+4 <-04>4 -Etc/GMT+5 <-05>5 -Etc/GMT+6 <-06>6 -Etc/GMT+7 <-07>7 -Etc/GMT+8 <-08>8 -Etc/GMT+9 <-09>9 -Etc/GMT-0 GMT0 -Etc/GMT-1 <+01>-1 -Etc/GMT-10 <+10>-10 -Etc/GMT-11 <+11>-11 -Etc/GMT-12 <+12>-12 -Etc/GMT-13 <+13>-13 -Etc/GMT-14 <+14>-14 -Etc/GMT-2 <+02>-2 -Etc/GMT-3 <+03>-3 -Etc/GMT-4 <+04>-4 -Etc/GMT-5 <+05>-5 -Etc/GMT-6 <+06>-6 -Etc/GMT-7 <+07>-7 -Etc/GMT-8 <+08>-8 -Etc/GMT-9 <+09>-9 -Etc/GMT0 GMT0 -Etc/Greenwich GMT0 -Etc/UCT UTC0 -Etc/Universal UTC0 -Etc/UTC UTC0 -Etc/Zulu UTC0 -Europe/Amsterdam CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Andorra CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Astrakhan <+04>-4 -Europe/Athens EET-2EEST,M3.5.0/3,M10.5.0/4 -Europe/Belfast GMT0BST,M3.5.0/1,M10.5.0 -Europe/Belgrade CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Berlin CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Bratislava CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Brussels CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Bucharest EET-2EEST,M3.5.0/3,M10.5.0/4 -Europe/Budapest CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Busingen CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Chisinau EET-2EEST,M3.5.0,M10.5.0/3 -Europe/Copenhagen CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Dublin IST-1GMT0,M10.5.0,M3.5.0/1 -Europe/Gibraltar CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Guernsey GMT0BST,M3.5.0/1,M10.5.0 -Europe/Helsinki EET-2EEST,M3.5.0/3,M10.5.0/4 -Europe/Isle_of_Man GMT0BST,M3.5.0/1,M10.5.0 -Europe/Istanbul <+03>-3 -Europe/Jersey GMT0BST,M3.5.0/1,M10.5.0 -Europe/Kaliningrad EET-2 -Europe/Kiev EET-2EEST,M3.5.0/3,M10.5.0/4 -Europe/Kirov MSK-3 -Europe/Kyiv EET-2EEST,M3.5.0/3,M10.5.0/4 -Europe/Lisbon WET0WEST,M3.5.0/1,M10.5.0 -Europe/Ljubljana CET-1CEST,M3.5.0,M10.5.0/3 -Europe/London GMT0BST,M3.5.0/1,M10.5.0 -Europe/Luxembourg CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Madrid CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Malta CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Mariehamn EET-2EEST,M3.5.0/3,M10.5.0/4 -Europe/Minsk <+03>-3 -Europe/Monaco CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Moscow MSK-3 -Europe/Nicosia EET-2EEST,M3.5.0/3,M10.5.0/4 -Europe/Oslo CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Paris CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Podgorica CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Prague CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Riga EET-2EEST,M3.5.0/3,M10.5.0/4 -Europe/Rome CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Samara <+04>-4 -Europe/San_Marino CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Sarajevo CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Saratov <+04>-4 -Europe/Simferopol MSK-3 -Europe/Skopje CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Sofia EET-2EEST,M3.5.0/3,M10.5.0/4 -Europe/Stockholm CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Tallinn EET-2EEST,M3.5.0/3,M10.5.0/4 -Europe/Tirane CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Tiraspol EET-2EEST,M3.5.0,M10.5.0/3 -Europe/Ulyanovsk <+04>-4 -Europe/Uzhgorod EET-2EEST,M3.5.0/3,M10.5.0/4 -Europe/Vaduz CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Vatican CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Vienna CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Vilnius EET-2EEST,M3.5.0/3,M10.5.0/4 -Europe/Volgograd MSK-3 -Europe/Warsaw CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Zagreb CET-1CEST,M3.5.0,M10.5.0/3 -Europe/Zaporozhye EET-2EEST,M3.5.0/3,M10.5.0/4 -Europe/Zurich CET-1CEST,M3.5.0,M10.5.0/3 -Indian/Antananarivo EAT-3 -Indian/Chagos <+06>-6 -Indian/Christmas <+07>-7 -Indian/Cocos <+0630>-6:30 -Indian/Comoro EAT-3 -Indian/Kerguelen <+05>-5 -Indian/Mahe <+04>-4 -Indian/Maldives <+05>-5 -Indian/Mauritius <+04>-4 -Indian/Mayotte EAT-3 -Indian/Reunion <+04>-4 -Mexico/BajaNorte PST8PDT,M3.2.0,M11.1.0 -Mexico/BajaSur MST7 -Mexico/General CST6 -Pacific/Apia <+13>-13 -Pacific/Auckland NZST-12NZDT,M9.5.0,M4.1.0/3 -Pacific/Bougainville <+11>-11 -Pacific/Chatham <+1245>-12:45<+1345>,M9.5.0/2:45,M4.1.0/3:45 -Pacific/Chuuk <+10>-10 -Pacific/Easter <-06>6<-05>,M9.1.6/22,M4.1.6/22 -Pacific/Efate <+11>-11 -Pacific/Enderbury <+13>-13 -Pacific/Fakaofo <+13>-13 -Pacific/Fiji <+12>-12 -Pacific/Funafuti <+12>-12 -Pacific/Galapagos <-06>6 -Pacific/Gambier <-09>9 -Pacific/Guadalcanal <+11>-11 -Pacific/Guam ChST-10 -Pacific/Honolulu HST10 -Pacific/Johnston HST10 -Pacific/Kanton <+13>-13 -Pacific/Kiritimati <+14>-14 -Pacific/Kosrae <+11>-11 -Pacific/Kwajalein <+12>-12 -Pacific/Majuro <+12>-12 -Pacific/Marquesas <-0930>9:30 -Pacific/Midway SST11 -Pacific/Nauru <+12>-12 -Pacific/Niue <-11>11 -Pacific/Norfolk <+11>-11<+12>,M10.1.0,M4.1.0/3 -Pacific/Noumea <+11>-11 -Pacific/Pago_Pago SST11 -Pacific/Palau <+09>-9 -Pacific/Pitcairn <-08>8 -Pacific/Pohnpei <+11>-11 -Pacific/Ponape <+11>-11 -Pacific/Port_Moresby <+10>-10 -Pacific/Rarotonga <-10>10 -Pacific/Saipan ChST-10 -Pacific/Samoa SST11 -Pacific/Tahiti <-10>10 -Pacific/Tarawa <+12>-12 -Pacific/Tongatapu <+13>-13 -Pacific/Truk <+10>-10 -Pacific/Wake <+12>-12 -Pacific/Wallis <+12>-12 -Pacific/Yap <+10>-10 -US/Alaska AKST9AKDT,M3.2.0,M11.1.0 -US/Aleutian HST10HDT,M3.2.0,M11.1.0 -US/Arizona MST7 -US/Central CST6CDT,M3.2.0,M11.1.0 -US/East-Indiana EST5EDT,M3.2.0,M11.1.0 -US/Eastern EST5EDT,M3.2.0,M11.1.0 -US/Hawaii HST10 -US/Indiana-Starke CST6CDT,M3.2.0,M11.1.0 -US/Michigan EST5EDT,M3.2.0,M11.1.0 -US/Mountain MST7MDT,M3.2.0,M11.1.0 -US/Pacific PST8PDT,M3.2.0,M11.1.0 -US/Samoa SST11 From 82fed86bde3304d85e6a674a7e1b14fa13c255d7 Mon Sep 17 00:00:00 2001 From: Jonathas Barbosa Date: Sat, 22 Jul 2023 02:52:35 -0300 Subject: [PATCH 6/6] Add manual posix param --- firmware/src/main.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/firmware/src/main.cpp b/firmware/src/main.cpp index e148067..a5b4f74 100644 --- a/firmware/src/main.cpp +++ b/firmware/src/main.cpp @@ -96,7 +96,10 @@ void setup() if (wifi.begin()) { StatusController::getInstance()->ntpConnecting(); - cwDateTime.begin(ClockwiseParams::getInstance()->timeZone.c_str(), ClockwiseParams::getInstance()->use24hFormat, ClockwiseParams::getInstance()->ntpServer.c_str()); + cwDateTime.begin(ClockwiseParams::getInstance()->timeZone.c_str(), + ClockwiseParams::getInstance()->use24hFormat, + ClockwiseParams::getInstance()->ntpServer.c_str(), + ClockwiseParams::getInstance()->manualPosix.c_str()); clockface->setup(&cwDateTime); } }