Skip to content

Commit e580545

Browse files
authored
Merge pull request #112 from bxparks/develop
merge 2.2.2 into master
2 parents 148f5a0 + 85e46f0 commit e580545

37 files changed

+205
-237
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
# Changelog
22

33
* Unreleased
4+
* 2.2.2 (2023-04-01, TZDB version 2023c)
5+
* Upgrade TZDB from 2023b to 2023c.
6+
* https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html
7+
* "This release's code and data are identical to 2023a. In other
8+
words, this release reverts all changes made in 2023b other than
9+
commentary, as that appears to be the best of a bad set of
10+
short-notice choices for modeling this week's daylight saving
11+
chaos in Lebanon."
12+
* AceTime is forced to upgrade to 2023c, because we skipped 2023a and went
13+
directly to 2023b, which is being rolled back by 2023c.
414
* 2.2.1 (2023-03-24, TZDB version 2023b)
515
* Actually regenerate the `zonedb*` files to 2023b.
616
* 2.2.0 (2023-03-24, TZDB version 2023b)

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ This library can be an alternative to the Arduino Time
5656
offsets of type `kTypeManual`. See [Migrating to
5757
v2.2.0](MIGRATING.md#MigratingToVersion220) for details.
5858

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

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

@@ -795,12 +795,13 @@ These boards should work but I don't test them as often:
795795
796796
**Tier 3: May work, but not supported**
797797
798-
* SAMD21 based boards. SAMD21 based boards are now split into 2 groups:
799-
* Those using the new ArduinoCore-API, usually Arduino-branded
800-
boards. These are explicitly blacklisted. See below.
801-
* Other 3rd party SAMD21 boards using the previous Arduino API.
802-
These *may* work but I have not explicitly tested any of them except
803-
for the Seeed Studio XIAO M0.
798+
* Other SAMD21 based boards.
799+
* SAMD21 based boards are now split into 2 groups:
800+
* Those using the new ArduinoCore-API, usually Arduino-branded
801+
boards. These are explicitly blacklisted. See below.
802+
* Other 3rd party SAMD21 boards using the previous Arduino API.
803+
* The ones using the previous Arduino API *may* work but I have not
804+
explicitly tested any of them except for the Seeed Studio XIAO M0.
804805
805806
**Tier Blacklisted**
806807

USER_GUIDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ valid from the years `[2000,10000)`. By adjusting the `currentEpochYear()`, the
1818
library will work across any 100 year interval across the 8000 year range of the
1919
TZ database.
2020

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

2323
**Related Documents**:
2424

examples/AutoBenchmark/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ Iterations_per_run: 1000
346346
347347
```
348348

349-
## Seeed Studio XIOA SAMD21
349+
## Seeed Studio XIAO SAMD21
350350

351351
* SAMD21, 48 MHz ARM Cortex-M0+
352352
* Arduino IDE 1.8.19, Arduino CLI 0.31.0

examples/AutoBenchmark/generate_readme.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230
{micro_results}
231231
```
232232
233-
## Seeed Studio XIOA SAMD21
233+
## Seeed Studio XIAO SAMD21
234234
235235
* SAMD21, 48 MHz ARM Cortex-M0+
236236
* Arduino IDE 1.8.19, Arduino CLI 0.31.0

examples/MemoryBenchmark/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ ASCII table.
309309
310310
```
311311

312-
## Seeed Studio XIAO
312+
## Seeed Studio XIAO SAMD21
313313

314314
* SAMD21, 48 MHz ARM Cortex-M0+
315315
* Arduino IDE 1.8.19, Arduino CLI 0.31.1

examples/MemoryBenchmark/generate_readme.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@
279279
{micro_results}
280280
```
281281
282-
## Seeed Studio XIAO
282+
## Seeed Studio XIAO SAMD21
283283
284284
* SAMD21, 48 MHz ARM Cortex-M0+
285285
* Arduino IDE 1.8.19, Arduino CLI 0.31.1

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=AceTime
2-
version=2.2.1
2+
version=2.2.2
33
author=Brian T. Park <[email protected]>
44
maintainer=Brian T. Park <[email protected]>
55
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.

src/AceTime.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
#include "zonedbx/zone_registry.h"
6767

6868
// Version format: xxyyzz == "xx.yy.zz"
69-
#define ACE_TIME_VERSION 20201
70-
#define ACE_TIME_VERSION_STRING "2.2.1"
69+
#define ACE_TIME_VERSION 20202
70+
#define ACE_TIME_VERSION_STRING "2.2.2"
7171

7272
#endif

src/tzonedb/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ TARGETS := zone_infos.cpp zone_infos.h zone_policies.cpp zone_policies.h
22

33
TOOLS := $(abspath ../../../AceTimeTools)
44
TZ_REPO := $(abspath $(TOOLS)/../tz)
5-
TZ_VERSION := 2023b
5+
TZ_VERSION := 2023c
66
START_YEAR := 1980
77
UNTIL_YEAR := 10000
88

0 commit comments

Comments
 (0)