diff --git a/CHANGELOG.md b/CHANGELOG.md index bf764ca1e..6d0a73128 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Changelog * Unreleased + * Upgrade TZDB to 2023d + * https://mm.icann.org/pipermail/tz-announce/2023-December/000080.html + * "Ittoqqortoormiit, Greenland changes time zones on 2024-03-31. Vostok, + Antarctica changed time zones on 2023-12-18. Casey, Antarctica changed + time zones five times since 2020. Code and data fixes for Palestine + timestamps starting in 2072. A new data file zonenow.tab for + timestamps starting now." * 2.3.0 (2023-06-27, TZDB version 2023c) * Create [CustomZoneRegistry](examples/CustomZoneRegistry/) example to illustrate how to use a custom registry. diff --git a/src/zonedb/Makefile b/src/zonedb/Makefile index 5e42b4216..d630434ba 100644 --- a/src/zonedb/Makefile +++ b/src/zonedb/Makefile @@ -2,7 +2,7 @@ TARGETS := zone_infos.cpp zone_infos.h zone_policies.cpp zone_policies.h TOOLS := $(abspath ../../../AceTimeTools) TZ_REPO := $(abspath $(TOOLS)/../tz) -TZ_VERSION := 2023c +TZ_VERSION := 2023d START_YEAR := 2000 UNTIL_YEAR := 2200 diff --git a/src/zonedb/zone_infos.cpp b/src/zonedb/zone_infos.cpp index 41194bd73..6fe2b5bd2 100644 --- a/src/zonedb/zone_infos.cpp +++ b/src/zonedb/zone_infos.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedb/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedb -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope basic @@ -23,10 +23,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 448 (228 zones, 220 links) -// Unsupported Zones: 148 (122 zones, 26 links) +// Supported Zones: 446 (227 zones, 219 links) +// Unsupported Zones: 150 (124 zones, 26 links) // // Requested Years: [2000,2200] // Accurate Years: [2000,32767] @@ -39,8 +39,8 @@ // Max Buffer Size: 6 // // Records: -// Infos: 448 -// Eras: 240 +// Infos: 446 +// Eras: 239 // Policies: 65 // Rules: 367 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 3303 // Policies: 195 -// Eras: 2640 -// Zones: 2964 -// Links: 2860 -// Registry: 896 +// Eras: 2629 +// Zones: 2951 +// Links: 2847 +// Registry: 892 // Formats: 467 // Letters: 29 // Fragments: 116 -// Names: 4162 (original: 6534) -// TOTAL: 17648 +// Names: 4140 (original: 6495) +// TOTAL: 17585 // // Memory (32-bits): // Context: 24 // Rules: 4404 // Policies: 520 -// Eras: 3840 -// Zones: 5472 -// Links: 5280 -// Registry: 1792 +// Eras: 3824 +// Zones: 5448 +// Links: 5256 +// Registry: 1784 // Formats: 467 // Letters: 41 // Fragments: 138 -// Names: 4162 (original: 6534) -// TOTAL: 26140 +// Names: 4140 (original: 6495) +// TOTAL: 26046 // // DO NOT EDIT @@ -85,7 +85,7 @@ namespace zonedb { // ZoneContext //--------------------------------------------------------------------------- -static const char kVersionString[] ACE_TIME_PROGMEM = "2023c"; +static const char kVersionString[] ACE_TIME_PROGMEM = "2023d"; const __FlashStringHelper* const kTzDatabaseVersion = (const __FlashStringHelper*) kVersionString; @@ -149,8 +149,8 @@ const basic::ZoneContext kZoneContext ACE_TIME_PROGMEM = { }; //--------------------------------------------------------------------------- -// Zones: 228 -// Eras: 240 +// Zones: 227 +// Eras: 239 //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- @@ -2465,38 +2465,6 @@ const basic::ZoneInfo kZoneAmerica_Sao_Paulo ACE_TIME_PROGMEM = { nullptr /*targetInfo*/, }; -//--------------------------------------------------------------------------- -// Zone name: America/Scoresbysund -// Eras: 1 -//--------------------------------------------------------------------------- - -static const basic::ZoneEra kZoneEraAmerica_Scoresbysund[] ACE_TIME_PROGMEM = { - // -1:00 EU -01/+00 - { - &kZonePolicyEU /*zonePolicy*/, - "-01/+00" /*format*/, - -4 /*offsetCode*/, - 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, - 127 /*untilYearTiny*/, - 1 /*untilMonth*/, - 1 /*untilDay*/, - 0 /*untilTimeCode*/, - 0 /*untilTimeModifier (kSuffixW + minute=0)*/, - }, - -}; - -static const char kZoneNameAmerica_Scoresbysund[] ACE_TIME_PROGMEM = "\x02" "Scoresbysund"; - -const basic::ZoneInfo kZoneAmerica_Scoresbysund ACE_TIME_PROGMEM = { - kZoneNameAmerica_Scoresbysund /*name*/, - 0x123f8d2a /*zoneId*/, - &kZoneContext /*zoneContext*/, - 1 /*numEras*/, - kZoneEraAmerica_Scoresbysund /*eras*/, - nullptr /*targetInfo*/, -}; - //--------------------------------------------------------------------------- // Zone name: America/Sitka // Eras: 1 @@ -7596,7 +7564,7 @@ const basic::ZoneInfo kZoneWET ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- -// Links: 220 +// Links: 219 //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- @@ -8709,21 +8677,6 @@ const basic::ZoneInfo kZoneAntarctica_Syowa ACE_TIME_PROGMEM = { &kZoneAsia_Riyadh /*targetInfo*/, }; -//--------------------------------------------------------------------------- -// Link name: Antarctica/Vostok -> Asia/Urumqi -//--------------------------------------------------------------------------- - -static const char kZoneNameAntarctica_Vostok[] ACE_TIME_PROGMEM = "\x03" "Vostok"; - -const basic::ZoneInfo kZoneAntarctica_Vostok ACE_TIME_PROGMEM = { - kZoneNameAntarctica_Vostok /*name*/, - 0x4f966fd4 /*zoneId*/, - &kZoneContext /*zoneContext*/, - 1 /*numEras*/, - kZoneEraAsia_Urumqi /*eras*/, - &kZoneAsia_Urumqi /*targetInfo*/, -}; - //--------------------------------------------------------------------------- // Link name: Arctic/Longyearbyen -> Europe/Berlin //--------------------------------------------------------------------------- diff --git a/src/zonedb/zone_infos.h b/src/zonedb/zone_infos.h index 95136263e..3463dae7b 100644 --- a/src/zonedb/zone_infos.h +++ b/src/zonedb/zone_infos.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedb/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedb -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope basic @@ -23,10 +23,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 448 (228 zones, 220 links) -// Unsupported Zones: 148 (122 zones, 26 links) +// Supported Zones: 446 (227 zones, 219 links) +// Unsupported Zones: 150 (124 zones, 26 links) // // Requested Years: [2000,2200] // Accurate Years: [2000,32767] @@ -39,8 +39,8 @@ // Max Buffer Size: 6 // // Records: -// Infos: 448 -// Eras: 240 +// Infos: 446 +// Eras: 239 // Policies: 65 // Rules: 367 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 3303 // Policies: 195 -// Eras: 2640 -// Zones: 2964 -// Links: 2860 -// Registry: 896 +// Eras: 2629 +// Zones: 2951 +// Links: 2847 +// Registry: 892 // Formats: 467 // Letters: 29 // Fragments: 116 -// Names: 4162 (original: 6534) -// TOTAL: 17648 +// Names: 4140 (original: 6495) +// TOTAL: 17585 // // Memory (32-bits): // Context: 24 // Rules: 4404 // Policies: 520 -// Eras: 3840 -// Zones: 5472 -// Links: 5280 -// Registry: 1792 +// Eras: 3824 +// Zones: 5448 +// Links: 5256 +// Registry: 1784 // Formats: 467 // Letters: 41 // Fragments: 138 -// Names: 4162 (original: 6534) -// TOTAL: 26140 +// Names: 4140 (original: 6495) +// TOTAL: 26046 // // DO NOT EDIT @@ -95,7 +95,7 @@ extern const __FlashStringHelper* const kTzDatabaseVersion; extern const basic::ZoneContext kZoneContext; //--------------------------------------------------------------------------- -// Supported zones: 228 +// Supported zones: 227 //--------------------------------------------------------------------------- extern const basic::ZoneInfo kZoneAfrica_Abidjan; // Africa/Abidjan @@ -168,7 +168,6 @@ extern const basic::ZoneInfo kZoneAmerica_Puerto_Rico; // America/Puerto_Rico extern const basic::ZoneInfo kZoneAmerica_Regina; // America/Regina extern const basic::ZoneInfo kZoneAmerica_Santiago; // America/Santiago extern const basic::ZoneInfo kZoneAmerica_Sao_Paulo; // America/Sao_Paulo -extern const basic::ZoneInfo kZoneAmerica_Scoresbysund; // America/Scoresbysund extern const basic::ZoneInfo kZoneAmerica_Sitka; // America/Sitka extern const basic::ZoneInfo kZoneAmerica_Swift_Current; // America/Swift_Current extern const basic::ZoneInfo kZoneAmerica_Tegucigalpa; // America/Tegucigalpa @@ -400,7 +399,6 @@ const uint32_t kZoneIdAmerica_Puerto_Rico = 0x6752ca31; // America/Puerto_Rico const uint32_t kZoneIdAmerica_Regina = 0xb875371c; // America/Regina const uint32_t kZoneIdAmerica_Santiago = 0x7410c9bc; // America/Santiago const uint32_t kZoneIdAmerica_Sao_Paulo = 0x1063bfc9; // America/Sao_Paulo -const uint32_t kZoneIdAmerica_Scoresbysund = 0x123f8d2a; // America/Scoresbysund const uint32_t kZoneIdAmerica_Sitka = 0x99104ce2; // America/Sitka const uint32_t kZoneIdAmerica_Swift_Current = 0xdef98e55; // America/Swift_Current const uint32_t kZoneIdAmerica_Tegucigalpa = 0xbfd6fd4c; // America/Tegucigalpa @@ -561,7 +559,7 @@ const uint32_t kZoneIdWET = 0x0b882e35; // WET //--------------------------------------------------------------------------- -// Supported links: 220 +// Supported links: 219 //--------------------------------------------------------------------------- extern const basic::ZoneInfo kZoneAfrica_Accra; // Africa/Accra -> Africa/Abidjan @@ -638,7 +636,6 @@ extern const basic::ZoneInfo kZoneAntarctica_DumontDUrville; // Antarctica/Dumon extern const basic::ZoneInfo kZoneAntarctica_McMurdo; // Antarctica/McMurdo -> Pacific/Auckland extern const basic::ZoneInfo kZoneAntarctica_South_Pole; // Antarctica/South_Pole -> Pacific/Auckland extern const basic::ZoneInfo kZoneAntarctica_Syowa; // Antarctica/Syowa -> Asia/Riyadh -extern const basic::ZoneInfo kZoneAntarctica_Vostok; // Antarctica/Vostok -> Asia/Urumqi extern const basic::ZoneInfo kZoneArctic_Longyearbyen; // Arctic/Longyearbyen -> Europe/Berlin extern const basic::ZoneInfo kZoneAsia_Aden; // Asia/Aden -> Asia/Riyadh extern const basic::ZoneInfo kZoneAsia_Ashkhabad; // Asia/Ashkhabad -> Asia/Ashgabat @@ -862,7 +859,6 @@ const uint32_t kZoneIdAntarctica_DumontDUrville = 0x5a3c656c; // Antarctica/Dumo const uint32_t kZoneIdAntarctica_McMurdo = 0x6eeb5585; // Antarctica/McMurdo const uint32_t kZoneIdAntarctica_South_Pole = 0xcd96b290; // Antarctica/South_Pole const uint32_t kZoneIdAntarctica_Syowa = 0xe330c7e1; // Antarctica/Syowa -const uint32_t kZoneIdAntarctica_Vostok = 0x4f966fd4; // Antarctica/Vostok const uint32_t kZoneIdArctic_Longyearbyen = 0xd23e7859; // Arctic/Longyearbyen const uint32_t kZoneIdAsia_Aden = 0x1fa7084a; // Asia/Aden const uint32_t kZoneIdAsia_Ashkhabad = 0x15454f09; // Asia/Ashkhabad @@ -1088,7 +1084,6 @@ const uint8_t kZoneBufSizeAmerica_Puerto_Rico = 1; // America/Puerto_Rico in 19 const uint8_t kZoneBufSizeAmerica_Regina = 1; // America/Regina in 1949 const uint8_t kZoneBufSizeAmerica_Santiago = 5; // America/Santiago in 2002 const uint8_t kZoneBufSizeAmerica_Sao_Paulo = 6; // America/Sao_Paulo in 2003 -const uint8_t kZoneBufSizeAmerica_Scoresbysund = 5; // America/Scoresbysund in 1983 const uint8_t kZoneBufSizeAmerica_Sitka = 6; // America/Sitka in 2008 const uint8_t kZoneBufSizeAmerica_Swift_Current = 1; // America/Swift_Current in 1949 const uint8_t kZoneBufSizeAmerica_Tegucigalpa = 3; // America/Tegucigalpa in 1987 @@ -1249,7 +1244,7 @@ const uint8_t kZoneBufSizeWET = 5; // WET in 1983 //--------------------------------------------------------------------------- -// Unsupported zones: 122 +// Unsupported zones: 124 //--------------------------------------------------------------------------- // Africa/Cairo {policy 'Egypt' not found} @@ -1309,6 +1304,7 @@ const uint8_t kZoneBufSizeWET = 5; // WET in 1983 // America/Rio_Branco {UNTIL contains month/day/time} // America/Santarem {UNTIL contains month/day/time} // America/Santo_Domingo {UNTIL contains month/day/time} +// America/Scoresbysund {UNTIL contains month/day/time} // America/St_Johns {UNTIL contains month/day/time} // America/Tijuana {UNTIL contains month/day/time} // America/Whitehorse {UNTIL contains month/day/time} @@ -1318,6 +1314,7 @@ const uint8_t kZoneBufSizeWET = 5; // WET in 1983 // Antarctica/Mawson {UNTIL contains month/day/time} // Antarctica/Palmer {UNTIL contains month/day/time} // Antarctica/Troll {UNTIL contains month/day/time} +// Antarctica/Vostok {UNTIL contains month/day/time} // Asia/Almaty {UNTIL contains month/day/time} // Asia/Amman {UNTIL contains month/day/time} // Asia/Anadyr {UNTIL contains month/day/time} diff --git a/src/zonedb/zone_policies.cpp b/src/zonedb/zone_policies.cpp index b21912b32..c833e00fe 100644 --- a/src/zonedb/zone_policies.cpp +++ b/src/zonedb/zone_policies.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedb/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedb -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope basic @@ -23,10 +23,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 448 (228 zones, 220 links) -// Unsupported Zones: 148 (122 zones, 26 links) +// Supported Zones: 446 (227 zones, 219 links) +// Unsupported Zones: 150 (124 zones, 26 links) // // Requested Years: [2000,2200] // Accurate Years: [2000,32767] @@ -39,8 +39,8 @@ // Max Buffer Size: 6 // // Records: -// Infos: 448 -// Eras: 240 +// Infos: 446 +// Eras: 239 // Policies: 65 // Rules: 367 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 3303 // Policies: 195 -// Eras: 2640 -// Zones: 2964 -// Links: 2860 -// Registry: 896 +// Eras: 2629 +// Zones: 2951 +// Links: 2847 +// Registry: 892 // Formats: 467 // Letters: 29 // Fragments: 116 -// Names: 4162 (original: 6534) -// TOTAL: 17648 +// Names: 4140 (original: 6495) +// TOTAL: 17585 // // Memory (32-bits): // Context: 24 // Rules: 4404 // Policies: 520 -// Eras: 3840 -// Zones: 5472 -// Links: 5280 -// Registry: 1792 +// Eras: 3824 +// Zones: 5448 +// Links: 5256 +// Registry: 1784 // Formats: 467 // Letters: 41 // Fragments: 138 -// Names: 4162 (original: 6534) -// TOTAL: 26140 +// Names: 4140 (original: 6495) +// TOTAL: 26046 // // DO NOT EDIT diff --git a/src/zonedb/zone_policies.h b/src/zonedb/zone_policies.h index 3821cd8cc..038f60578 100644 --- a/src/zonedb/zone_policies.h +++ b/src/zonedb/zone_policies.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedb/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedb -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope basic @@ -23,10 +23,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 448 (228 zones, 220 links) -// Unsupported Zones: 148 (122 zones, 26 links) +// Supported Zones: 446 (227 zones, 219 links) +// Unsupported Zones: 150 (124 zones, 26 links) // // Requested Years: [2000,2200] // Accurate Years: [2000,32767] @@ -39,8 +39,8 @@ // Max Buffer Size: 6 // // Records: -// Infos: 448 -// Eras: 240 +// Infos: 446 +// Eras: 239 // Policies: 65 // Rules: 367 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 3303 // Policies: 195 -// Eras: 2640 -// Zones: 2964 -// Links: 2860 -// Registry: 896 +// Eras: 2629 +// Zones: 2951 +// Links: 2847 +// Registry: 892 // Formats: 467 // Letters: 29 // Fragments: 116 -// Names: 4162 (original: 6534) -// TOTAL: 17648 +// Names: 4140 (original: 6495) +// TOTAL: 17585 // // Memory (32-bits): // Context: 24 // Rules: 4404 // Policies: 520 -// Eras: 3840 -// Zones: 5472 -// Links: 5280 -// Registry: 1792 +// Eras: 3824 +// Zones: 5448 +// Links: 5256 +// Registry: 1784 // Formats: 467 // Letters: 41 // Fragments: 138 -// Names: 4162 (original: 6534) -// TOTAL: 26140 +// Names: 4140 (original: 6495) +// TOTAL: 26046 // // DO NOT EDIT @@ -198,7 +198,7 @@ extern const basic::ZonePolicy kZonePolicyZion; // NBorneo {unused} // NT_YK {unused} // NYC {unused} -// Palestine {Found 2 transitions in year/month '2040-10'} +// Palestine {Found 2 transitions in year/month '2073-10'} // Perry {unused} // Pike {unused} // Poland {unused} diff --git a/src/zonedb/zone_registry.cpp b/src/zonedb/zone_registry.cpp index cbf04bc72..b40bead10 100644 --- a/src/zonedb/zone_registry.cpp +++ b/src/zonedb/zone_registry.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedb/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedb -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope basic @@ -23,10 +23,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 448 (228 zones, 220 links) -// Unsupported Zones: 148 (122 zones, 26 links) +// Supported Zones: 446 (227 zones, 219 links) +// Unsupported Zones: 150 (124 zones, 26 links) // // Requested Years: [2000,2200] // Accurate Years: [2000,32767] @@ -39,8 +39,8 @@ // Max Buffer Size: 6 // // Records: -// Infos: 448 -// Eras: 240 +// Infos: 446 +// Eras: 239 // Policies: 65 // Rules: 367 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 3303 // Policies: 195 -// Eras: 2640 -// Zones: 2964 -// Links: 2860 -// Registry: 896 +// Eras: 2629 +// Zones: 2951 +// Links: 2847 +// Registry: 892 // Formats: 467 // Letters: 29 // Fragments: 116 -// Names: 4162 (original: 6534) -// TOTAL: 17648 +// Names: 4140 (original: 6495) +// TOTAL: 17585 // // Memory (32-bits): // Context: 24 // Rules: 4404 // Policies: 520 -// Eras: 3840 -// Zones: 5472 -// Links: 5280 -// Registry: 1792 +// Eras: 3824 +// Zones: 5448 +// Links: 5256 +// Registry: 1784 // Formats: 467 // Letters: 41 // Fragments: 138 -// Names: 4162 (original: 6534) -// TOTAL: 26140 +// Names: 4140 (original: 6495) +// TOTAL: 26046 // // DO NOT EDIT @@ -84,7 +84,7 @@ namespace zonedb { //--------------------------------------------------------------------------- // Zone Info registry. Sorted by zoneId. //--------------------------------------------------------------------------- -const basic::ZoneInfo* const kZoneRegistry[228] ACE_TIME_PROGMEM = { +const basic::ZoneInfo* const kZoneRegistry[227] ACE_TIME_PROGMEM = { &kZoneAsia_Jakarta, // 0x0506ab50, Asia/Jakarta &kZoneAmerica_Mazatlan, // 0x0532189e, America/Mazatlan &kZoneAmerica_Hermosillo, // 0x065d21c4, America/Hermosillo @@ -101,7 +101,6 @@ const basic::ZoneInfo* const kZoneRegistry[228] ACE_TIME_PROGMEM = { &kZoneAustralia_Melbourne, // 0x0fe559a3, Australia/Melbourne &kZoneAmerica_Sao_Paulo, // 0x1063bfc9, America/Sao_Paulo &kZoneAmerica_Indiana_Vevay, // 0x10aca054, America/Indiana/Vevay - &kZoneAmerica_Scoresbysund, // 0x123f8d2a, America/Scoresbysund &kZoneAsia_Samarkand, // 0x13ae5104, Asia/Samarkand &kZoneAsia_Dhaka, // 0x14c07b8b, Asia/Dhaka &kZoneAsia_Dubai, // 0x14c79f77, Asia/Dubai @@ -319,7 +318,7 @@ const basic::ZoneInfo* const kZoneRegistry[228] ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone and Link (fat) Info registry. Sorted by zoneId. Links act like Zones. //--------------------------------------------------------------------------- -const basic::ZoneInfo* const kZoneAndLinkRegistry[448] ACE_TIME_PROGMEM = { +const basic::ZoneInfo* const kZoneAndLinkRegistry[446] ACE_TIME_PROGMEM = { &kZoneGB, // 0x005973ae, GB -> Europe/London &kZoneNZ, // 0x005974ad, NZ -> Pacific/Auckland &kZoneAsia_Kuala_Lumpur, // 0x014763c4, Asia/Kuala_Lumpur -> Asia/Singapore @@ -364,7 +363,6 @@ const basic::ZoneInfo* const kZoneAndLinkRegistry[448] ACE_TIME_PROGMEM = { &kZoneAmerica_Sao_Paulo, // 0x1063bfc9, America/Sao_Paulo &kZoneEurope_Amsterdam, // 0x109395c2, Europe/Amsterdam -> Europe/Brussels &kZoneAmerica_Indiana_Vevay, // 0x10aca054, America/Indiana/Vevay - &kZoneAmerica_Scoresbysund, // 0x123f8d2a, America/Scoresbysund &kZoneAsia_Samarkand, // 0x13ae5104, Asia/Samarkand &kZoneAsia_Dacca, // 0x14bcac5e, Asia/Dacca -> Asia/Dhaka &kZoneAsia_Dhaka, // 0x14c07b8b, Asia/Dhaka @@ -450,7 +448,6 @@ const basic::ZoneInfo* const kZoneAndLinkRegistry[448] ACE_TIME_PROGMEM = { &kZoneAustralia_Sydney, // 0x4d1e9776, Australia/Sydney &kZoneNZ_CHAT, // 0x4d42afda, NZ-CHAT -> Pacific/Chatham &kZoneUS_Arizona, // 0x4ec52670, US/Arizona -> America/Phoenix - &kZoneAntarctica_Vostok, // 0x4f966fd4, Antarctica/Vostok -> Asia/Urumqi &kZoneUS_Aleutian, // 0x4fe013ef, US/Aleutian -> America/Adak &kZoneAustralia_Brisbane, // 0x4fedc9c0, Australia/Brisbane &kZoneAmerica_Asuncion, // 0x50ec79a6, America/Asuncion diff --git a/src/zonedb/zone_registry.h b/src/zonedb/zone_registry.h index bd1d8e531..fb231c9b5 100644 --- a/src/zonedb/zone_registry.h +++ b/src/zonedb/zone_registry.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedb/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedb -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope basic @@ -23,10 +23,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 448 (228 zones, 220 links) -// Unsupported Zones: 148 (122 zones, 26 links) +// Supported Zones: 446 (227 zones, 219 links) +// Unsupported Zones: 150 (124 zones, 26 links) // // Requested Years: [2000,2200] // Accurate Years: [2000,32767] @@ -39,8 +39,8 @@ // Max Buffer Size: 6 // // Records: -// Infos: 448 -// Eras: 240 +// Infos: 446 +// Eras: 239 // Policies: 65 // Rules: 367 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 3303 // Policies: 195 -// Eras: 2640 -// Zones: 2964 -// Links: 2860 -// Registry: 896 +// Eras: 2629 +// Zones: 2951 +// Links: 2847 +// Registry: 892 // Formats: 467 // Letters: 29 // Fragments: 116 -// Names: 4162 (original: 6534) -// TOTAL: 17648 +// Names: 4140 (original: 6495) +// TOTAL: 17585 // // Memory (32-bits): // Context: 24 // Rules: 4404 // Policies: 520 -// Eras: 3840 -// Zones: 5472 -// Links: 5280 -// Registry: 1792 +// Eras: 3824 +// Zones: 5448 +// Links: 5256 +// Registry: 1784 // Formats: 467 // Letters: 41 // Fragments: 138 -// Names: 4162 (original: 6534) -// TOTAL: 26140 +// Names: 4140 (original: 6495) +// TOTAL: 26046 // // DO NOT EDIT @@ -83,12 +83,12 @@ namespace ace_time { namespace zonedb { // Zones -const uint16_t kZoneRegistrySize = 228; -extern const basic::ZoneInfo* const kZoneRegistry[228]; +const uint16_t kZoneRegistrySize = 227; +extern const basic::ZoneInfo* const kZoneRegistry[227]; // Zones and Links -const uint16_t kZoneAndLinkRegistrySize = 448; -extern const basic::ZoneInfo* const kZoneAndLinkRegistry[448]; +const uint16_t kZoneAndLinkRegistrySize = 446; +extern const basic::ZoneInfo* const kZoneAndLinkRegistry[446]; } } diff --git a/src/zonedbc/Makefile b/src/zonedbc/Makefile index 207747dc9..32f210b1e 100644 --- a/src/zonedbc/Makefile +++ b/src/zonedbc/Makefile @@ -2,7 +2,7 @@ TARGETS := zone_infos.cpp zone_infos.h zone_policies.cpp zone_policies.h TOOLS := $(abspath ../../../AceTimeTools) TZ_REPO := $(abspath $(TOOLS)/../tz) -TZ_VERSION := 2023c +TZ_VERSION := 2023d START_YEAR := 1800 UNTIL_YEAR := 2200 diff --git a/src/zonedbc/zone_infos.cpp b/src/zonedbc/zone_infos.cpp index 0a0dfa32d..8c4258928 100644 --- a/src/zonedbc/zone_infos.cpp +++ b/src/zonedbc/zone_infos.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbc/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbc -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope complete @@ -23,9 +23,9 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 596 (350 zones, 246 links) +// Supported Zones: 596 (351 zones, 245 links) // Unsupported Zones: 0 (0 zones, 0 links) // // Requested Years: [1800,2200] @@ -40,7 +40,7 @@ // // Records: // Infos: 596 -// Eras: 1949 +// Eras: 1961 // Policies: 134 // Rules: 2238 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 26856 // Policies: 402 -// Eras: 29235 -// Zones: 4550 -// Links: 3198 +// Eras: 29415 +// Zones: 4563 +// Links: 3185 // Registry: 1192 // Formats: 1032 // Letters: 160 // Fragments: 150 // Names: 5649 (original: 9076) -// TOTAL: 72440 +// TOTAL: 72620 // // Memory (32-bits): // Context: 24 // Rules: 26856 // Policies: 1072 -// Eras: 38980 -// Zones: 8400 -// Links: 5904 +// Eras: 39220 +// Zones: 8424 +// Links: 5880 // Registry: 2384 // Formats: 1032 // Letters: 216 // Fragments: 178 // Names: 5649 (original: 9076) -// TOTAL: 90695 +// TOTAL: 90935 // // DO NOT EDIT @@ -85,7 +85,7 @@ namespace zonedbc { // ZoneContext //--------------------------------------------------------------------------- -static const char kVersionString[] ACE_TIME_PROGMEM = "2023c"; +static const char kVersionString[] ACE_TIME_PROGMEM = "2023d"; const __FlashStringHelper* const kTzDatabaseVersion = (const __FlashStringHelper*) kVersionString; @@ -199,8 +199,8 @@ const complete::ZoneContext kZoneContext ACE_TIME_PROGMEM = { }; //--------------------------------------------------------------------------- -// Zones: 350 -// Eras: 1949 +// Zones: 351 +// Eras: 1961 //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- @@ -11420,7 +11420,7 @@ const complete::ZoneInfo kZoneAmerica_North_Dakota_New_Salem ACE_TIME_PROGMEM = //--------------------------------------------------------------------------- // Zone name: America/Nuuk -// Eras: 4 +// Eras: 5 //--------------------------------------------------------------------------- static const complete::ZoneEra kZoneEraAmerica_Nuuk[] ACE_TIME_PROGMEM = { @@ -11450,7 +11450,7 @@ static const complete::ZoneEra kZoneEraAmerica_Nuuk[] ACE_TIME_PROGMEM = { 480 /*untilTimeCode (7200/15)*/, 0 /*untilTimeModifier (kAtcSuffixW + seconds=0)*/, }, - // -3:00 EU -03/-02 2023 Oct 29 1:00u + // -3:00 EU -03/-02 2023 Mar 26 1:00u { &kZonePolicyEU /*zonePolicy*/, "-03/-02" /*format*/, @@ -11458,6 +11458,19 @@ static const complete::ZoneEra kZoneEraAmerica_Nuuk[] ACE_TIME_PROGMEM = { 0 /*offsetRemainder (-10800%15)*/, 0 /*deltaMinutes*/, 2023 /*untilYear*/, + 3 /*untilMonth*/, + 26 /*untilDay*/, + 240 /*untilTimeCode (3600/15)*/, + 32 /*untilTimeModifier (kAtcSuffixU + seconds=0)*/, + }, + // -2:00 - -02 2023 Oct 29 1:00u + { + nullptr /*zonePolicy*/, + "-02" /*format*/, + -480 /*offsetCode (-7200/15)*/, + 0 /*offsetRemainder (-7200%15)*/, + 0 /*deltaMinutes*/, + 2023 /*untilYear*/, 10 /*untilMonth*/, 29 /*untilDay*/, 240 /*untilTimeCode (3600/15)*/, @@ -11485,7 +11498,7 @@ const complete::ZoneInfo kZoneAmerica_Nuuk ACE_TIME_PROGMEM = { kZoneNameAmerica_Nuuk /*name*/, 0x9805b5a9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*numEras*/, + 5 /*numEras*/, kZoneEraAmerica_Nuuk /*eras*/, nullptr /*targetInfo*/, }; @@ -13171,7 +13184,7 @@ const complete::ZoneInfo kZoneAmerica_Sao_Paulo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Scoresbysund -// Eras: 4 +// Eras: 5 //--------------------------------------------------------------------------- static const complete::ZoneEra kZoneEraAmerica_Scoresbysund[] ACE_TIME_PROGMEM = { @@ -13214,13 +13227,26 @@ static const complete::ZoneEra kZoneEraAmerica_Scoresbysund[] ACE_TIME_PROGMEM = 0 /*untilTimeCode (0/15)*/, 0 /*untilTimeModifier (kAtcSuffixW + seconds=0)*/, }, - // -1:00 EU -01/+00 + // -1:00 EU -01/+00 2024 Mar 31 { &kZonePolicyEU /*zonePolicy*/, "-01/+00" /*format*/, -240 /*offsetCode (-3600/15)*/, 0 /*offsetRemainder (-3600%15)*/, 0 /*deltaMinutes*/, + 2024 /*untilYear*/, + 3 /*untilMonth*/, + 31 /*untilDay*/, + 0 /*untilTimeCode (0/15)*/, + 0 /*untilTimeModifier (kAtcSuffixW + seconds=0)*/, + }, + // -2:00 EU -02/-01 + { + &kZonePolicyEU /*zonePolicy*/, + "-02/-01" /*format*/, + -480 /*offsetCode (-7200/15)*/, + 0 /*offsetRemainder (-7200%15)*/, + 0 /*deltaMinutes*/, 32767 /*untilYear*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -13236,7 +13262,7 @@ const complete::ZoneInfo kZoneAmerica_Scoresbysund ACE_TIME_PROGMEM = { kZoneNameAmerica_Scoresbysund /*name*/, 0x123f8d2a /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*numEras*/, + 5 /*numEras*/, kZoneEraAmerica_Scoresbysund /*eras*/, nullptr /*targetInfo*/, }; @@ -14360,7 +14386,7 @@ const complete::ZoneInfo kZoneAmerica_Yakutat ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Antarctica/Casey -// Eras: 13 +// Eras: 18 //--------------------------------------------------------------------------- static const complete::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { @@ -14520,13 +14546,78 @@ static const complete::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { 4 /*untilTimeCode (60/15)*/, 0 /*untilTimeModifier (kAtcSuffixW + seconds=0)*/, }, - // 11:00 - +11 + // 11:00 - +11 2021 Mar 14 0:00 + { + nullptr /*zonePolicy*/, + "+11" /*format*/, + 2640 /*offsetCode (39600/15)*/, + 0 /*offsetRemainder (39600%15)*/, + 0 /*deltaMinutes*/, + 2021 /*untilYear*/, + 3 /*untilMonth*/, + 14 /*untilDay*/, + 0 /*untilTimeCode (0/15)*/, + 0 /*untilTimeModifier (kAtcSuffixW + seconds=0)*/, + }, + // 8:00 - +08 2021 Oct 3 0:01 + { + nullptr /*zonePolicy*/, + "+08" /*format*/, + 1920 /*offsetCode (28800/15)*/, + 0 /*offsetRemainder (28800%15)*/, + 0 /*deltaMinutes*/, + 2021 /*untilYear*/, + 10 /*untilMonth*/, + 3 /*untilDay*/, + 4 /*untilTimeCode (60/15)*/, + 0 /*untilTimeModifier (kAtcSuffixW + seconds=0)*/, + }, + // 11:00 - +11 2022 Mar 13 0:00 + { + nullptr /*zonePolicy*/, + "+11" /*format*/, + 2640 /*offsetCode (39600/15)*/, + 0 /*offsetRemainder (39600%15)*/, + 0 /*deltaMinutes*/, + 2022 /*untilYear*/, + 3 /*untilMonth*/, + 13 /*untilDay*/, + 0 /*untilTimeCode (0/15)*/, + 0 /*untilTimeModifier (kAtcSuffixW + seconds=0)*/, + }, + // 8:00 - +08 2022 Oct 2 0:01 + { + nullptr /*zonePolicy*/, + "+08" /*format*/, + 1920 /*offsetCode (28800/15)*/, + 0 /*offsetRemainder (28800%15)*/, + 0 /*deltaMinutes*/, + 2022 /*untilYear*/, + 10 /*untilMonth*/, + 2 /*untilDay*/, + 4 /*untilTimeCode (60/15)*/, + 0 /*untilTimeModifier (kAtcSuffixW + seconds=0)*/, + }, + // 11:00 - +11 2023 Mar 9 3:00 { nullptr /*zonePolicy*/, "+11" /*format*/, 2640 /*offsetCode (39600/15)*/, 0 /*offsetRemainder (39600%15)*/, 0 /*deltaMinutes*/, + 2023 /*untilYear*/, + 3 /*untilMonth*/, + 9 /*untilDay*/, + 720 /*untilTimeCode (10800/15)*/, + 0 /*untilTimeModifier (kAtcSuffixW + seconds=0)*/, + }, + // 8:00 - +08 + { + nullptr /*zonePolicy*/, + "+08" /*format*/, + 1920 /*offsetCode (28800/15)*/, + 0 /*offsetRemainder (28800%15)*/, + 0 /*deltaMinutes*/, 32767 /*untilYear*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -14542,7 +14633,7 @@ const complete::ZoneInfo kZoneAntarctica_Casey ACE_TIME_PROGMEM = { kZoneNameAntarctica_Casey /*name*/, 0xe2022583 /*zoneId*/, &kZoneContext /*zoneContext*/, - 13 /*numEras*/, + 18 /*numEras*/, kZoneEraAntarctica_Casey /*eras*/, nullptr /*targetInfo*/, }; @@ -15044,6 +15135,91 @@ const complete::ZoneInfo kZoneAntarctica_Troll ACE_TIME_PROGMEM = { nullptr /*targetInfo*/, }; +//--------------------------------------------------------------------------- +// Zone name: Antarctica/Vostok +// Eras: 5 +//--------------------------------------------------------------------------- + +static const complete::ZoneEra kZoneEraAntarctica_Vostok[] ACE_TIME_PROGMEM = { + // 0 - -00 1957 Dec 16 + { + nullptr /*zonePolicy*/, + "-00" /*format*/, + 0 /*offsetCode (0/15)*/, + 0 /*offsetRemainder (0%15)*/, + 0 /*deltaMinutes*/, + 1957 /*untilYear*/, + 12 /*untilMonth*/, + 16 /*untilDay*/, + 0 /*untilTimeCode (0/15)*/, + 0 /*untilTimeModifier (kAtcSuffixW + seconds=0)*/, + }, + // 7:00 - +07 1994 Feb + { + nullptr /*zonePolicy*/, + "+07" /*format*/, + 1680 /*offsetCode (25200/15)*/, + 0 /*offsetRemainder (25200%15)*/, + 0 /*deltaMinutes*/, + 1994 /*untilYear*/, + 2 /*untilMonth*/, + 1 /*untilDay*/, + 0 /*untilTimeCode (0/15)*/, + 0 /*untilTimeModifier (kAtcSuffixW + seconds=0)*/, + }, + // 0 - -00 1994 Nov + { + nullptr /*zonePolicy*/, + "-00" /*format*/, + 0 /*offsetCode (0/15)*/, + 0 /*offsetRemainder (0%15)*/, + 0 /*deltaMinutes*/, + 1994 /*untilYear*/, + 11 /*untilMonth*/, + 1 /*untilDay*/, + 0 /*untilTimeCode (0/15)*/, + 0 /*untilTimeModifier (kAtcSuffixW + seconds=0)*/, + }, + // 7:00 - +07 2023 Dec 18 2:00 + { + nullptr /*zonePolicy*/, + "+07" /*format*/, + 1680 /*offsetCode (25200/15)*/, + 0 /*offsetRemainder (25200%15)*/, + 0 /*deltaMinutes*/, + 2023 /*untilYear*/, + 12 /*untilMonth*/, + 18 /*untilDay*/, + 480 /*untilTimeCode (7200/15)*/, + 0 /*untilTimeModifier (kAtcSuffixW + seconds=0)*/, + }, + // 5:00 - +05 + { + nullptr /*zonePolicy*/, + "+05" /*format*/, + 1200 /*offsetCode (18000/15)*/, + 0 /*offsetRemainder (18000%15)*/, + 0 /*deltaMinutes*/, + 32767 /*untilYear*/, + 1 /*untilMonth*/, + 1 /*untilDay*/, + 0 /*untilTimeCode (0/15)*/, + 0 /*untilTimeModifier (kAtcSuffixW + seconds=0)*/, + }, + +}; + +static const char kZoneNameAntarctica_Vostok[] ACE_TIME_PROGMEM = "\x03" "Vostok"; + +const complete::ZoneInfo kZoneAntarctica_Vostok ACE_TIME_PROGMEM = { + kZoneNameAntarctica_Vostok /*name*/, + 0x4f966fd4 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 5 /*numEras*/, + kZoneEraAntarctica_Vostok /*eras*/, + nullptr /*targetInfo*/, +}; + //--------------------------------------------------------------------------- // Zone name: Asia/Almaty // Eras: 6 @@ -32543,7 +32719,7 @@ const complete::ZoneInfo kZoneWET ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- -// Links: 246 +// Links: 245 //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- @@ -33336,7 +33512,7 @@ const complete::ZoneInfo kZoneAmerica_Godthab ACE_TIME_PROGMEM = { kZoneNameAmerica_Godthab /*name*/, 0x8f7eba1f /*zoneId*/, &kZoneContext /*zoneContext*/, - 4 /*numEras*/, + 5 /*numEras*/, kZoneEraAmerica_Nuuk /*eras*/, &kZoneAmerica_Nuuk /*targetInfo*/, }; @@ -33851,21 +34027,6 @@ const complete::ZoneInfo kZoneAntarctica_Syowa ACE_TIME_PROGMEM = { &kZoneAsia_Riyadh /*targetInfo*/, }; -//--------------------------------------------------------------------------- -// Link name: Antarctica/Vostok -> Asia/Urumqi -//--------------------------------------------------------------------------- - -static const char kZoneNameAntarctica_Vostok[] ACE_TIME_PROGMEM = "\x03" "Vostok"; - -const complete::ZoneInfo kZoneAntarctica_Vostok ACE_TIME_PROGMEM = { - kZoneNameAntarctica_Vostok /*name*/, - 0x4f966fd4 /*zoneId*/, - &kZoneContext /*zoneContext*/, - 2 /*numEras*/, - kZoneEraAsia_Urumqi /*eras*/, - &kZoneAsia_Urumqi /*targetInfo*/, -}; - //--------------------------------------------------------------------------- // Link name: Arctic/Longyearbyen -> Europe/Berlin //--------------------------------------------------------------------------- diff --git a/src/zonedbc/zone_infos.h b/src/zonedbc/zone_infos.h index 9901bf413..42fe35b8a 100644 --- a/src/zonedbc/zone_infos.h +++ b/src/zonedbc/zone_infos.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbc/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbc -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope complete @@ -23,9 +23,9 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 596 (350 zones, 246 links) +// Supported Zones: 596 (351 zones, 245 links) // Unsupported Zones: 0 (0 zones, 0 links) // // Requested Years: [1800,2200] @@ -40,7 +40,7 @@ // // Records: // Infos: 596 -// Eras: 1949 +// Eras: 1961 // Policies: 134 // Rules: 2238 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 26856 // Policies: 402 -// Eras: 29235 -// Zones: 4550 -// Links: 3198 +// Eras: 29415 +// Zones: 4563 +// Links: 3185 // Registry: 1192 // Formats: 1032 // Letters: 160 // Fragments: 150 // Names: 5649 (original: 9076) -// TOTAL: 72440 +// TOTAL: 72620 // // Memory (32-bits): // Context: 24 // Rules: 26856 // Policies: 1072 -// Eras: 38980 -// Zones: 8400 -// Links: 5904 +// Eras: 39220 +// Zones: 8424 +// Links: 5880 // Registry: 2384 // Formats: 1032 // Letters: 216 // Fragments: 178 // Names: 5649 (original: 9076) -// TOTAL: 90695 +// TOTAL: 90935 // // DO NOT EDIT @@ -95,7 +95,7 @@ extern const __FlashStringHelper* const kTzDatabaseVersion; extern const complete::ZoneContext kZoneContext; //--------------------------------------------------------------------------- -// Supported zones: 350 +// Supported zones: 351 //--------------------------------------------------------------------------- extern const complete::ZoneInfo kZoneAfrica_Abidjan; // Africa/Abidjan @@ -244,6 +244,7 @@ extern const complete::ZoneInfo kZoneAntarctica_Mawson; // Antarctica/Mawson extern const complete::ZoneInfo kZoneAntarctica_Palmer; // Antarctica/Palmer extern const complete::ZoneInfo kZoneAntarctica_Rothera; // Antarctica/Rothera extern const complete::ZoneInfo kZoneAntarctica_Troll; // Antarctica/Troll +extern const complete::ZoneInfo kZoneAntarctica_Vostok; // Antarctica/Vostok extern const complete::ZoneInfo kZoneAsia_Almaty; // Asia/Almaty extern const complete::ZoneInfo kZoneAsia_Amman; // Asia/Amman extern const complete::ZoneInfo kZoneAsia_Anadyr; // Asia/Anadyr @@ -598,6 +599,7 @@ const uint32_t kZoneIdAntarctica_Mawson = 0x399cd863; // Antarctica/Mawson const uint32_t kZoneIdAntarctica_Palmer = 0x40962f4f; // Antarctica/Palmer const uint32_t kZoneIdAntarctica_Rothera = 0x0e86d203; // Antarctica/Rothera const uint32_t kZoneIdAntarctica_Troll = 0xe33f085b; // Antarctica/Troll +const uint32_t kZoneIdAntarctica_Vostok = 0x4f966fd4; // Antarctica/Vostok const uint32_t kZoneIdAsia_Almaty = 0xa61f41fa; // Asia/Almaty const uint32_t kZoneIdAsia_Amman = 0x148d21bc; // Asia/Amman const uint32_t kZoneIdAsia_Anadyr = 0xa63cebd1; // Asia/Anadyr @@ -805,7 +807,7 @@ const uint32_t kZoneIdWET = 0x0b882e35; // WET //--------------------------------------------------------------------------- -// Supported links: 246 +// Supported links: 245 //--------------------------------------------------------------------------- extern const complete::ZoneInfo kZoneAfrica_Accra; // Africa/Accra -> Africa/Abidjan @@ -895,7 +897,6 @@ extern const complete::ZoneInfo kZoneAntarctica_DumontDUrville; // Antarctica/Du extern const complete::ZoneInfo kZoneAntarctica_McMurdo; // Antarctica/McMurdo -> Pacific/Auckland extern const complete::ZoneInfo kZoneAntarctica_South_Pole; // Antarctica/South_Pole -> Pacific/Auckland extern const complete::ZoneInfo kZoneAntarctica_Syowa; // Antarctica/Syowa -> Asia/Riyadh -extern const complete::ZoneInfo kZoneAntarctica_Vostok; // Antarctica/Vostok -> Asia/Urumqi extern const complete::ZoneInfo kZoneArctic_Longyearbyen; // Arctic/Longyearbyen -> Europe/Berlin extern const complete::ZoneInfo kZoneAsia_Aden; // Asia/Aden -> Asia/Riyadh extern const complete::ZoneInfo kZoneAsia_Ashkhabad; // Asia/Ashkhabad -> Asia/Ashgabat @@ -1145,7 +1146,6 @@ const uint32_t kZoneIdAntarctica_DumontDUrville = 0x5a3c656c; // Antarctica/Dumo const uint32_t kZoneIdAntarctica_McMurdo = 0x6eeb5585; // Antarctica/McMurdo const uint32_t kZoneIdAntarctica_South_Pole = 0xcd96b290; // Antarctica/South_Pole const uint32_t kZoneIdAntarctica_Syowa = 0xe330c7e1; // Antarctica/Syowa -const uint32_t kZoneIdAntarctica_Vostok = 0x4f966fd4; // Antarctica/Vostok const uint32_t kZoneIdArctic_Longyearbyen = 0xd23e7859; // Arctic/Longyearbyen const uint32_t kZoneIdAsia_Aden = 0x1fa7084a; // Asia/Aden const uint32_t kZoneIdAsia_Ashkhabad = 0x15454f09; // Asia/Ashkhabad @@ -1441,7 +1441,7 @@ const uint8_t kZoneBufSizeAmerica_Santarem = 6; // America/Santarem in 1964 const uint8_t kZoneBufSizeAmerica_Santiago = 6; // America/Santiago in 1969 const uint8_t kZoneBufSizeAmerica_Santo_Domingo = 4; // America/Santo_Domingo in 1970 const uint8_t kZoneBufSizeAmerica_Sao_Paulo = 6; // America/Sao_Paulo in 1964 -const uint8_t kZoneBufSizeAmerica_Scoresbysund = 5; // America/Scoresbysund in 1980 +const uint8_t kZoneBufSizeAmerica_Scoresbysund = 6; // America/Scoresbysund in 2024 const uint8_t kZoneBufSizeAmerica_Sitka = 6; // America/Sitka in 1983 const uint8_t kZoneBufSizeAmerica_St_Johns = 6; // America/St_Johns in 1918 const uint8_t kZoneBufSizeAmerica_Swift_Current = 5; // America/Swift_Current in 1946 @@ -1460,6 +1460,7 @@ const uint8_t kZoneBufSizeAntarctica_Mawson = 2; // Antarctica/Mawson in 1954 const uint8_t kZoneBufSizeAntarctica_Palmer = 6; // Antarctica/Palmer in 1965 const uint8_t kZoneBufSizeAntarctica_Rothera = 2; // Antarctica/Rothera in 1976 const uint8_t kZoneBufSizeAntarctica_Troll = 6; // Antarctica/Troll in 2005 +const uint8_t kZoneBufSizeAntarctica_Vostok = 3; // Antarctica/Vostok in 1994 const uint8_t kZoneBufSizeAsia_Almaty = 6; // Asia/Almaty in 1991 const uint8_t kZoneBufSizeAsia_Amman = 6; // Asia/Amman in 2014 const uint8_t kZoneBufSizeAsia_Anadyr = 6; // Asia/Anadyr in 1991 diff --git a/src/zonedbc/zone_policies.cpp b/src/zonedbc/zone_policies.cpp index 3f3e82ef3..5ef0c2a56 100644 --- a/src/zonedbc/zone_policies.cpp +++ b/src/zonedbc/zone_policies.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbc/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbc -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope complete @@ -23,9 +23,9 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 596 (350 zones, 246 links) +// Supported Zones: 596 (351 zones, 245 links) // Unsupported Zones: 0 (0 zones, 0 links) // // Requested Years: [1800,2200] @@ -40,7 +40,7 @@ // // Records: // Infos: 596 -// Eras: 1949 +// Eras: 1961 // Policies: 134 // Rules: 2238 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 26856 // Policies: 402 -// Eras: 29235 -// Zones: 4550 -// Links: 3198 +// Eras: 29415 +// Zones: 4563 +// Links: 3185 // Registry: 1192 // Formats: 1032 // Letters: 160 // Fragments: 150 // Names: 5649 (original: 9076) -// TOTAL: 72440 +// TOTAL: 72620 // // Memory (32-bits): // Context: 24 // Rules: 26856 // Policies: 1072 -// Eras: 38980 -// Zones: 8400 -// Links: 5904 +// Eras: 39220 +// Zones: 8424 +// Links: 5880 // Registry: 2384 // Formats: 1032 // Letters: 216 // Fragments: 178 // Names: 5649 (original: 9076) -// TOTAL: 90695 +// TOTAL: 90935 // // DO NOT EDIT @@ -19603,6 +19603,18 @@ static const complete::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 60 /*deltaMinutes*/, 25 /*letterIndex ("S")*/, }, + // Rule Palestine 2072 max - Oct Sat<=30 2:00 0 - + { + 2072 /*fromYear*/, + 32766 /*toYear*/, + 10 /*inMonth*/, + 6 /*onDayOfWeek*/, + -30 /*onDayOfMonth*/, + 0 /*atTimeModifier (kAtcSuffixW + seconds=0)*/, + 480 /*atTimeCode (7200/15)*/, + 0 /*deltaMinutes*/, + 0 /*letterIndex ("")*/, + }, // Rule Palestine 2073 only - Sep 2 2:00 0 - { 2073 /*fromYear*/, @@ -19675,18 +19687,6 @@ static const complete::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 60 /*deltaMinutes*/, 25 /*letterIndex ("S")*/, }, - // Rule Palestine 2075 max - Oct Sat<=30 2:00 0 - - { - 2075 /*fromYear*/, - 32766 /*toYear*/, - 10 /*inMonth*/, - 6 /*onDayOfWeek*/, - -30 /*onDayOfMonth*/, - 0 /*atTimeModifier (kAtcSuffixW + seconds=0)*/, - 480 /*atTimeCode (7200/15)*/, - 0 /*deltaMinutes*/, - 0 /*letterIndex ("")*/, - }, // Rule Palestine 2076 only - Jul 25 2:00 0 - { 2076 /*fromYear*/, diff --git a/src/zonedbc/zone_policies.h b/src/zonedbc/zone_policies.h index afed53b44..43a3aca65 100644 --- a/src/zonedbc/zone_policies.h +++ b/src/zonedbc/zone_policies.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbc/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbc -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope complete @@ -23,9 +23,9 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 596 (350 zones, 246 links) +// Supported Zones: 596 (351 zones, 245 links) // Unsupported Zones: 0 (0 zones, 0 links) // // Requested Years: [1800,2200] @@ -40,7 +40,7 @@ // // Records: // Infos: 596 -// Eras: 1949 +// Eras: 1961 // Policies: 134 // Rules: 2238 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 26856 // Policies: 402 -// Eras: 29235 -// Zones: 4550 -// Links: 3198 +// Eras: 29415 +// Zones: 4563 +// Links: 3185 // Registry: 1192 // Formats: 1032 // Letters: 160 // Fragments: 150 // Names: 5649 (original: 9076) -// TOTAL: 72440 +// TOTAL: 72620 // // Memory (32-bits): // Context: 24 // Rules: 26856 // Policies: 1072 -// Eras: 38980 -// Zones: 8400 -// Links: 5904 +// Eras: 39220 +// Zones: 8424 +// Links: 5880 // Registry: 2384 // Formats: 1032 // Letters: 216 // Fragments: 178 // Names: 5649 (original: 9076) -// TOTAL: 90695 +// TOTAL: 90935 // // DO NOT EDIT diff --git a/src/zonedbc/zone_registry.cpp b/src/zonedbc/zone_registry.cpp index 2a9990101..ffb00a578 100644 --- a/src/zonedbc/zone_registry.cpp +++ b/src/zonedbc/zone_registry.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbc/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbc -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope complete @@ -23,9 +23,9 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 596 (350 zones, 246 links) +// Supported Zones: 596 (351 zones, 245 links) // Unsupported Zones: 0 (0 zones, 0 links) // // Requested Years: [1800,2200] @@ -40,7 +40,7 @@ // // Records: // Infos: 596 -// Eras: 1949 +// Eras: 1961 // Policies: 134 // Rules: 2238 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 26856 // Policies: 402 -// Eras: 29235 -// Zones: 4550 -// Links: 3198 +// Eras: 29415 +// Zones: 4563 +// Links: 3185 // Registry: 1192 // Formats: 1032 // Letters: 160 // Fragments: 150 // Names: 5649 (original: 9076) -// TOTAL: 72440 +// TOTAL: 72620 // // Memory (32-bits): // Context: 24 // Rules: 26856 // Policies: 1072 -// Eras: 38980 -// Zones: 8400 -// Links: 5904 +// Eras: 39220 +// Zones: 8424 +// Links: 5880 // Registry: 2384 // Formats: 1032 // Letters: 216 // Fragments: 178 // Names: 5649 (original: 9076) -// TOTAL: 90695 +// TOTAL: 90935 // // DO NOT EDIT @@ -84,7 +84,7 @@ namespace zonedbc { //--------------------------------------------------------------------------- // Zone Info registry. Sorted by zoneId. //--------------------------------------------------------------------------- -const complete::ZoneInfo* const kZoneRegistry[350] ACE_TIME_PROGMEM = { +const complete::ZoneInfo* const kZoneRegistry[351] ACE_TIME_PROGMEM = { &kZoneAmerica_St_Johns, // 0x04b14e6e, America/St_Johns &kZoneAmerica_North_Dakota_New_Salem, // 0x04f9958e, America/North_Dakota/New_Salem &kZoneAsia_Jakarta, // 0x0506ab50, Asia/Jakarta @@ -187,6 +187,7 @@ const complete::ZoneInfo* const kZoneRegistry[350] ACE_TIME_PROGMEM = { &kZoneAsia_Nicosia, // 0x4b0fcf78, Asia/Nicosia &kZoneAmerica_Chicago, // 0x4b92b5d4, America/Chicago &kZoneAustralia_Sydney, // 0x4d1e9776, Australia/Sydney + &kZoneAntarctica_Vostok, // 0x4f966fd4, Antarctica/Vostok &kZoneAustralia_Brisbane, // 0x4fedc9c0, Australia/Brisbane &kZoneAmerica_Asuncion, // 0x50ec79a6, America/Asuncion &kZoneAsia_Karachi, // 0x527f5245, Asia/Karachi @@ -613,7 +614,7 @@ const complete::ZoneInfo* const kZoneAndLinkRegistry[596] ACE_TIME_PROGMEM = { &kZoneAustralia_Sydney, // 0x4d1e9776, Australia/Sydney &kZoneNZ_CHAT, // 0x4d42afda, NZ-CHAT -> Pacific/Chatham &kZoneUS_Arizona, // 0x4ec52670, US/Arizona -> America/Phoenix - &kZoneAntarctica_Vostok, // 0x4f966fd4, Antarctica/Vostok -> Asia/Urumqi + &kZoneAntarctica_Vostok, // 0x4f966fd4, Antarctica/Vostok &kZoneUS_Aleutian, // 0x4fe013ef, US/Aleutian -> America/Adak &kZoneAustralia_Brisbane, // 0x4fedc9c0, Australia/Brisbane &kZoneAmerica_Catamarca, // 0x5036e963, America/Catamarca -> America/Argentina/Catamarca diff --git a/src/zonedbc/zone_registry.h b/src/zonedbc/zone_registry.h index 6549620ff..b7a1aa20f 100644 --- a/src/zonedbc/zone_registry.h +++ b/src/zonedbc/zone_registry.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbc/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbc -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope complete @@ -23,9 +23,9 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 596 (350 zones, 246 links) +// Supported Zones: 596 (351 zones, 245 links) // Unsupported Zones: 0 (0 zones, 0 links) // // Requested Years: [1800,2200] @@ -40,7 +40,7 @@ // // Records: // Infos: 596 -// Eras: 1949 +// Eras: 1961 // Policies: 134 // Rules: 2238 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 26856 // Policies: 402 -// Eras: 29235 -// Zones: 4550 -// Links: 3198 +// Eras: 29415 +// Zones: 4563 +// Links: 3185 // Registry: 1192 // Formats: 1032 // Letters: 160 // Fragments: 150 // Names: 5649 (original: 9076) -// TOTAL: 72440 +// TOTAL: 72620 // // Memory (32-bits): // Context: 24 // Rules: 26856 // Policies: 1072 -// Eras: 38980 -// Zones: 8400 -// Links: 5904 +// Eras: 39220 +// Zones: 8424 +// Links: 5880 // Registry: 2384 // Formats: 1032 // Letters: 216 // Fragments: 178 // Names: 5649 (original: 9076) -// TOTAL: 90695 +// TOTAL: 90935 // // DO NOT EDIT @@ -83,8 +83,8 @@ namespace ace_time { namespace zonedbc { // Zones -const uint16_t kZoneRegistrySize = 350; -extern const complete::ZoneInfo* const kZoneRegistry[350]; +const uint16_t kZoneRegistrySize = 351; +extern const complete::ZoneInfo* const kZoneRegistry[351]; // Zones and Links const uint16_t kZoneAndLinkRegistrySize = 596; diff --git a/src/zonedbctesting/Makefile b/src/zonedbctesting/Makefile index bcbb20b93..e1411869f 100644 --- a/src/zonedbctesting/Makefile +++ b/src/zonedbctesting/Makefile @@ -2,7 +2,7 @@ TARGETS := zone_infos.cpp zone_infos.h zone_policies.cpp zone_policies.h TOOLS := $(abspath ../../../AceTimeTools) TZ_REPO := $(abspath $(TOOLS)/../tz) -TZ_VERSION := 2023c +TZ_VERSION := 2023d START_YEAR := 1980 UNTIL_YEAR := 2200 diff --git a/src/zonedbctesting/zone_infos.cpp b/src/zonedbctesting/zone_infos.cpp index 51e2cdbb0..11447c56e 100644 --- a/src/zonedbctesting/zone_infos.cpp +++ b/src/zonedbctesting/zone_infos.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbctesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbctesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope complete @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 16 (15 zones, 1 links) -// Unsupported Zones: 580 (335 zones, 245 links) +// Unsupported Zones: 580 (336 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767] @@ -87,7 +87,7 @@ namespace zonedbctesting { // ZoneContext //--------------------------------------------------------------------------- -static const char kVersionString[] ACE_TIME_PROGMEM = "2023c"; +static const char kVersionString[] ACE_TIME_PROGMEM = "2023d"; const __FlashStringHelper* const kTzDatabaseVersion = (const __FlashStringHelper*) kVersionString; diff --git a/src/zonedbctesting/zone_infos.h b/src/zonedbctesting/zone_infos.h index 2668849d8..92a7e2e6b 100644 --- a/src/zonedbctesting/zone_infos.h +++ b/src/zonedbctesting/zone_infos.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbctesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbctesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope complete @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 16 (15 zones, 1 links) -// Unsupported Zones: 580 (335 zones, 245 links) +// Unsupported Zones: 580 (336 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767] @@ -174,7 +174,7 @@ const uint8_t kZoneBufSizePacific_Apia = 5; // Pacific/Apia in 2011 //--------------------------------------------------------------------------- -// Unsupported zones: 335 +// Unsupported zones: 336 //--------------------------------------------------------------------------- // Africa/Abidjan {Zone missing from include list} @@ -311,6 +311,7 @@ const uint8_t kZoneBufSizePacific_Apia = 5; // Pacific/Apia in 2011 // Antarctica/Palmer {Zone missing from include list} // Antarctica/Rothera {Zone missing from include list} // Antarctica/Troll {Zone missing from include list} +// Antarctica/Vostok {Zone missing from include list} // Asia/Almaty {Zone missing from include list} // Asia/Amman {Zone missing from include list} // Asia/Anadyr {Zone missing from include list} @@ -531,7 +532,7 @@ const uint8_t kZoneBufSizePacific_Apia = 5; // Pacific/Apia in 2011 //--------------------------------------------------------------------------- -// Unsupported links: 245 +// Unsupported links: 244 //--------------------------------------------------------------------------- // Africa/Accra {Link missing from include list} @@ -621,7 +622,6 @@ const uint8_t kZoneBufSizePacific_Apia = 5; // Pacific/Apia in 2011 // Antarctica/McMurdo {Link missing from include list} // Antarctica/South_Pole {Link missing from include list} // Antarctica/Syowa {Link missing from include list} -// Antarctica/Vostok {Link missing from include list} // Arctic/Longyearbyen {Link missing from include list} // Asia/Aden {Link missing from include list} // Asia/Ashkhabad {Link missing from include list} diff --git a/src/zonedbctesting/zone_policies.cpp b/src/zonedbctesting/zone_policies.cpp index 06fd561cc..adf9dc40f 100644 --- a/src/zonedbctesting/zone_policies.cpp +++ b/src/zonedbctesting/zone_policies.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbctesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbctesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope complete @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 16 (15 zones, 1 links) -// Unsupported Zones: 580 (335 zones, 245 links) +// Unsupported Zones: 580 (336 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767] diff --git a/src/zonedbctesting/zone_policies.h b/src/zonedbctesting/zone_policies.h index 7e03344c1..10db2e154 100644 --- a/src/zonedbctesting/zone_policies.h +++ b/src/zonedbctesting/zone_policies.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbctesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbctesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope complete @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 16 (15 zones, 1 links) -// Unsupported Zones: 580 (335 zones, 245 links) +// Unsupported Zones: 580 (336 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767] diff --git a/src/zonedbctesting/zone_registry.cpp b/src/zonedbctesting/zone_registry.cpp index b26d9062b..94c0b1fa0 100644 --- a/src/zonedbctesting/zone_registry.cpp +++ b/src/zonedbctesting/zone_registry.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbctesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbctesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope complete @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 16 (15 zones, 1 links) -// Unsupported Zones: 580 (335 zones, 245 links) +// Unsupported Zones: 580 (336 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767] diff --git a/src/zonedbctesting/zone_registry.h b/src/zonedbctesting/zone_registry.h index 8d7648168..bc73a0a6f 100644 --- a/src/zonedbctesting/zone_registry.h +++ b/src/zonedbctesting/zone_registry.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbctesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbctesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope complete @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 16 (15 zones, 1 links) -// Unsupported Zones: 580 (335 zones, 245 links) +// Unsupported Zones: 580 (336 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767] diff --git a/src/zonedbtesting/Makefile b/src/zonedbtesting/Makefile index ea631607b..d035f85c6 100644 --- a/src/zonedbtesting/Makefile +++ b/src/zonedbtesting/Makefile @@ -2,7 +2,7 @@ TARGETS := zone_infos.cpp zone_infos.h zone_policies.cpp zone_policies.h TOOLS := $(abspath ../../../AceTimeTools) TZ_REPO := $(abspath $(TOOLS)/../tz) -TZ_VERSION := 2023c +TZ_VERSION := 2023d START_YEAR := 1980 UNTIL_YEAR := 2200 diff --git a/src/zonedbtesting/zone_infos.cpp b/src/zonedbtesting/zone_infos.cpp index 9c0377f7a..817e39acf 100644 --- a/src/zonedbtesting/zone_infos.cpp +++ b/src/zonedbtesting/zone_infos.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbtesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbtesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope basic @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 12 (11 zones, 1 links) -// Unsupported Zones: 584 (339 zones, 245 links) +// Unsupported Zones: 584 (340 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767] @@ -87,7 +87,7 @@ namespace zonedbtesting { // ZoneContext //--------------------------------------------------------------------------- -static const char kVersionString[] ACE_TIME_PROGMEM = "2023c"; +static const char kVersionString[] ACE_TIME_PROGMEM = "2023d"; const __FlashStringHelper* const kTzDatabaseVersion = (const __FlashStringHelper*) kVersionString; diff --git a/src/zonedbtesting/zone_infos.h b/src/zonedbtesting/zone_infos.h index 860ca49df..ef3921ce1 100644 --- a/src/zonedbtesting/zone_infos.h +++ b/src/zonedbtesting/zone_infos.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbtesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbtesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope basic @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 12 (11 zones, 1 links) -// Unsupported Zones: 584 (339 zones, 245 links) +// Unsupported Zones: 584 (340 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767] @@ -162,7 +162,7 @@ const uint8_t kZoneBufSizePacific_Galapagos = 3; // Pacific/Galapagos in 1985 //--------------------------------------------------------------------------- -// Unsupported zones: 339 +// Unsupported zones: 340 //--------------------------------------------------------------------------- // Africa/Abidjan {Zone missing from include list} @@ -302,6 +302,7 @@ const uint8_t kZoneBufSizePacific_Galapagos = 3; // Pacific/Galapagos in 1985 // Antarctica/Palmer {Zone missing from include list} // Antarctica/Rothera {Zone missing from include list} // Antarctica/Troll {Zone missing from include list} +// Antarctica/Vostok {Zone missing from include list} // Asia/Almaty {Zone missing from include list} // Asia/Amman {Zone missing from include list} // Asia/Anadyr {Zone missing from include list} @@ -514,7 +515,7 @@ const uint8_t kZoneBufSizePacific_Galapagos = 3; // Pacific/Galapagos in 1985 //--------------------------------------------------------------------------- -// Unsupported links: 245 +// Unsupported links: 244 //--------------------------------------------------------------------------- // Africa/Accra {Link missing from include list} @@ -604,7 +605,6 @@ const uint8_t kZoneBufSizePacific_Galapagos = 3; // Pacific/Galapagos in 1985 // Antarctica/McMurdo {Link missing from include list} // Antarctica/South_Pole {Link missing from include list} // Antarctica/Syowa {Link missing from include list} -// Antarctica/Vostok {Link missing from include list} // Arctic/Longyearbyen {Link missing from include list} // Asia/Aden {Link missing from include list} // Asia/Ashkhabad {Link missing from include list} diff --git a/src/zonedbtesting/zone_policies.cpp b/src/zonedbtesting/zone_policies.cpp index 819d34c9d..463aba40c 100644 --- a/src/zonedbtesting/zone_policies.cpp +++ b/src/zonedbtesting/zone_policies.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbtesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbtesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope basic @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 12 (11 zones, 1 links) -// Unsupported Zones: 584 (339 zones, 245 links) +// Unsupported Zones: 584 (340 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767] diff --git a/src/zonedbtesting/zone_policies.h b/src/zonedbtesting/zone_policies.h index b931af43d..010682b18 100644 --- a/src/zonedbtesting/zone_policies.h +++ b/src/zonedbtesting/zone_policies.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbtesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbtesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope basic @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 12 (11 zones, 1 links) -// Unsupported Zones: 584 (339 zones, 245 links) +// Unsupported Zones: 584 (340 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767] diff --git a/src/zonedbtesting/zone_registry.cpp b/src/zonedbtesting/zone_registry.cpp index 069535179..937d3bf9f 100644 --- a/src/zonedbtesting/zone_registry.cpp +++ b/src/zonedbtesting/zone_registry.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbtesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbtesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope basic @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 12 (11 zones, 1 links) -// Unsupported Zones: 584 (339 zones, 245 links) +// Unsupported Zones: 584 (340 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767] diff --git a/src/zonedbtesting/zone_registry.h b/src/zonedbtesting/zone_registry.h index eb5f5f4f4..70ce30beb 100644 --- a/src/zonedbtesting/zone_registry.h +++ b/src/zonedbtesting/zone_registry.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbtesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbtesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope basic @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 12 (11 zones, 1 links) -// Unsupported Zones: 584 (339 zones, 245 links) +// Unsupported Zones: 584 (340 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767] diff --git a/src/zonedbx/Makefile b/src/zonedbx/Makefile index 86250c54e..480f9de42 100644 --- a/src/zonedbx/Makefile +++ b/src/zonedbx/Makefile @@ -2,7 +2,7 @@ TARGETS := zone_infos.cpp zone_infos.h zone_policies.cpp zone_policies.h TOOLS := $(abspath ../../../AceTimeTools) TZ_REPO := $(abspath $(TOOLS)/../tz) -TZ_VERSION := 2023c +TZ_VERSION := 2023d START_YEAR := 2000 UNTIL_YEAR := 2200 diff --git a/src/zonedbx/zone_infos.cpp b/src/zonedbx/zone_infos.cpp index e8deb7654..fbaff8668 100644 --- a/src/zonedbx/zone_infos.cpp +++ b/src/zonedbx/zone_infos.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbx/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbx -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope extended @@ -23,9 +23,9 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 596 (350 zones, 246 links) +// Supported Zones: 596 (351 zones, 245 links) // Unsupported Zones: 0 (0 zones, 0 links) // // Requested Years: [2000,2200] @@ -40,7 +40,7 @@ // // Records: // Infos: 596 -// Eras: 646 +// Eras: 655 // Policies: 83 // Rules: 735 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 6615 // Policies: 249 -// Eras: 7106 -// Zones: 4550 -// Links: 3198 +// Eras: 7205 +// Zones: 4563 +// Links: 3185 // Registry: 1192 // Formats: 597 // Letters: 46 // Fragments: 150 // Names: 5649 (original: 9076) -// TOTAL: 29368 +// TOTAL: 29467 // // Memory (32-bits): // Context: 24 // Rules: 8820 // Policies: 664 -// Eras: 10336 -// Zones: 8400 -// Links: 5904 +// Eras: 10480 +// Zones: 8424 +// Links: 5880 // Registry: 2384 // Formats: 597 // Letters: 64 // Fragments: 178 // Names: 5649 (original: 9076) -// TOTAL: 43020 +// TOTAL: 43164 // // DO NOT EDIT @@ -85,7 +85,7 @@ namespace zonedbx { // ZoneContext //--------------------------------------------------------------------------- -static const char kVersionString[] ACE_TIME_PROGMEM = "2023c"; +static const char kVersionString[] ACE_TIME_PROGMEM = "2023d"; const __FlashStringHelper* const kTzDatabaseVersion = (const __FlashStringHelper*) kVersionString; @@ -161,8 +161,8 @@ const extended::ZoneContext kZoneContext ACE_TIME_PROGMEM = { }; //--------------------------------------------------------------------------- -// Zones: 350 -// Eras: 646 +// Zones: 351 +// Eras: 655 //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- @@ -5155,17 +5155,29 @@ const extended::ZoneInfo kZoneAmerica_North_Dakota_New_Salem ACE_TIME_PROGMEM = //--------------------------------------------------------------------------- // Zone name: America/Nuuk -// Eras: 2 +// Eras: 3 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Nuuk[] ACE_TIME_PROGMEM = { - // -3:00 EU -03/-02 2023 Oct 29 1:00u + // -3:00 EU -03/-02 2023 Mar 26 1:00u { &kZonePolicyEU /*zonePolicy*/, "-03/-02" /*format*/, -12 /*offsetCode*/, 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, -77 /*untilYearTiny*/, + 3 /*untilMonth*/, + 26 /*untilDay*/, + 4 /*untilTimeCode*/, + 32 /*untilTimeModifier (kSuffixU + minute=0)*/, + }, + // -2:00 - -02 2023 Oct 29 1:00u + { + nullptr /*zonePolicy*/, + "-02" /*format*/, + -8 /*offsetCode*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, + -77 /*untilYearTiny*/, 10 /*untilMonth*/, 29 /*untilDay*/, 4 /*untilTimeCode*/, @@ -5192,7 +5204,7 @@ const extended::ZoneInfo kZoneAmerica_Nuuk ACE_TIME_PROGMEM = { kZoneNameAmerica_Nuuk /*name*/, 0x9805b5a9 /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*numEras*/, + 3 /*numEras*/, kZoneEraAmerica_Nuuk /*eras*/, nullptr /*targetInfo*/, }; @@ -5971,16 +5983,28 @@ const extended::ZoneInfo kZoneAmerica_Sao_Paulo ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: America/Scoresbysund -// Eras: 1 +// Eras: 2 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAmerica_Scoresbysund[] ACE_TIME_PROGMEM = { - // -1:00 EU -01/+00 + // -1:00 EU -01/+00 2024 Mar 31 { &kZonePolicyEU /*zonePolicy*/, "-01/+00" /*format*/, -4 /*offsetCode*/, 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, + -76 /*untilYearTiny*/, + 3 /*untilMonth*/, + 31 /*untilDay*/, + 0 /*untilTimeCode*/, + 0 /*untilTimeModifier (kSuffixW + minute=0)*/, + }, + // -2:00 EU -02/-01 + { + &kZonePolicyEU /*zonePolicy*/, + "-02/-01" /*format*/, + -8 /*offsetCode*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -5996,7 +6020,7 @@ const extended::ZoneInfo kZoneAmerica_Scoresbysund ACE_TIME_PROGMEM = { kZoneNameAmerica_Scoresbysund /*name*/, 0x123f8d2a /*zoneId*/, &kZoneContext /*zoneContext*/, - 1 /*numEras*/, + 2 /*numEras*/, kZoneEraAmerica_Scoresbysund /*eras*/, nullptr /*targetInfo*/, }; @@ -6427,7 +6451,7 @@ const extended::ZoneInfo kZoneAmerica_Yakutat ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- // Zone name: Antarctica/Casey -// Eras: 12 +// Eras: 17 //--------------------------------------------------------------------------- static const extended::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { @@ -6563,12 +6587,72 @@ static const extended::ZoneEra kZoneEraAntarctica_Casey[] ACE_TIME_PROGMEM = { 0 /*untilTimeCode*/, 1 /*untilTimeModifier (kSuffixW + minute=1)*/, }, - // 11:00 - +11 + // 11:00 - +11 2021 Mar 14 0:00 + { + nullptr /*zonePolicy*/, + "+11" /*format*/, + 44 /*offsetCode*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, + -79 /*untilYearTiny*/, + 3 /*untilMonth*/, + 14 /*untilDay*/, + 0 /*untilTimeCode*/, + 0 /*untilTimeModifier (kSuffixW + minute=0)*/, + }, + // 8:00 - +08 2021 Oct 3 0:01 + { + nullptr /*zonePolicy*/, + "+08" /*format*/, + 32 /*offsetCode*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, + -79 /*untilYearTiny*/, + 10 /*untilMonth*/, + 3 /*untilDay*/, + 0 /*untilTimeCode*/, + 1 /*untilTimeModifier (kSuffixW + minute=1)*/, + }, + // 11:00 - +11 2022 Mar 13 0:00 { nullptr /*zonePolicy*/, "+11" /*format*/, 44 /*offsetCode*/, 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, + -78 /*untilYearTiny*/, + 3 /*untilMonth*/, + 13 /*untilDay*/, + 0 /*untilTimeCode*/, + 0 /*untilTimeModifier (kSuffixW + minute=0)*/, + }, + // 8:00 - +08 2022 Oct 2 0:01 + { + nullptr /*zonePolicy*/, + "+08" /*format*/, + 32 /*offsetCode*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, + -78 /*untilYearTiny*/, + 10 /*untilMonth*/, + 2 /*untilDay*/, + 0 /*untilTimeCode*/, + 1 /*untilTimeModifier (kSuffixW + minute=1)*/, + }, + // 11:00 - +11 2023 Mar 9 3:00 + { + nullptr /*zonePolicy*/, + "+11" /*format*/, + 44 /*offsetCode*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, + -77 /*untilYearTiny*/, + 3 /*untilMonth*/, + 9 /*untilDay*/, + 12 /*untilTimeCode*/, + 0 /*untilTimeModifier (kSuffixW + minute=0)*/, + }, + // 8:00 - +08 + { + nullptr /*zonePolicy*/, + "+08" /*format*/, + 32 /*offsetCode*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, 127 /*untilYearTiny*/, 1 /*untilMonth*/, 1 /*untilDay*/, @@ -6584,7 +6668,7 @@ const extended::ZoneInfo kZoneAntarctica_Casey ACE_TIME_PROGMEM = { kZoneNameAntarctica_Casey /*name*/, 0xe2022583 /*zoneId*/, &kZoneContext /*zoneContext*/, - 12 /*numEras*/, + 17 /*numEras*/, kZoneEraAntarctica_Casey /*eras*/, nullptr /*targetInfo*/, }; @@ -6889,6 +6973,50 @@ const extended::ZoneInfo kZoneAntarctica_Troll ACE_TIME_PROGMEM = { nullptr /*targetInfo*/, }; +//--------------------------------------------------------------------------- +// Zone name: Antarctica/Vostok +// Eras: 2 +//--------------------------------------------------------------------------- + +static const extended::ZoneEra kZoneEraAntarctica_Vostok[] ACE_TIME_PROGMEM = { + // 7:00 - +07 2023 Dec 18 2:00 + { + nullptr /*zonePolicy*/, + "+07" /*format*/, + 28 /*offsetCode*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, + -77 /*untilYearTiny*/, + 12 /*untilMonth*/, + 18 /*untilDay*/, + 8 /*untilTimeCode*/, + 0 /*untilTimeModifier (kSuffixW + minute=0)*/, + }, + // 5:00 - +05 + { + nullptr /*zonePolicy*/, + "+05" /*format*/, + 20 /*offsetCode*/, + 4 /*deltaCode (((offsetMinute=0) << 4) + ((deltaMinutes=0)/15 + 4))*/, + 127 /*untilYearTiny*/, + 1 /*untilMonth*/, + 1 /*untilDay*/, + 0 /*untilTimeCode*/, + 0 /*untilTimeModifier (kSuffixW + minute=0)*/, + }, + +}; + +static const char kZoneNameAntarctica_Vostok[] ACE_TIME_PROGMEM = "\x03" "Vostok"; + +const extended::ZoneInfo kZoneAntarctica_Vostok ACE_TIME_PROGMEM = { + kZoneNameAntarctica_Vostok /*name*/, + 0x4f966fd4 /*zoneId*/, + &kZoneContext /*zoneContext*/, + 2 /*numEras*/, + kZoneEraAntarctica_Vostok /*eras*/, + nullptr /*targetInfo*/, +}; + //--------------------------------------------------------------------------- // Zone name: Asia/Almaty // Eras: 2 @@ -14920,7 +15048,7 @@ const extended::ZoneInfo kZoneWET ACE_TIME_PROGMEM = { //--------------------------------------------------------------------------- -// Links: 246 +// Links: 245 //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- @@ -15713,7 +15841,7 @@ const extended::ZoneInfo kZoneAmerica_Godthab ACE_TIME_PROGMEM = { kZoneNameAmerica_Godthab /*name*/, 0x8f7eba1f /*zoneId*/, &kZoneContext /*zoneContext*/, - 2 /*numEras*/, + 3 /*numEras*/, kZoneEraAmerica_Nuuk /*eras*/, &kZoneAmerica_Nuuk /*targetInfo*/, }; @@ -16228,21 +16356,6 @@ const extended::ZoneInfo kZoneAntarctica_Syowa ACE_TIME_PROGMEM = { &kZoneAsia_Riyadh /*targetInfo*/, }; -//--------------------------------------------------------------------------- -// Link name: Antarctica/Vostok -> Asia/Urumqi -//--------------------------------------------------------------------------- - -static const char kZoneNameAntarctica_Vostok[] ACE_TIME_PROGMEM = "\x03" "Vostok"; - -const extended::ZoneInfo kZoneAntarctica_Vostok ACE_TIME_PROGMEM = { - kZoneNameAntarctica_Vostok /*name*/, - 0x4f966fd4 /*zoneId*/, - &kZoneContext /*zoneContext*/, - 1 /*numEras*/, - kZoneEraAsia_Urumqi /*eras*/, - &kZoneAsia_Urumqi /*targetInfo*/, -}; - //--------------------------------------------------------------------------- // Link name: Arctic/Longyearbyen -> Europe/Berlin //--------------------------------------------------------------------------- diff --git a/src/zonedbx/zone_infos.h b/src/zonedbx/zone_infos.h index 378d4145d..8f985d797 100644 --- a/src/zonedbx/zone_infos.h +++ b/src/zonedbx/zone_infos.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbx/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbx -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope extended @@ -23,9 +23,9 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 596 (350 zones, 246 links) +// Supported Zones: 596 (351 zones, 245 links) // Unsupported Zones: 0 (0 zones, 0 links) // // Requested Years: [2000,2200] @@ -40,7 +40,7 @@ // // Records: // Infos: 596 -// Eras: 646 +// Eras: 655 // Policies: 83 // Rules: 735 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 6615 // Policies: 249 -// Eras: 7106 -// Zones: 4550 -// Links: 3198 +// Eras: 7205 +// Zones: 4563 +// Links: 3185 // Registry: 1192 // Formats: 597 // Letters: 46 // Fragments: 150 // Names: 5649 (original: 9076) -// TOTAL: 29368 +// TOTAL: 29467 // // Memory (32-bits): // Context: 24 // Rules: 8820 // Policies: 664 -// Eras: 10336 -// Zones: 8400 -// Links: 5904 +// Eras: 10480 +// Zones: 8424 +// Links: 5880 // Registry: 2384 // Formats: 597 // Letters: 64 // Fragments: 178 // Names: 5649 (original: 9076) -// TOTAL: 43020 +// TOTAL: 43164 // // DO NOT EDIT @@ -95,7 +95,7 @@ extern const __FlashStringHelper* const kTzDatabaseVersion; extern const extended::ZoneContext kZoneContext; //--------------------------------------------------------------------------- -// Supported zones: 350 +// Supported zones: 351 //--------------------------------------------------------------------------- extern const extended::ZoneInfo kZoneAfrica_Abidjan; // Africa/Abidjan @@ -244,6 +244,7 @@ extern const extended::ZoneInfo kZoneAntarctica_Mawson; // Antarctica/Mawson extern const extended::ZoneInfo kZoneAntarctica_Palmer; // Antarctica/Palmer extern const extended::ZoneInfo kZoneAntarctica_Rothera; // Antarctica/Rothera extern const extended::ZoneInfo kZoneAntarctica_Troll; // Antarctica/Troll +extern const extended::ZoneInfo kZoneAntarctica_Vostok; // Antarctica/Vostok extern const extended::ZoneInfo kZoneAsia_Almaty; // Asia/Almaty extern const extended::ZoneInfo kZoneAsia_Amman; // Asia/Amman extern const extended::ZoneInfo kZoneAsia_Anadyr; // Asia/Anadyr @@ -598,6 +599,7 @@ const uint32_t kZoneIdAntarctica_Mawson = 0x399cd863; // Antarctica/Mawson const uint32_t kZoneIdAntarctica_Palmer = 0x40962f4f; // Antarctica/Palmer const uint32_t kZoneIdAntarctica_Rothera = 0x0e86d203; // Antarctica/Rothera const uint32_t kZoneIdAntarctica_Troll = 0xe33f085b; // Antarctica/Troll +const uint32_t kZoneIdAntarctica_Vostok = 0x4f966fd4; // Antarctica/Vostok const uint32_t kZoneIdAsia_Almaty = 0xa61f41fa; // Asia/Almaty const uint32_t kZoneIdAsia_Amman = 0x148d21bc; // Asia/Amman const uint32_t kZoneIdAsia_Anadyr = 0xa63cebd1; // Asia/Anadyr @@ -805,7 +807,7 @@ const uint32_t kZoneIdWET = 0x0b882e35; // WET //--------------------------------------------------------------------------- -// Supported links: 246 +// Supported links: 245 //--------------------------------------------------------------------------- extern const extended::ZoneInfo kZoneAfrica_Accra; // Africa/Accra -> Africa/Abidjan @@ -895,7 +897,6 @@ extern const extended::ZoneInfo kZoneAntarctica_DumontDUrville; // Antarctica/Du extern const extended::ZoneInfo kZoneAntarctica_McMurdo; // Antarctica/McMurdo -> Pacific/Auckland extern const extended::ZoneInfo kZoneAntarctica_South_Pole; // Antarctica/South_Pole -> Pacific/Auckland extern const extended::ZoneInfo kZoneAntarctica_Syowa; // Antarctica/Syowa -> Asia/Riyadh -extern const extended::ZoneInfo kZoneAntarctica_Vostok; // Antarctica/Vostok -> Asia/Urumqi extern const extended::ZoneInfo kZoneArctic_Longyearbyen; // Arctic/Longyearbyen -> Europe/Berlin extern const extended::ZoneInfo kZoneAsia_Aden; // Asia/Aden -> Asia/Riyadh extern const extended::ZoneInfo kZoneAsia_Ashkhabad; // Asia/Ashkhabad -> Asia/Ashgabat @@ -1145,7 +1146,6 @@ const uint32_t kZoneIdAntarctica_DumontDUrville = 0x5a3c656c; // Antarctica/Dumo const uint32_t kZoneIdAntarctica_McMurdo = 0x6eeb5585; // Antarctica/McMurdo const uint32_t kZoneIdAntarctica_South_Pole = 0xcd96b290; // Antarctica/South_Pole const uint32_t kZoneIdAntarctica_Syowa = 0xe330c7e1; // Antarctica/Syowa -const uint32_t kZoneIdAntarctica_Vostok = 0x4f966fd4; // Antarctica/Vostok const uint32_t kZoneIdArctic_Longyearbyen = 0xd23e7859; // Arctic/Longyearbyen const uint32_t kZoneIdAsia_Aden = 0x1fa7084a; // Asia/Aden const uint32_t kZoneIdAsia_Ashkhabad = 0x15454f09; // Asia/Ashkhabad @@ -1441,7 +1441,7 @@ const uint8_t kZoneBufSizeAmerica_Santarem = 2; // America/Santarem in 2008 const uint8_t kZoneBufSizeAmerica_Santiago = 5; // America/Santiago in 2002 const uint8_t kZoneBufSizeAmerica_Santo_Domingo = 4; // America/Santo_Domingo in 2000 const uint8_t kZoneBufSizeAmerica_Sao_Paulo = 6; // America/Sao_Paulo in 2003 -const uint8_t kZoneBufSizeAmerica_Scoresbysund = 5; // America/Scoresbysund in 1983 +const uint8_t kZoneBufSizeAmerica_Scoresbysund = 6; // America/Scoresbysund in 2024 const uint8_t kZoneBufSizeAmerica_Sitka = 6; // America/Sitka in 2008 const uint8_t kZoneBufSizeAmerica_St_Johns = 6; // America/St_Johns in 2008 const uint8_t kZoneBufSizeAmerica_Swift_Current = 1; // America/Swift_Current in 1949 @@ -1460,6 +1460,7 @@ const uint8_t kZoneBufSizeAntarctica_Mawson = 2; // Antarctica/Mawson in 2009 const uint8_t kZoneBufSizeAntarctica_Palmer = 5; // Antarctica/Palmer in 2002 const uint8_t kZoneBufSizeAntarctica_Rothera = 1; // Antarctica/Rothera in 1949 const uint8_t kZoneBufSizeAntarctica_Troll = 6; // Antarctica/Troll in 2005 +const uint8_t kZoneBufSizeAntarctica_Vostok = 2; // Antarctica/Vostok in 2023 const uint8_t kZoneBufSizeAsia_Almaty = 5; // Asia/Almaty in 1987 const uint8_t kZoneBufSizeAsia_Amman = 6; // Asia/Amman in 2014 const uint8_t kZoneBufSizeAsia_Anadyr = 5; // Asia/Anadyr in 1987 diff --git a/src/zonedbx/zone_policies.cpp b/src/zonedbx/zone_policies.cpp index aeee8d77e..2e70aefa0 100644 --- a/src/zonedbx/zone_policies.cpp +++ b/src/zonedbx/zone_policies.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbx/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbx -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope extended @@ -23,9 +23,9 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 596 (350 zones, 246 links) +// Supported Zones: 596 (351 zones, 245 links) // Unsupported Zones: 0 (0 zones, 0 links) // // Requested Years: [2000,2200] @@ -40,7 +40,7 @@ // // Records: // Infos: 596 -// Eras: 646 +// Eras: 655 // Policies: 83 // Rules: 735 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 6615 // Policies: 249 -// Eras: 7106 -// Zones: 4550 -// Links: 3198 +// Eras: 7205 +// Zones: 4563 +// Links: 3185 // Registry: 1192 // Formats: 597 // Letters: 46 // Fragments: 150 // Names: 5649 (original: 9076) -// TOTAL: 29368 +// TOTAL: 29467 // // Memory (32-bits): // Context: 24 // Rules: 8820 // Policies: 664 -// Eras: 10336 -// Zones: 8400 -// Links: 5904 +// Eras: 10480 +// Zones: 8424 +// Links: 5880 // Registry: 2384 // Formats: 597 // Letters: 64 // Fragments: 178 // Names: 5649 (original: 9076) -// TOTAL: 43020 +// TOTAL: 43164 // // DO NOT EDIT @@ -7899,6 +7899,18 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 7 /*letterIndex ("S")*/, }, + // Rule Palestine 2072 max - Oct Sat<=30 2:00 0 - + { + -28 /*fromYearTiny (2072)*/, + 126 /*toYearTiny (32766)*/, + 10 /*inMonth*/, + 6 /*onDayOfWeek*/, + -30 /*onDayOfMonth*/, + 8 /*atTimeCode*/, + 0 /*atTimeModifier (kSuffixW + minute=0)*/, + 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, + 0 /*letterIndex ("")*/, + }, // Rule Palestine 2073 only - Sep 2 2:00 0 - { -27 /*fromYearTiny (2073)*/, @@ -7971,18 +7983,6 @@ static const extended::ZoneRule kZoneRulesPalestine[] ACE_TIME_PROGMEM = { 8 /*deltaCode ((deltaMinutes=60)/15 + 4)*/, 7 /*letterIndex ("S")*/, }, - // Rule Palestine 2075 max - Oct Sat<=30 2:00 0 - - { - -25 /*fromYearTiny (2075)*/, - 126 /*toYearTiny (32766)*/, - 10 /*inMonth*/, - 6 /*onDayOfWeek*/, - -30 /*onDayOfMonth*/, - 8 /*atTimeCode*/, - 0 /*atTimeModifier (kSuffixW + minute=0)*/, - 4 /*deltaCode ((deltaMinutes=0)/15 + 4)*/, - 0 /*letterIndex ("")*/, - }, // Rule Palestine 2076 only - Jul 25 2:00 0 - { -24 /*fromYearTiny (2076)*/, diff --git a/src/zonedbx/zone_policies.h b/src/zonedbx/zone_policies.h index 734a873fd..f2f77215c 100644 --- a/src/zonedbx/zone_policies.h +++ b/src/zonedbx/zone_policies.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbx/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbx -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope extended @@ -23,9 +23,9 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 596 (350 zones, 246 links) +// Supported Zones: 596 (351 zones, 245 links) // Unsupported Zones: 0 (0 zones, 0 links) // // Requested Years: [2000,2200] @@ -40,7 +40,7 @@ // // Records: // Infos: 596 -// Eras: 646 +// Eras: 655 // Policies: 83 // Rules: 735 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 6615 // Policies: 249 -// Eras: 7106 -// Zones: 4550 -// Links: 3198 +// Eras: 7205 +// Zones: 4563 +// Links: 3185 // Registry: 1192 // Formats: 597 // Letters: 46 // Fragments: 150 // Names: 5649 (original: 9076) -// TOTAL: 29368 +// TOTAL: 29467 // // Memory (32-bits): // Context: 24 // Rules: 8820 // Policies: 664 -// Eras: 10336 -// Zones: 8400 -// Links: 5904 +// Eras: 10480 +// Zones: 8424 +// Links: 5880 // Registry: 2384 // Formats: 597 // Letters: 64 // Fragments: 178 // Names: 5649 (original: 9076) -// TOTAL: 43020 +// TOTAL: 43164 // // DO NOT EDIT diff --git a/src/zonedbx/zone_registry.cpp b/src/zonedbx/zone_registry.cpp index 70a23f8f7..0f924570a 100644 --- a/src/zonedbx/zone_registry.cpp +++ b/src/zonedbx/zone_registry.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbx/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbx -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope extended @@ -23,9 +23,9 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 596 (350 zones, 246 links) +// Supported Zones: 596 (351 zones, 245 links) // Unsupported Zones: 0 (0 zones, 0 links) // // Requested Years: [2000,2200] @@ -40,7 +40,7 @@ // // Records: // Infos: 596 -// Eras: 646 +// Eras: 655 // Policies: 83 // Rules: 735 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 6615 // Policies: 249 -// Eras: 7106 -// Zones: 4550 -// Links: 3198 +// Eras: 7205 +// Zones: 4563 +// Links: 3185 // Registry: 1192 // Formats: 597 // Letters: 46 // Fragments: 150 // Names: 5649 (original: 9076) -// TOTAL: 29368 +// TOTAL: 29467 // // Memory (32-bits): // Context: 24 // Rules: 8820 // Policies: 664 -// Eras: 10336 -// Zones: 8400 -// Links: 5904 +// Eras: 10480 +// Zones: 8424 +// Links: 5880 // Registry: 2384 // Formats: 597 // Letters: 64 // Fragments: 178 // Names: 5649 (original: 9076) -// TOTAL: 43020 +// TOTAL: 43164 // // DO NOT EDIT @@ -84,7 +84,7 @@ namespace zonedbx { //--------------------------------------------------------------------------- // Zone Info registry. Sorted by zoneId. //--------------------------------------------------------------------------- -const extended::ZoneInfo* const kZoneRegistry[350] ACE_TIME_PROGMEM = { +const extended::ZoneInfo* const kZoneRegistry[351] ACE_TIME_PROGMEM = { &kZoneAmerica_St_Johns, // 0x04b14e6e, America/St_Johns &kZoneAmerica_North_Dakota_New_Salem, // 0x04f9958e, America/North_Dakota/New_Salem &kZoneAsia_Jakarta, // 0x0506ab50, Asia/Jakarta @@ -187,6 +187,7 @@ const extended::ZoneInfo* const kZoneRegistry[350] ACE_TIME_PROGMEM = { &kZoneAsia_Nicosia, // 0x4b0fcf78, Asia/Nicosia &kZoneAmerica_Chicago, // 0x4b92b5d4, America/Chicago &kZoneAustralia_Sydney, // 0x4d1e9776, Australia/Sydney + &kZoneAntarctica_Vostok, // 0x4f966fd4, Antarctica/Vostok &kZoneAustralia_Brisbane, // 0x4fedc9c0, Australia/Brisbane &kZoneAmerica_Asuncion, // 0x50ec79a6, America/Asuncion &kZoneAsia_Karachi, // 0x527f5245, Asia/Karachi @@ -613,7 +614,7 @@ const extended::ZoneInfo* const kZoneAndLinkRegistry[596] ACE_TIME_PROGMEM = { &kZoneAustralia_Sydney, // 0x4d1e9776, Australia/Sydney &kZoneNZ_CHAT, // 0x4d42afda, NZ-CHAT -> Pacific/Chatham &kZoneUS_Arizona, // 0x4ec52670, US/Arizona -> America/Phoenix - &kZoneAntarctica_Vostok, // 0x4f966fd4, Antarctica/Vostok -> Asia/Urumqi + &kZoneAntarctica_Vostok, // 0x4f966fd4, Antarctica/Vostok &kZoneUS_Aleutian, // 0x4fe013ef, US/Aleutian -> America/Adak &kZoneAustralia_Brisbane, // 0x4fedc9c0, Australia/Brisbane &kZoneAmerica_Catamarca, // 0x5036e963, America/Catamarca -> America/Argentina/Catamarca diff --git a/src/zonedbx/zone_registry.h b/src/zonedbx/zone_registry.h index a9e1de366..267ecd759 100644 --- a/src/zonedbx/zone_registry.h +++ b/src/zonedbx/zone_registry.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbx/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbx -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope extended @@ -23,9 +23,9 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // -// Supported Zones: 596 (350 zones, 246 links) +// Supported Zones: 596 (351 zones, 245 links) // Unsupported Zones: 0 (0 zones, 0 links) // // Requested Years: [2000,2200] @@ -40,7 +40,7 @@ // // Records: // Infos: 596 -// Eras: 646 +// Eras: 655 // Policies: 83 // Rules: 735 // @@ -48,29 +48,29 @@ // Context: 16 // Rules: 6615 // Policies: 249 -// Eras: 7106 -// Zones: 4550 -// Links: 3198 +// Eras: 7205 +// Zones: 4563 +// Links: 3185 // Registry: 1192 // Formats: 597 // Letters: 46 // Fragments: 150 // Names: 5649 (original: 9076) -// TOTAL: 29368 +// TOTAL: 29467 // // Memory (32-bits): // Context: 24 // Rules: 8820 // Policies: 664 -// Eras: 10336 -// Zones: 8400 -// Links: 5904 +// Eras: 10480 +// Zones: 8424 +// Links: 5880 // Registry: 2384 // Formats: 597 // Letters: 64 // Fragments: 178 // Names: 5649 (original: 9076) -// TOTAL: 43020 +// TOTAL: 43164 // // DO NOT EDIT @@ -83,8 +83,8 @@ namespace ace_time { namespace zonedbx { // Zones -const uint16_t kZoneRegistrySize = 350; -extern const extended::ZoneInfo* const kZoneRegistry[350]; +const uint16_t kZoneRegistrySize = 351; +extern const extended::ZoneInfo* const kZoneRegistry[351]; // Zones and Links const uint16_t kZoneAndLinkRegistrySize = 596; diff --git a/src/zonedbxtesting/Makefile b/src/zonedbxtesting/Makefile index 596bee6c3..827a11d05 100644 --- a/src/zonedbxtesting/Makefile +++ b/src/zonedbxtesting/Makefile @@ -2,7 +2,7 @@ TARGETS := zone_infos.cpp zone_infos.h zone_policies.cpp zone_policies.h TOOLS := $(abspath ../../../AceTimeTools) TZ_REPO := $(abspath $(TOOLS)/../tz) -TZ_VERSION := 2023c +TZ_VERSION := 2023d START_YEAR := 1980 UNTIL_YEAR := 2200 diff --git a/src/zonedbxtesting/zone_infos.cpp b/src/zonedbxtesting/zone_infos.cpp index 9bfc3ca0e..10da79ed2 100644 --- a/src/zonedbxtesting/zone_infos.cpp +++ b/src/zonedbxtesting/zone_infos.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbxtesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbxtesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope extended @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 16 (15 zones, 1 links) -// Unsupported Zones: 580 (335 zones, 245 links) +// Unsupported Zones: 580 (336 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767] @@ -87,7 +87,7 @@ namespace zonedbxtesting { // ZoneContext //--------------------------------------------------------------------------- -static const char kVersionString[] ACE_TIME_PROGMEM = "2023c"; +static const char kVersionString[] ACE_TIME_PROGMEM = "2023d"; const __FlashStringHelper* const kTzDatabaseVersion = (const __FlashStringHelper*) kVersionString; diff --git a/src/zonedbxtesting/zone_infos.h b/src/zonedbxtesting/zone_infos.h index aa8baabab..9f7793c46 100644 --- a/src/zonedbxtesting/zone_infos.h +++ b/src/zonedbxtesting/zone_infos.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbxtesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbxtesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope extended @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 16 (15 zones, 1 links) -// Unsupported Zones: 580 (335 zones, 245 links) +// Unsupported Zones: 580 (336 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767] @@ -174,7 +174,7 @@ const uint8_t kZoneBufSizePacific_Apia = 5; // Pacific/Apia in 2011 //--------------------------------------------------------------------------- -// Unsupported zones: 335 +// Unsupported zones: 336 //--------------------------------------------------------------------------- // Africa/Abidjan {Zone missing from include list} @@ -311,6 +311,7 @@ const uint8_t kZoneBufSizePacific_Apia = 5; // Pacific/Apia in 2011 // Antarctica/Palmer {Zone missing from include list} // Antarctica/Rothera {Zone missing from include list} // Antarctica/Troll {Zone missing from include list} +// Antarctica/Vostok {Zone missing from include list} // Asia/Almaty {Zone missing from include list} // Asia/Amman {Zone missing from include list} // Asia/Anadyr {Zone missing from include list} @@ -531,7 +532,7 @@ const uint8_t kZoneBufSizePacific_Apia = 5; // Pacific/Apia in 2011 //--------------------------------------------------------------------------- -// Unsupported links: 245 +// Unsupported links: 244 //--------------------------------------------------------------------------- // Africa/Accra {Link missing from include list} @@ -621,7 +622,6 @@ const uint8_t kZoneBufSizePacific_Apia = 5; // Pacific/Apia in 2011 // Antarctica/McMurdo {Link missing from include list} // Antarctica/South_Pole {Link missing from include list} // Antarctica/Syowa {Link missing from include list} -// Antarctica/Vostok {Link missing from include list} // Arctic/Longyearbyen {Link missing from include list} // Asia/Aden {Link missing from include list} // Asia/Ashkhabad {Link missing from include list} diff --git a/src/zonedbxtesting/zone_policies.cpp b/src/zonedbxtesting/zone_policies.cpp index 7f9144d6b..b9288994f 100644 --- a/src/zonedbxtesting/zone_policies.cpp +++ b/src/zonedbxtesting/zone_policies.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbxtesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbxtesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope extended @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 16 (15 zones, 1 links) -// Unsupported Zones: 580 (335 zones, 245 links) +// Unsupported Zones: 580 (336 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767] diff --git a/src/zonedbxtesting/zone_policies.h b/src/zonedbxtesting/zone_policies.h index 4e82ada0f..ee1ee3474 100644 --- a/src/zonedbxtesting/zone_policies.h +++ b/src/zonedbxtesting/zone_policies.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbxtesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbxtesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope extended @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 16 (15 zones, 1 links) -// Unsupported Zones: 580 (335 zones, 245 links) +// Unsupported Zones: 580 (336 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767] diff --git a/src/zonedbxtesting/zone_registry.cpp b/src/zonedbxtesting/zone_registry.cpp index 734eab21d..367d80a87 100644 --- a/src/zonedbxtesting/zone_registry.cpp +++ b/src/zonedbxtesting/zone_registry.cpp @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbxtesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbxtesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope extended @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 16 (15 zones, 1 links) -// Unsupported Zones: 580 (335 zones, 245 links) +// Unsupported Zones: 580 (336 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767] diff --git a/src/zonedbxtesting/zone_registry.h b/src/zonedbxtesting/zone_registry.h index 2b7ccb7cb..2002bda8f 100644 --- a/src/zonedbxtesting/zone_registry.h +++ b/src/zonedbxtesting/zone_registry.h @@ -3,7 +3,7 @@ // $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py // --input_dir /home/brian/src/AceTime/src/zonedbxtesting/tzfiles // --output_dir /home/brian/src/AceTime/src/zonedbxtesting -// --tz_version 2023c +// --tz_version 2023d // --action zonedb // --language arduino // --scope extended @@ -25,10 +25,10 @@ // northamerica // southamerica // -// from https://github.com/eggert/tz/releases/tag/2023c +// from https://github.com/eggert/tz/releases/tag/2023d // // Supported Zones: 16 (15 zones, 1 links) -// Unsupported Zones: 580 (335 zones, 245 links) +// Unsupported Zones: 580 (336 zones, 244 links) // // Requested Years: [1980,2200] // Accurate Years: [1980,32767]