Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge 2.2.2 into master #112

Merged
merged 4 commits into from
Apr 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
# Changelog

* Unreleased
* 2.2.2 (2023-04-01, TZDB version 2023c)
* Upgrade TZDB from 2023b to 2023c.
* https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html
* "This release's code and data are identical to 2023a. In other
words, this release reverts all changes made in 2023b other than
commentary, as that appears to be the best of a bad set of
short-notice choices for modeling this week's daylight saving
chaos in Lebanon."
* AceTime is forced to upgrade to 2023c, because we skipped 2023a and went
directly to 2023b, which is being rolled back by 2023c.
* 2.2.1 (2023-03-24, TZDB version 2023b)
* Actually regenerate the `zonedb*` files to 2023b.
* 2.2.0 (2023-03-24, TZDB version 2023b)
Expand Down
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ This library can be an alternative to the Arduino Time
offsets of type `kTypeManual`. See [Migrating to
v2.2.0](MIGRATING.md#MigratingToVersion220) for details.

**Version**: 2.2.1 (2023-03-24, TZDB version 2023b)
**Version**: 2.2.2 (2023-04-01, TZDB version 2023c)

**Changelog**: [CHANGELOG.md](CHANGELOG.md)

Expand Down Expand Up @@ -795,12 +795,13 @@ These boards should work but I don't test them as often:

**Tier 3: May work, but not supported**

* SAMD21 based boards. SAMD21 based boards are now split into 2 groups:
* Those using the new ArduinoCore-API, usually Arduino-branded
boards. These are explicitly blacklisted. See below.
* Other 3rd party SAMD21 boards using the previous Arduino API.
These *may* work but I have not explicitly tested any of them except
for the Seeed Studio XIAO M0.
* Other SAMD21 based boards.
* SAMD21 based boards are now split into 2 groups:
* Those using the new ArduinoCore-API, usually Arduino-branded
boards. These are explicitly blacklisted. See below.
* Other 3rd party SAMD21 boards using the previous Arduino API.
* The ones using the previous Arduino API *may* work but I have not
explicitly tested any of them except for the Seeed Studio XIAO M0.

**Tier Blacklisted**

Expand Down
2 changes: 1 addition & 1 deletion USER_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ valid from the years `[2000,10000)`. By adjusting the `currentEpochYear()`, the
library will work across any 100 year interval across the 8000 year range of the
TZ database.

**Version**: 2.2.1 (2023-03-24, TZDB 2023b)
**Version**: 2.2.2 (2023-04-01, TZDB 2023c)

**Related Documents**:

Expand Down
2 changes: 1 addition & 1 deletion examples/AutoBenchmark/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ Iterations_per_run: 1000

```

## Seeed Studio XIOA SAMD21
## Seeed Studio XIAO SAMD21

* SAMD21, 48 MHz ARM Cortex-M0+
* Arduino IDE 1.8.19, Arduino CLI 0.31.0
Expand Down
2 changes: 1 addition & 1 deletion examples/AutoBenchmark/generate_readme.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
{micro_results}
```

## Seeed Studio XIOA SAMD21
## Seeed Studio XIAO SAMD21

* SAMD21, 48 MHz ARM Cortex-M0+
* Arduino IDE 1.8.19, Arduino CLI 0.31.0
Expand Down
2 changes: 1 addition & 1 deletion examples/MemoryBenchmark/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ ASCII table.

```

## Seeed Studio XIAO
## Seeed Studio XIAO SAMD21

* SAMD21, 48 MHz ARM Cortex-M0+
* Arduino IDE 1.8.19, Arduino CLI 0.31.1
Expand Down
2 changes: 1 addition & 1 deletion examples/MemoryBenchmark/generate_readme.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@
{micro_results}
```

## Seeed Studio XIAO
## Seeed Studio XIAO SAMD21

* SAMD21, 48 MHz ARM Cortex-M0+
* Arduino IDE 1.8.19, Arduino CLI 0.31.1
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=AceTime
version=2.2.1
version=2.2.2
author=Brian T. Park <brian@xparks.net>
maintainer=Brian T. Park <brian@xparks.net>
sentence=Date, time, timezone classes for Arduino supporting the full IANA TZ Database to convert epoch seconds to date and time components in different time zones.
Expand Down
4 changes: 2 additions & 2 deletions src/AceTime.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
#include "zonedbx/zone_registry.h"

// Version format: xxyyzz == "xx.yy.zz"
#define ACE_TIME_VERSION 20201
#define ACE_TIME_VERSION_STRING "2.2.1"
#define ACE_TIME_VERSION 20202
#define ACE_TIME_VERSION_STRING "2.2.2"

#endif
2 changes: 1 addition & 1 deletion src/tzonedb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 := 2023b
TZ_VERSION := 2023c
START_YEAR := 1980
UNTIL_YEAR := 10000

Expand Down
6 changes: 3 additions & 3 deletions src/tzonedb/zone_infos.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py
// --input_dir /home/brian/src/AceTime/src/tzonedb/tzfiles
// --output_dir /home/brian/src/AceTime/src/tzonedb
// --tz_version 2023b
// --tz_version 2023c
// --action zonedb
// --language arduino
// --scope basic
Expand All @@ -26,7 +26,7 @@
// northamerica
// southamerica
//
// from https://github.com/eggert/tz/releases/tag/2023b
// from https://github.com/eggert/tz/releases/tag/2023c
//
// Supported Zones: 12 (11 zones, 1 links)
// Unsupported Zones: 584 (339 zones, 245 links)
Expand Down Expand Up @@ -81,7 +81,7 @@ namespace tzonedb {
// ZoneContext (should not be in PROGMEM)
//---------------------------------------------------------------------------

const char kTzDatabaseVersion[] = "2023b";
const char kTzDatabaseVersion[] = "2023c";

const char* const kFragments[] = {
/*\x00*/ nullptr,
Expand Down
4 changes: 2 additions & 2 deletions src/tzonedb/zone_infos.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py
// --input_dir /home/brian/src/AceTime/src/tzonedb/tzfiles
// --output_dir /home/brian/src/AceTime/src/tzonedb
// --tz_version 2023b
// --tz_version 2023c
// --action zonedb
// --language arduino
// --scope basic
Expand All @@ -26,7 +26,7 @@
// northamerica
// southamerica
//
// from https://github.com/eggert/tz/releases/tag/2023b
// from https://github.com/eggert/tz/releases/tag/2023c
//
// Supported Zones: 12 (11 zones, 1 links)
// Unsupported Zones: 584 (339 zones, 245 links)
Expand Down
4 changes: 2 additions & 2 deletions src/tzonedb/zone_policies.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py
// --input_dir /home/brian/src/AceTime/src/tzonedb/tzfiles
// --output_dir /home/brian/src/AceTime/src/tzonedb
// --tz_version 2023b
// --tz_version 2023c
// --action zonedb
// --language arduino
// --scope basic
Expand All @@ -26,7 +26,7 @@
// northamerica
// southamerica
//
// from https://github.com/eggert/tz/releases/tag/2023b
// from https://github.com/eggert/tz/releases/tag/2023c
//
// Supported Zones: 12 (11 zones, 1 links)
// Unsupported Zones: 584 (339 zones, 245 links)
Expand Down
4 changes: 2 additions & 2 deletions src/tzonedb/zone_policies.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py
// --input_dir /home/brian/src/AceTime/src/tzonedb/tzfiles
// --output_dir /home/brian/src/AceTime/src/tzonedb
// --tz_version 2023b
// --tz_version 2023c
// --action zonedb
// --language arduino
// --scope basic
Expand All @@ -26,7 +26,7 @@
// northamerica
// southamerica
//
// from https://github.com/eggert/tz/releases/tag/2023b
// from https://github.com/eggert/tz/releases/tag/2023c
//
// Supported Zones: 12 (11 zones, 1 links)
// Unsupported Zones: 584 (339 zones, 245 links)
Expand Down
4 changes: 2 additions & 2 deletions src/tzonedb/zone_registry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py
// --input_dir /home/brian/src/AceTime/src/tzonedb/tzfiles
// --output_dir /home/brian/src/AceTime/src/tzonedb
// --tz_version 2023b
// --tz_version 2023c
// --action zonedb
// --language arduino
// --scope basic
Expand All @@ -26,7 +26,7 @@
// northamerica
// southamerica
//
// from https://github.com/eggert/tz/releases/tag/2023b
// from https://github.com/eggert/tz/releases/tag/2023c
//
// Supported Zones: 12 (11 zones, 1 links)
// Unsupported Zones: 584 (339 zones, 245 links)
Expand Down
4 changes: 2 additions & 2 deletions src/tzonedb/zone_registry.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py
// --input_dir /home/brian/src/AceTime/src/tzonedb/tzfiles
// --output_dir /home/brian/src/AceTime/src/tzonedb
// --tz_version 2023b
// --tz_version 2023c
// --action zonedb
// --language arduino
// --scope basic
Expand All @@ -26,7 +26,7 @@
// northamerica
// southamerica
//
// from https://github.com/eggert/tz/releases/tag/2023b
// from https://github.com/eggert/tz/releases/tag/2023c
//
// Supported Zones: 12 (11 zones, 1 links)
// Unsupported Zones: 584 (339 zones, 245 links)
Expand Down
2 changes: 1 addition & 1 deletion src/tzonedbx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 := 2023b
TZ_VERSION := 2023c
START_YEAR := 1980
UNTIL_YEAR := 10000

Expand Down
6 changes: 3 additions & 3 deletions src/tzonedbx/zone_infos.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py
// --input_dir /home/brian/src/AceTime/src/tzonedbx/tzfiles
// --output_dir /home/brian/src/AceTime/src/tzonedbx
// --tz_version 2023b
// --tz_version 2023c
// --action zonedb
// --language arduino
// --scope extended
Expand All @@ -26,7 +26,7 @@
// northamerica
// southamerica
//
// from https://github.com/eggert/tz/releases/tag/2023b
// from https://github.com/eggert/tz/releases/tag/2023c
//
// Supported Zones: 16 (15 zones, 1 links)
// Unsupported Zones: 580 (335 zones, 245 links)
Expand Down Expand Up @@ -81,7 +81,7 @@ namespace tzonedbx {
// ZoneContext (should not be in PROGMEM)
//---------------------------------------------------------------------------

const char kTzDatabaseVersion[] = "2023b";
const char kTzDatabaseVersion[] = "2023c";

const char* const kFragments[] = {
/*\x00*/ nullptr,
Expand Down
8 changes: 4 additions & 4 deletions src/tzonedbx/zone_infos.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py
// --input_dir /home/brian/src/AceTime/src/tzonedbx/tzfiles
// --output_dir /home/brian/src/AceTime/src/tzonedbx
// --tz_version 2023b
// --tz_version 2023c
// --action zonedb
// --language arduino
// --scope extended
Expand All @@ -26,7 +26,7 @@
// northamerica
// southamerica
//
// from https://github.com/eggert/tz/releases/tag/2023b
// from https://github.com/eggert/tz/releases/tag/2023c
//
// Supported Zones: 16 (15 zones, 1 links)
// Unsupported Zones: 580 (335 zones, 245 links)
Expand Down Expand Up @@ -512,13 +512,13 @@ const uint8_t kZoneBufSizePacific_Apia = 5; // Pacific/Apia in 2011
//---------------------------------------------------------------------------

// Africa/Casablanca {
// Morocco {SAVE '-1:00' different from 1:00}
// Morocco {SAVE '-1:00' is a negative DST}
// }
// Africa/Windhoek {
// Namibia {
// LETTER 'CAT' not single character,
// LETTER 'WAT' not single character,
// SAVE '-1:00' different from 1:00,
// SAVE '-1:00' is a negative DST,
// }
// }

Expand Down
4 changes: 2 additions & 2 deletions src/tzonedbx/zone_policies.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py
// --input_dir /home/brian/src/AceTime/src/tzonedbx/tzfiles
// --output_dir /home/brian/src/AceTime/src/tzonedbx
// --tz_version 2023b
// --tz_version 2023c
// --action zonedb
// --language arduino
// --scope extended
Expand All @@ -26,7 +26,7 @@
// northamerica
// southamerica
//
// from https://github.com/eggert/tz/releases/tag/2023b
// from https://github.com/eggert/tz/releases/tag/2023c
//
// Supported Zones: 16 (15 zones, 1 links)
// Unsupported Zones: 580 (335 zones, 245 links)
Expand Down
8 changes: 4 additions & 4 deletions src/tzonedbx/zone_policies.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py
// --input_dir /home/brian/src/AceTime/src/tzonedbx/tzfiles
// --output_dir /home/brian/src/AceTime/src/tzonedbx
// --tz_version 2023b
// --tz_version 2023c
// --action zonedb
// --language arduino
// --scope extended
Expand All @@ -26,7 +26,7 @@
// northamerica
// southamerica
//
// from https://github.com/eggert/tz/releases/tag/2023b
// from https://github.com/eggert/tz/releases/tag/2023c
//
// Supported Zones: 16 (15 zones, 1 links)
// Unsupported Zones: 580 (335 zones, 245 links)
Expand Down Expand Up @@ -229,11 +229,11 @@ extern const extended::ZonePolicy kZonePolicyWinn;
// Notable zone policies: 2
//---------------------------------------------------------------------------

// Morocco {SAVE '-1:00' different from 1:00}
// Morocco {SAVE '-1:00' is a negative DST}
// Namibia {
// LETTER 'CAT' not single character,
// LETTER 'WAT' not single character,
// SAVE '-1:00' different from 1:00,
// SAVE '-1:00' is a negative DST,
// }


Expand Down
4 changes: 2 additions & 2 deletions src/tzonedbx/zone_registry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py
// --input_dir /home/brian/src/AceTime/src/tzonedbx/tzfiles
// --output_dir /home/brian/src/AceTime/src/tzonedbx
// --tz_version 2023b
// --tz_version 2023c
// --action zonedb
// --language arduino
// --scope extended
Expand All @@ -26,7 +26,7 @@
// northamerica
// southamerica
//
// from https://github.com/eggert/tz/releases/tag/2023b
// from https://github.com/eggert/tz/releases/tag/2023c
//
// Supported Zones: 16 (15 zones, 1 links)
// Unsupported Zones: 580 (335 zones, 245 links)
Expand Down
4 changes: 2 additions & 2 deletions src/tzonedbx/zone_registry.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// $ /home/brian/src/AceTimeTools/src/acetimetools/tzcompiler.py
// --input_dir /home/brian/src/AceTime/src/tzonedbx/tzfiles
// --output_dir /home/brian/src/AceTime/src/tzonedbx
// --tz_version 2023b
// --tz_version 2023c
// --action zonedb
// --language arduino
// --scope extended
Expand All @@ -26,7 +26,7 @@
// northamerica
// southamerica
//
// from https://github.com/eggert/tz/releases/tag/2023b
// from https://github.com/eggert/tz/releases/tag/2023c
//
// Supported Zones: 16 (15 zones, 1 links)
// Unsupported Zones: 580 (335 zones, 245 links)
Expand Down
2 changes: 1 addition & 1 deletion src/zonedb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 := 2023b
TZ_VERSION := 2023c
START_YEAR := 2000
UNTIL_YEAR := 10000

Expand Down
Loading