Merge branch 'basic_letter' into develop

bxparks · Jun 13, 2023 · 390b3e5 · 390b3e5
2 parents a243fe5 + 59487bc
commit 390b3e5
Show file tree

Hide file tree

Showing 23 changed files with 969 additions and 833 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,10 @@
     * Move `ZoneContext`, `letters[]`, `fragments[]` into PROGMEM.
         * Saves around 150-200 bytes of RAM on AVR processors,
           200-350 bytes of RAM on ESP8266.
+    * Allow multi-character `ZoneRule.letter` in `BasicZoneProcessor`.
+        * Regenerate `zonedb` which enables 2 more zones: `/Africa/Windhoek`,
+          and `America/Belize`
+        * Increases `zonedb` by 150-200 bytes.
 * 2.2.3 (2023-05-31, TZDB version 2023c)
     * Update `ace_time/testing/*` classes to support splitting the test data
       into 2 separate lists: `transitions` and `samples`.

diff --git a/examples/MemoryBenchmark/README.md b/examples/MemoryBenchmark/README.md
diff --git a/examples/MemoryBenchmark/esp32.txt b/examples/MemoryBenchmark/esp32.txt
@@ -1,25 +1,25 @@
 0 228345 1310720 21976 327680
-1 230629 1310720 21984 327680
-2 231609 1310720 22000 327680
-3 231621 1310720 21976 327680
-4 235737 1310720 22184 327680
-5 236157 1310720 22392 327680
-6 235889 1310720 22208 327680
-7 252017 1310720 22208 327680
-8 260545 1310720 22208 327680
-9 236417 1310720 22208 327680
-10 236489 1310720 22208 327680
-11 237865 1310720 22776 327680
-12 238289 1310720 23568 327680
-13 238001 1310720 22784 327680
-14 271281 1310720 22784 327680
-15 280865 1310720 22784 327680
-16 238537 1310720 22784 327680
-17 238609 1310720 22784 327680
-18 238521 1310720 22776 327680
-19 239805 1310720 23568 327680
-20 238673 1310720 22784 327680
-21 318801 1310720 22784 327680
-22 328369 1310720 22784 327680
-23 239209 1310720 22784 327680
-24 239273 1310720 22784 327680
+1 230669 1310720 21984 327680
+2 231649 1310720 22000 327680
+3 231661 1310720 21976 327680
+4 235849 1310720 22184 327680
+5 236285 1310720 22392 327680
+6 236001 1310720 22208 327680
+7 252305 1310720 22208 327680
+8 260833 1310720 22208 327680
+9 236553 1310720 22208 327680
+10 236633 1310720 22208 327680
+11 237913 1310720 22712 327680
+12 238337 1310720 23440 327680
+13 238049 1310720 22720 327680
+14 271329 1310720 22720 327680
+15 280913 1310720 22720 327680
+16 238601 1310720 22720 327680
+17 238681 1310720 22720 327680
+18 238569 1310720 22712 327680
+19 239857 1310720 23440 327680
+20 238721 1310720 22720 327680
+21 318849 1310720 22720 327680
+22 328417 1310720 22720 327680
+23 239273 1310720 22720 327680
+24 239345 1310720 22720 327680
diff --git a/examples/MemoryBenchmark/esp8266.txt b/examples/MemoryBenchmark/esp8266.txt
@@ -2,24 +2,24 @@
 1 260613 1044464 27912 81920
 2 261573 1044464 27928 81920
 3 261553 1044464 27900 81920
-4 267069 1044464 28528 81920
-5 267469 1044464 28736 81920
-6 267229 1044464 28552 81920
-7 283389 1044464 28552 81920
-8 291917 1044464 28552 81920
-9 267933 1044464 28552 81920
-10 268077 1044464 28552 81920
-11 269445 1044464 29216 81920
-12 269877 1044464 30008 81920
-13 269605 1044464 29224 81920
-14 302917 1044464 29224 81920
-15 312485 1044464 29224 81920
-16 270325 1044464 29224 81920
-17 270373 1044464 29224 81920
-18 270161 1044464 29572 81920
-19 271441 1044464 30364 81920
-20 270305 1044464 29580 81920
-21 350465 1044464 29580 81920
-22 360033 1044464 29580 81920
-23 271025 1044464 29580 81920
-24 271073 1044464 29580 81920
+4 267165 1044464 28528 81920
+5 267581 1044464 28736 81920
+6 267325 1044464 28552 81920
+7 283661 1044464 28552 81920
+8 292189 1044464 28552 81920
+9 268061 1044464 28552 81920
+10 268205 1044464 28552 81920
+11 269461 1044464 29152 81920
+12 269893 1044464 29880 81920
+13 269605 1044464 29160 81920
+14 302933 1044464 29160 81920
+15 312501 1044464 29160 81920
+16 270373 1044464 29160 81920
+17 270421 1044464 29160 81920
+18 270177 1044464 29508 81920
+19 271457 1044464 30236 81920
+20 270321 1044464 29516 81920
+21 350481 1044464 29516 81920
+22 360049 1044464 29516 81920
+23 271073 1044464 29516 81920
+24 271121 1044464 29516 81920
diff --git a/examples/MemoryBenchmark/generate_readme.py b/examples/MemoryBenchmark/generate_readme.py
@@ -278,6 +278,16 @@
       800-900 bytes.
 * Move ZoneContext and its string arrays into PROGMEM.
     * Reduces RAM usage by 150-200 bytes on AVR and ESP8266 processors.
+* Merge `createAbbreviation()`
+    * `BasicZoneProcessor`: Slight (30-60 bytes) increase in flash memory,
+      no change in RAM usage.
+    * `ExtendedZoneProcessor`: Slight (30-60 bytes) increase in flash memory.
+      But saves ~16 bytes of RAM for 8-bit, ~64 bytes of RAM for 32-bit.
+* Support multi-character `ZoneRule.letter` field
+    * Enables `Africa/Windhoek` and `America/Belize` in the `zonedb` database
+      used with `BasicZoneProcessor`.
+    * Increases flash memory for `zonedb` by ~150 bytes on 8-bit, ~200 on 32-bit
+      processors.
 
 # Legend
 

diff --git a/examples/MemoryBenchmark/micro.txt b/examples/MemoryBenchmark/micro.txt
@@ -2,20 +2,20 @@
 1 4080 28672 161 2560
 2 4416 28672 170 2560
 3 4400 28672 153 2560
-4 10550 28672 348 2560
-5 11078 28672 495 2560
-6 10760 28672 359 2560
-7 22488 28672 735 2560
-8 27868 28672 735 2560
-9 11456 28672 361 2560
-10 11670 28672 361 2560
-11 14076 28672 779 2560
-12 14680 28672 1357 2560
-13 14256 28672 785 2560
-14 39376 28672 1265 2560
-15 45406 28672 1265 2560
-16 14982 28672 787 2560
-17 15066 28672 787 2560
+4 10648 28672 348 2560
+5 11176 28672 495 2560
+6 10858 28672 359 2560
+7 22708 28672 737 2560
+8 28088 28672 737 2560
+9 11636 28672 361 2560
+10 11754 28672 361 2560
+11 14116 28672 763 2560
+12 14720 28672 1325 2560
+13 14296 28672 769 2560
+14 39414 28672 1249 2560
+15 45446 28672 1249 2560
+16 15098 28672 771 2560
+17 15186 28672 771 2560
 18 -1 -1 -1 -1
 19 -1 -1 -1 -1
 20 -1 -1 -1 -1

diff --git a/examples/MemoryBenchmark/nano.txt b/examples/MemoryBenchmark/nano.txt
@@ -2,20 +2,20 @@
 1 1108 30720 21 2048
 2 1444 30720 30 2048
 3 1406 30720 13 2048
-4 7578 30720 208 2048
-5 8124 30720 357 2048
-6 7788 30720 219 2048
-7 19518 30720 597 2048
-8 24898 30720 597 2048
-9 8484 30720 221 2048
-10 8698 30720 221 2048
-11 11120 30720 639 2048
-12 11726 30720 1219 2048
-13 11300 30720 645 2048
-14 36406 30720 1127 2048
-15 42436 30720 1127 2048
-16 12026 30720 647 2048
-17 12110 30720 647 2048
+4 7676 30720 208 2048
+5 8222 30720 357 2048
+6 7886 30720 219 2048
+7 19738 30720 599 2048
+8 25118 30720 599 2048
+9 8664 30720 221 2048
+10 8782 30720 221 2048
+11 11160 30720 623 2048
+12 11766 30720 1187 2048
+13 11340 30720 629 2048
+14 36444 30720 1111 2048
+15 42476 30720 1111 2048
+16 12142 30720 631 2048
+17 12230 30720 631 2048
 18 -1 -1 -1 -1
 19 -1 -1 -1 -1
 20 -1 -1 -1 -1

diff --git a/examples/MemoryBenchmark/samd21.txt b/examples/MemoryBenchmark/samd21.txt
@@ -2,24 +2,24 @@
 1 34372 262144
 2 35116 262144
 3 35100 262144
-4 38828 262144
-5 39188 262144
-6 38932 262144
-7 54692 262144
-8 62940 262144
-9 39396 262144
-10 39452 262144
-11 40788 262144
-12 41164 262144
-13 40892 262144
-14 73740 262144
-15 82964 262144
-16 41364 262144
-17 41420 262144
-18 41492 262144
-19 42716 262144
-20 41596 262144
-21 121292 262144
-22 130524 262144
-23 42068 262144
-24 42116 262144
+4 38924 262144
+5 39284 262144
+6 39028 262144
+7 54956 262144
+8 63204 262144
+9 39524 262144
+10 39580 262144
+11 40852 262144
+12 41228 262144
+13 40956 262144
+14 73804 262144
+15 83036 262144
+16 41444 262144
+17 41508 262144
+18 41564 262144
+19 42788 262144
+20 41668 262144
+21 121364 262144
+22 130596 262144
+23 42156 262144
+24 42212 262144
diff --git a/examples/MemoryBenchmark/samd51.txt b/examples/MemoryBenchmark/samd51.txt
@@ -2,24 +2,24 @@
 1 10872 507904
 2 11544 507904
 3 11536 507904
-4 15328 507904
-5 15696 507904
-6 15448 507904
-7 31212 507904
-8 39460 507904
-9 15908 507904
-10 15956 507904
-11 17084 507904
-12 17472 507904
-13 17200 507904
-14 50052 507904
-15 59280 507904
-16 17660 507904
-17 17708 507904
-18 17768 507904
-19 19004 507904
-20 17884 507904
-21 97584 507904
-22 106816 507904
-23 18344 507904
-24 18388 507904
+4 15400 507904
+5 15768 507904
+6 15520 507904
+7 31452 507904
+8 39700 507904
+9 16008 507904
+10 16060 507904
+11 17116 507904
+12 17504 507904
+13 17232 507904
+14 50084 507904
+15 59312 507904
+16 17720 507904
+17 17772 507904
+18 17796 507904
+19 19032 507904
+20 17912 507904
+21 97612 507904
+22 106844 507904
+23 18400 507904
+24 18448 507904
diff --git a/examples/MemoryBenchmark/stm32.txt b/examples/MemoryBenchmark/stm32.txt
@@ -2,24 +2,24 @@
 1 21848 131072 3856 20480
 2 21928 131072 3872 20480
 3 22504 131072 3848 20480
-4 26236 131072 4056 20480
-5 26604 131072 4264 20480
-6 26356 131072 4076 20480
-7 42488 131072 4076 20480
-8 51020 131072 4076 20480
-9 26792 131072 4080 20480
-10 26872 131072 4080 20480
-11 27984 131072 4644 20480
-12 28364 131072 5440 20480
-13 28100 131072 4652 20480
-14 61388 131072 4652 20480
-15 70960 131072 4652 20480
-16 28532 131072 4656 20480
-17 28608 131072 4656 20480
-18 28684 131072 4644 20480
-19 29920 131072 5440 20480
-20 28800 131072 4652 20480
-21 108936 131072 4652 20480
-22 118508 131072 4652 20480
-23 29232 131072 4656 20480
-24 29304 131072 4656 20480
+4 26316 131072 4056 20480
+5 26688 131072 4264 20480
+6 26436 131072 4076 20480
+7 42740 131072 4076 20480
+8 51272 131072 4076 20480
+9 26904 131072 4080 20480
+10 26980 131072 4080 20480
+11 28020 131072 4580 20480
+12 28400 131072 5312 20480
+13 28136 131072 4588 20480
+14 61424 131072 4588 20480
+15 70996 131072 4588 20480
+16 28600 131072 4592 20480
+17 28676 131072 4592 20480
+18 28716 131072 4580 20480
+19 29952 131072 5312 20480
+20 28832 131072 4588 20480
+21 108968 131072 4588 20480
+22 118540 131072 4588 20480
+23 29296 131072 4592 20480
+24 29368 131072 4592 20480