aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2025-11-25 15:45:42 +0000
committerGitHub <[email protected]>2025-11-25 15:45:42 +0000
commite930b262df45599d1a7cb4e50e0e8b03dd101dda (patch)
tree1e67d9461b9242d1dcc13a595af559a3a858084b
parent1f9c436afe6b0bcb306803d916e28df9e910479c (diff)
parent2632bc42e02a4162680cefaf9f08689952907c0b (diff)
Merge pull request #4945 from MatanRad/added-375khz-clock
Added 375KHz Clock Support
-rw-r--r--embassy-time-driver/CHANGELOG.md3
-rw-r--r--embassy-time-driver/Cargo.toml2
-rw-r--r--embassy-time-driver/gen_tick.py3
-rw-r--r--embassy-time-driver/src/tick.rs3
-rw-r--r--embassy-time/CHANGELOG.md1
-rw-r--r--embassy-time/Cargo.toml2
6 files changed, 12 insertions, 2 deletions
diff --git a/embassy-time-driver/CHANGELOG.md b/embassy-time-driver/CHANGELOG.md
index cdd432437..4951f8c3e 100644
--- a/embassy-time-driver/CHANGELOG.md
+++ b/embassy-time-driver/CHANGELOG.md
@@ -11,7 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
11## 0.2.1 - 2025-08-26 11## 0.2.1 - 2025-08-26
12 12
13- Allow inlining on time driver boundary 13- Allow inlining on time driver boundary
14- add 133MHz tick rate to support PR2040 @ 133MHz when `TIMERx`'s `SOURCE` is set to `SYSCLK` 14- Add 133MHz tick rate to support PR2040 @ 133MHz when `TIMERx`'s `SOURCE` is set to `SYSCLK`
15- Add 375KHz tick rate support
15 16
16## 0.2.0 - 2025-01-02 17## 0.2.0 - 2025-01-02
17 18
diff --git a/embassy-time-driver/Cargo.toml b/embassy-time-driver/Cargo.toml
index a52e82433..cbb6168b9 100644
--- a/embassy-time-driver/Cargo.toml
+++ b/embassy-time-driver/Cargo.toml
@@ -118,6 +118,8 @@ tick-hz-256_000 = []
118tick-hz-262_144 = [] 118tick-hz-262_144 = []
119## 320.0kHz Tick Rate 119## 320.0kHz Tick Rate
120tick-hz-320_000 = [] 120tick-hz-320_000 = []
121## 375.0kHz Tick Rate
122tick-hz-375_000 = []
121## 512.0kHz Tick Rate 123## 512.0kHz Tick Rate
122tick-hz-512_000 = [] 124tick-hz-512_000 = []
123## 524.288kHz Tick Rate 125## 524.288kHz Tick Rate
diff --git a/embassy-time-driver/gen_tick.py b/embassy-time-driver/gen_tick.py
index 080434457..3cb6552df 100644
--- a/embassy-time-driver/gen_tick.py
+++ b/embassy-time-driver/gen_tick.py
@@ -1,5 +1,4 @@
1import os 1import os
2from glob import glob
3 2
4abspath = os.path.abspath(__file__) 3abspath = os.path.abspath(__file__)
5dname = os.path.dirname(abspath) 4dname = os.path.dirname(abspath)
@@ -22,6 +21,8 @@ for i in range(1, 30):
22 ticks.append(10 * i * 1_000_000) 21 ticks.append(10 * i * 1_000_000)
23for i in range(15, 50): 22for i in range(15, 50):
24 ticks.append(20 * i * 1_000_000) 23 ticks.append(20 * i * 1_000_000)
24
25ticks.append(375 * 1000)
25ticks.append(133 * 1_000_000) 26ticks.append(133 * 1_000_000)
26 27
27seen = set() 28seen = set()
diff --git a/embassy-time-driver/src/tick.rs b/embassy-time-driver/src/tick.rs
index 5059e1628..247ec9ab3 100644
--- a/embassy-time-driver/src/tick.rs
+++ b/embassy-time-driver/src/tick.rs
@@ -74,6 +74,8 @@ pub const TICK_HZ: u64 = 256_000;
74pub const TICK_HZ: u64 = 262_144; 74pub const TICK_HZ: u64 = 262_144;
75#[cfg(feature = "tick-hz-320_000")] 75#[cfg(feature = "tick-hz-320_000")]
76pub const TICK_HZ: u64 = 320_000; 76pub const TICK_HZ: u64 = 320_000;
77#[cfg(feature = "tick-hz-375_000")]
78pub const TICK_HZ: u64 = 375_000;
77#[cfg(feature = "tick-hz-512_000")] 79#[cfg(feature = "tick-hz-512_000")]
78pub const TICK_HZ: u64 = 512_000; 80pub const TICK_HZ: u64 = 512_000;
79#[cfg(feature = "tick-hz-524_288")] 81#[cfg(feature = "tick-hz-524_288")]
@@ -358,6 +360,7 @@ pub const TICK_HZ: u64 = 5_242_880_000;
358 feature = "tick-hz-256_000", 360 feature = "tick-hz-256_000",
359 feature = "tick-hz-262_144", 361 feature = "tick-hz-262_144",
360 feature = "tick-hz-320_000", 362 feature = "tick-hz-320_000",
363 feature = "tick-hz-375_000",
361 feature = "tick-hz-512_000", 364 feature = "tick-hz-512_000",
362 feature = "tick-hz-524_288", 365 feature = "tick-hz-524_288",
363 feature = "tick-hz-640_000", 366 feature = "tick-hz-640_000",
diff --git a/embassy-time/CHANGELOG.md b/embassy-time/CHANGELOG.md
index 4a50da8ef..17f8a3837 100644
--- a/embassy-time/CHANGELOG.md
+++ b/embassy-time/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
9## Unreleased - ReleaseDate 9## Unreleased - ReleaseDate
10 10
11- Add as_nanos and from_nanos where missing 11- Add as_nanos and from_nanos where missing
12- Added 375KHz tick rate support
12 13
13## 0.5.0 - 2025-08-26 14## 0.5.0 - 2025-08-26
14 15
diff --git a/embassy-time/Cargo.toml b/embassy-time/Cargo.toml
index 05614dbf5..a7ed51e78 100644
--- a/embassy-time/Cargo.toml
+++ b/embassy-time/Cargo.toml
@@ -178,6 +178,8 @@ tick-hz-256_000 = ["embassy-time-driver/tick-hz-256_000"]
178tick-hz-262_144 = ["embassy-time-driver/tick-hz-262_144"] 178tick-hz-262_144 = ["embassy-time-driver/tick-hz-262_144"]
179## 320.0kHz Tick Rate 179## 320.0kHz Tick Rate
180tick-hz-320_000 = ["embassy-time-driver/tick-hz-320_000"] 180tick-hz-320_000 = ["embassy-time-driver/tick-hz-320_000"]
181## 375.0kHz Tick Rate
182tick-hz-375_000 = ["embassy-time-driver/tick-hz-375_000"]
181## 512.0kHz Tick Rate 183## 512.0kHz Tick Rate
182tick-hz-512_000 = ["embassy-time-driver/tick-hz-512_000"] 184tick-hz-512_000 = ["embassy-time-driver/tick-hz-512_000"]
183## 524.288kHz Tick Rate 185## 524.288kHz Tick Rate