From b9ef831ff780526e6bbc24b60aa69bdcbd82880e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20Buga?= Date: Thu, 28 Sep 2023 09:39:12 +0200 Subject: [PATCH 1/2] Add 80MHz tick rate --- embassy-time/CHANGELOG.md | 4 ++++ embassy-time/Cargo.toml | 3 ++- embassy-time/gen_tick.py | 1 + embassy-time/src/tick.rs | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/embassy-time/CHANGELOG.md b/embassy-time/CHANGELOG.md index 8bf02dbc1..4389e6ce5 100644 --- a/embassy-time/CHANGELOG.md +++ b/embassy-time/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 0.1.4 - ??? + +- Added `tick-hz-80_000_000` + ## 0.1.3 - 2023-08-28 - Update `embedded-hal-async` to `1.0.0-rc.1` diff --git a/embassy-time/Cargo.toml b/embassy-time/Cargo.toml index 03aa6ca2b..a290509d3 100644 --- a/embassy-time/Cargo.toml +++ b/embassy-time/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "embassy-time" -version = "0.1.3" +version = "0.1.4" edition = "2021" description = "Instant and Duration for embedded no-std systems, with async timer support" repository = "https://github.com/embassy-rs/embassy" @@ -145,6 +145,7 @@ tick-hz-384_000_000 = [] tick-hz-512_000_000 = [] tick-hz-576_000_000 = [] tick-hz-768_000_000 = [] +tick-hz-80_000_000 = [] # END TICKS [dependencies] diff --git a/embassy-time/gen_tick.py b/embassy-time/gen_tick.py index 15e65187b..804b6bb43 100644 --- a/embassy-time/gen_tick.py +++ b/embassy-time/gen_tick.py @@ -17,6 +17,7 @@ for i in range(1, 10): ticks.append(2**i * 1000000) ticks.append(2**i * 9 // 8 * 1000000) ticks.append(2**i * 3 // 2 * 1000000) +ticks.append(80_000_000) seen = set() ticks = [x for x in ticks if not (x in seen or seen.add(x))] diff --git a/embassy-time/src/tick.rs b/embassy-time/src/tick.rs index 608bc44f1..0a4a02761 100644 --- a/embassy-time/src/tick.rs +++ b/embassy-time/src/tick.rs @@ -156,6 +156,8 @@ pub const TICK_HZ: u64 = 512_000_000; pub const TICK_HZ: u64 = 576_000_000; #[cfg(feature = "tick-hz-768_000_000")] pub const TICK_HZ: u64 = 768_000_000; +#[cfg(feature = "tick-hz-80_000_000")] +pub const TICK_HZ: u64 = 80_000_000; #[cfg(not(any( feature = "tick-hz-1", feature = "tick-hz-10", @@ -235,5 +237,6 @@ pub const TICK_HZ: u64 = 768_000_000; feature = "tick-hz-512_000_000", feature = "tick-hz-576_000_000", feature = "tick-hz-768_000_000", + feature = "tick-hz-80_000_000", )))] pub const TICK_HZ: u64 = 1_000_000; From e8a462768e42871eb721274c3b950f51c6f65b9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20Buga?= Date: Thu, 28 Sep 2023 18:56:16 +0200 Subject: [PATCH 2/2] Add more tick rates --- embassy-time/CHANGELOG.md | 2 +- embassy-time/Cargo.toml | 61 +++++++++++++ embassy-time/gen_tick.py | 5 +- embassy-time/src/tick.rs | 183 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 249 insertions(+), 2 deletions(-) diff --git a/embassy-time/CHANGELOG.md b/embassy-time/CHANGELOG.md index 4389e6ce5..e3b38455c 100644 --- a/embassy-time/CHANGELOG.md +++ b/embassy-time/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## 0.1.4 - ??? -- Added `tick-hz-80_000_000` +- Added more tick rates ## 0.1.3 - 2023-08-28 diff --git a/embassy-time/Cargo.toml b/embassy-time/Cargo.toml index a290509d3..8f034a9de 100644 --- a/embassy-time/Cargo.toml +++ b/embassy-time/Cargo.toml @@ -145,7 +145,68 @@ tick-hz-384_000_000 = [] tick-hz-512_000_000 = [] tick-hz-576_000_000 = [] tick-hz-768_000_000 = [] +tick-hz-20_000_000 = [] +tick-hz-30_000_000 = [] +tick-hz-40_000_000 = [] +tick-hz-50_000_000 = [] +tick-hz-60_000_000 = [] +tick-hz-70_000_000 = [] tick-hz-80_000_000 = [] +tick-hz-90_000_000 = [] +tick-hz-110_000_000 = [] +tick-hz-120_000_000 = [] +tick-hz-130_000_000 = [] +tick-hz-140_000_000 = [] +tick-hz-150_000_000 = [] +tick-hz-160_000_000 = [] +tick-hz-170_000_000 = [] +tick-hz-180_000_000 = [] +tick-hz-190_000_000 = [] +tick-hz-200_000_000 = [] +tick-hz-210_000_000 = [] +tick-hz-220_000_000 = [] +tick-hz-230_000_000 = [] +tick-hz-240_000_000 = [] +tick-hz-250_000_000 = [] +tick-hz-260_000_000 = [] +tick-hz-270_000_000 = [] +tick-hz-280_000_000 = [] +tick-hz-290_000_000 = [] +tick-hz-300_000_000 = [] +tick-hz-320_000_000 = [] +tick-hz-340_000_000 = [] +tick-hz-360_000_000 = [] +tick-hz-380_000_000 = [] +tick-hz-400_000_000 = [] +tick-hz-420_000_000 = [] +tick-hz-440_000_000 = [] +tick-hz-460_000_000 = [] +tick-hz-480_000_000 = [] +tick-hz-500_000_000 = [] +tick-hz-520_000_000 = [] +tick-hz-540_000_000 = [] +tick-hz-560_000_000 = [] +tick-hz-580_000_000 = [] +tick-hz-600_000_000 = [] +tick-hz-620_000_000 = [] +tick-hz-640_000_000 = [] +tick-hz-660_000_000 = [] +tick-hz-680_000_000 = [] +tick-hz-700_000_000 = [] +tick-hz-720_000_000 = [] +tick-hz-740_000_000 = [] +tick-hz-760_000_000 = [] +tick-hz-780_000_000 = [] +tick-hz-800_000_000 = [] +tick-hz-820_000_000 = [] +tick-hz-840_000_000 = [] +tick-hz-860_000_000 = [] +tick-hz-880_000_000 = [] +tick-hz-900_000_000 = [] +tick-hz-920_000_000 = [] +tick-hz-940_000_000 = [] +tick-hz-960_000_000 = [] +tick-hz-980_000_000 = [] # END TICKS [dependencies] diff --git a/embassy-time/gen_tick.py b/embassy-time/gen_tick.py index 804b6bb43..67a4c79c8 100644 --- a/embassy-time/gen_tick.py +++ b/embassy-time/gen_tick.py @@ -17,7 +17,10 @@ for i in range(1, 10): ticks.append(2**i * 1000000) ticks.append(2**i * 9 // 8 * 1000000) ticks.append(2**i * 3 // 2 * 1000000) -ticks.append(80_000_000) +for i in range(1, 30): + ticks.append(10 * i * 1_000_000) +for i in range(15, 50): + ticks.append(20 * i * 1_000_000) seen = set() ticks = [x for x in ticks if not (x in seen or seen.add(x))] diff --git a/embassy-time/src/tick.rs b/embassy-time/src/tick.rs index 0a4a02761..be544181a 100644 --- a/embassy-time/src/tick.rs +++ b/embassy-time/src/tick.rs @@ -156,8 +156,130 @@ pub const TICK_HZ: u64 = 512_000_000; pub const TICK_HZ: u64 = 576_000_000; #[cfg(feature = "tick-hz-768_000_000")] pub const TICK_HZ: u64 = 768_000_000; +#[cfg(feature = "tick-hz-20_000_000")] +pub const TICK_HZ: u64 = 20_000_000; +#[cfg(feature = "tick-hz-30_000_000")] +pub const TICK_HZ: u64 = 30_000_000; +#[cfg(feature = "tick-hz-40_000_000")] +pub const TICK_HZ: u64 = 40_000_000; +#[cfg(feature = "tick-hz-50_000_000")] +pub const TICK_HZ: u64 = 50_000_000; +#[cfg(feature = "tick-hz-60_000_000")] +pub const TICK_HZ: u64 = 60_000_000; +#[cfg(feature = "tick-hz-70_000_000")] +pub const TICK_HZ: u64 = 70_000_000; #[cfg(feature = "tick-hz-80_000_000")] pub const TICK_HZ: u64 = 80_000_000; +#[cfg(feature = "tick-hz-90_000_000")] +pub const TICK_HZ: u64 = 90_000_000; +#[cfg(feature = "tick-hz-110_000_000")] +pub const TICK_HZ: u64 = 110_000_000; +#[cfg(feature = "tick-hz-120_000_000")] +pub const TICK_HZ: u64 = 120_000_000; +#[cfg(feature = "tick-hz-130_000_000")] +pub const TICK_HZ: u64 = 130_000_000; +#[cfg(feature = "tick-hz-140_000_000")] +pub const TICK_HZ: u64 = 140_000_000; +#[cfg(feature = "tick-hz-150_000_000")] +pub const TICK_HZ: u64 = 150_000_000; +#[cfg(feature = "tick-hz-160_000_000")] +pub const TICK_HZ: u64 = 160_000_000; +#[cfg(feature = "tick-hz-170_000_000")] +pub const TICK_HZ: u64 = 170_000_000; +#[cfg(feature = "tick-hz-180_000_000")] +pub const TICK_HZ: u64 = 180_000_000; +#[cfg(feature = "tick-hz-190_000_000")] +pub const TICK_HZ: u64 = 190_000_000; +#[cfg(feature = "tick-hz-200_000_000")] +pub const TICK_HZ: u64 = 200_000_000; +#[cfg(feature = "tick-hz-210_000_000")] +pub const TICK_HZ: u64 = 210_000_000; +#[cfg(feature = "tick-hz-220_000_000")] +pub const TICK_HZ: u64 = 220_000_000; +#[cfg(feature = "tick-hz-230_000_000")] +pub const TICK_HZ: u64 = 230_000_000; +#[cfg(feature = "tick-hz-240_000_000")] +pub const TICK_HZ: u64 = 240_000_000; +#[cfg(feature = "tick-hz-250_000_000")] +pub const TICK_HZ: u64 = 250_000_000; +#[cfg(feature = "tick-hz-260_000_000")] +pub const TICK_HZ: u64 = 260_000_000; +#[cfg(feature = "tick-hz-270_000_000")] +pub const TICK_HZ: u64 = 270_000_000; +#[cfg(feature = "tick-hz-280_000_000")] +pub const TICK_HZ: u64 = 280_000_000; +#[cfg(feature = "tick-hz-290_000_000")] +pub const TICK_HZ: u64 = 290_000_000; +#[cfg(feature = "tick-hz-300_000_000")] +pub const TICK_HZ: u64 = 300_000_000; +#[cfg(feature = "tick-hz-320_000_000")] +pub const TICK_HZ: u64 = 320_000_000; +#[cfg(feature = "tick-hz-340_000_000")] +pub const TICK_HZ: u64 = 340_000_000; +#[cfg(feature = "tick-hz-360_000_000")] +pub const TICK_HZ: u64 = 360_000_000; +#[cfg(feature = "tick-hz-380_000_000")] +pub const TICK_HZ: u64 = 380_000_000; +#[cfg(feature = "tick-hz-400_000_000")] +pub const TICK_HZ: u64 = 400_000_000; +#[cfg(feature = "tick-hz-420_000_000")] +pub const TICK_HZ: u64 = 420_000_000; +#[cfg(feature = "tick-hz-440_000_000")] +pub const TICK_HZ: u64 = 440_000_000; +#[cfg(feature = "tick-hz-460_000_000")] +pub const TICK_HZ: u64 = 460_000_000; +#[cfg(feature = "tick-hz-480_000_000")] +pub const TICK_HZ: u64 = 480_000_000; +#[cfg(feature = "tick-hz-500_000_000")] +pub const TICK_HZ: u64 = 500_000_000; +#[cfg(feature = "tick-hz-520_000_000")] +pub const TICK_HZ: u64 = 520_000_000; +#[cfg(feature = "tick-hz-540_000_000")] +pub const TICK_HZ: u64 = 540_000_000; +#[cfg(feature = "tick-hz-560_000_000")] +pub const TICK_HZ: u64 = 560_000_000; +#[cfg(feature = "tick-hz-580_000_000")] +pub const TICK_HZ: u64 = 580_000_000; +#[cfg(feature = "tick-hz-600_000_000")] +pub const TICK_HZ: u64 = 600_000_000; +#[cfg(feature = "tick-hz-620_000_000")] +pub const TICK_HZ: u64 = 620_000_000; +#[cfg(feature = "tick-hz-640_000_000")] +pub const TICK_HZ: u64 = 640_000_000; +#[cfg(feature = "tick-hz-660_000_000")] +pub const TICK_HZ: u64 = 660_000_000; +#[cfg(feature = "tick-hz-680_000_000")] +pub const TICK_HZ: u64 = 680_000_000; +#[cfg(feature = "tick-hz-700_000_000")] +pub const TICK_HZ: u64 = 700_000_000; +#[cfg(feature = "tick-hz-720_000_000")] +pub const TICK_HZ: u64 = 720_000_000; +#[cfg(feature = "tick-hz-740_000_000")] +pub const TICK_HZ: u64 = 740_000_000; +#[cfg(feature = "tick-hz-760_000_000")] +pub const TICK_HZ: u64 = 760_000_000; +#[cfg(feature = "tick-hz-780_000_000")] +pub const TICK_HZ: u64 = 780_000_000; +#[cfg(feature = "tick-hz-800_000_000")] +pub const TICK_HZ: u64 = 800_000_000; +#[cfg(feature = "tick-hz-820_000_000")] +pub const TICK_HZ: u64 = 820_000_000; +#[cfg(feature = "tick-hz-840_000_000")] +pub const TICK_HZ: u64 = 840_000_000; +#[cfg(feature = "tick-hz-860_000_000")] +pub const TICK_HZ: u64 = 860_000_000; +#[cfg(feature = "tick-hz-880_000_000")] +pub const TICK_HZ: u64 = 880_000_000; +#[cfg(feature = "tick-hz-900_000_000")] +pub const TICK_HZ: u64 = 900_000_000; +#[cfg(feature = "tick-hz-920_000_000")] +pub const TICK_HZ: u64 = 920_000_000; +#[cfg(feature = "tick-hz-940_000_000")] +pub const TICK_HZ: u64 = 940_000_000; +#[cfg(feature = "tick-hz-960_000_000")] +pub const TICK_HZ: u64 = 960_000_000; +#[cfg(feature = "tick-hz-980_000_000")] +pub const TICK_HZ: u64 = 980_000_000; #[cfg(not(any( feature = "tick-hz-1", feature = "tick-hz-10", @@ -237,6 +359,67 @@ pub const TICK_HZ: u64 = 80_000_000; feature = "tick-hz-512_000_000", feature = "tick-hz-576_000_000", feature = "tick-hz-768_000_000", + feature = "tick-hz-20_000_000", + feature = "tick-hz-30_000_000", + feature = "tick-hz-40_000_000", + feature = "tick-hz-50_000_000", + feature = "tick-hz-60_000_000", + feature = "tick-hz-70_000_000", feature = "tick-hz-80_000_000", + feature = "tick-hz-90_000_000", + feature = "tick-hz-110_000_000", + feature = "tick-hz-120_000_000", + feature = "tick-hz-130_000_000", + feature = "tick-hz-140_000_000", + feature = "tick-hz-150_000_000", + feature = "tick-hz-160_000_000", + feature = "tick-hz-170_000_000", + feature = "tick-hz-180_000_000", + feature = "tick-hz-190_000_000", + feature = "tick-hz-200_000_000", + feature = "tick-hz-210_000_000", + feature = "tick-hz-220_000_000", + feature = "tick-hz-230_000_000", + feature = "tick-hz-240_000_000", + feature = "tick-hz-250_000_000", + feature = "tick-hz-260_000_000", + feature = "tick-hz-270_000_000", + feature = "tick-hz-280_000_000", + feature = "tick-hz-290_000_000", + feature = "tick-hz-300_000_000", + feature = "tick-hz-320_000_000", + feature = "tick-hz-340_000_000", + feature = "tick-hz-360_000_000", + feature = "tick-hz-380_000_000", + feature = "tick-hz-400_000_000", + feature = "tick-hz-420_000_000", + feature = "tick-hz-440_000_000", + feature = "tick-hz-460_000_000", + feature = "tick-hz-480_000_000", + feature = "tick-hz-500_000_000", + feature = "tick-hz-520_000_000", + feature = "tick-hz-540_000_000", + feature = "tick-hz-560_000_000", + feature = "tick-hz-580_000_000", + feature = "tick-hz-600_000_000", + feature = "tick-hz-620_000_000", + feature = "tick-hz-640_000_000", + feature = "tick-hz-660_000_000", + feature = "tick-hz-680_000_000", + feature = "tick-hz-700_000_000", + feature = "tick-hz-720_000_000", + feature = "tick-hz-740_000_000", + feature = "tick-hz-760_000_000", + feature = "tick-hz-780_000_000", + feature = "tick-hz-800_000_000", + feature = "tick-hz-820_000_000", + feature = "tick-hz-840_000_000", + feature = "tick-hz-860_000_000", + feature = "tick-hz-880_000_000", + feature = "tick-hz-900_000_000", + feature = "tick-hz-920_000_000", + feature = "tick-hz-940_000_000", + feature = "tick-hz-960_000_000", + feature = "tick-hz-980_000_000", )))] pub const TICK_HZ: u64 = 1_000_000;