diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-05-31 21:55:40 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-05-31 21:55:40 +0000 |
| commit | 0adb4c926b15f9773fb83497a7bf1eb3789286da (patch) | |
| tree | e94f12eea8a64a3dd22eaef7400f02714ea2fb59 /examples/boot | |
| parent | a0d43c863dd9859e94e5d202d5b5bb6b107f152c (diff) | |
| parent | 108967417562cf398ba264295014d9e18f2c0707 (diff) | |
Merge #784
784: stm32: make tick rate configurable r=Dirbaio a=willglynn
The stm32 time drivers support arbitrary tick rates but the associated Cargo features do not. Enabling any time driver presently enables `embassy/time-tick-32768hz`; instead, enable only `embassy/time`.
Additionally, `embassy/time` now functions in the absence of any `embassy/time-tick-*` feature, defaulting to 32768 Hz if left unspecified.
Co-authored-by: Will Glynn <[email protected]>
Co-authored-by: Dario Nieuwenhuis <[email protected]>
Diffstat (limited to 'examples/boot')
| -rw-r--r-- | examples/boot/stm32f3/Cargo.toml | 2 | ||||
| -rw-r--r-- | examples/boot/stm32f7/Cargo.toml | 2 | ||||
| -rw-r--r-- | examples/boot/stm32h7/Cargo.toml | 2 | ||||
| -rw-r--r-- | examples/boot/stm32l0/Cargo.toml | 4 | ||||
| -rw-r--r-- | examples/boot/stm32l0/README.md | 2 | ||||
| -rw-r--r-- | examples/boot/stm32l1/Cargo.toml | 2 | ||||
| -rw-r--r-- | examples/boot/stm32l4/Cargo.toml | 2 | ||||
| -rw-r--r-- | examples/boot/stm32wl/Cargo.toml | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/examples/boot/stm32f3/Cargo.toml b/examples/boot/stm32f3/Cargo.toml index fab6fd723..63cdf6234 100644 --- a/examples/boot/stm32f3/Cargo.toml +++ b/examples/boot/stm32f3/Cargo.toml | |||
| @@ -5,7 +5,7 @@ name = "embassy-boot-stm32f3-examples" | |||
| 5 | version = "0.1.0" | 5 | version = "0.1.0" |
| 6 | 6 | ||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] } | 8 | embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly", "time-tick-32768hz"] } |
| 9 | embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f303re", "time-driver-any", "exti"] } | 9 | embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f303re", "time-driver-any", "exti"] } |
| 10 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } | 10 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } |
| 11 | embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" } | 11 | embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" } |
diff --git a/examples/boot/stm32f7/Cargo.toml b/examples/boot/stm32f7/Cargo.toml index 14500b198..ce0773b22 100644 --- a/examples/boot/stm32f7/Cargo.toml +++ b/examples/boot/stm32f7/Cargo.toml | |||
| @@ -5,7 +5,7 @@ name = "embassy-boot-stm32f7-examples" | |||
| 5 | version = "0.1.0" | 5 | version = "0.1.0" |
| 6 | 6 | ||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] } | 8 | embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly", "time-tick-32768hz"] } |
| 9 | embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f767zi", "time-driver-any", "exti"] } | 9 | embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f767zi", "time-driver-any", "exti"] } |
| 10 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } | 10 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } |
| 11 | embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" } | 11 | embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" } |
diff --git a/examples/boot/stm32h7/Cargo.toml b/examples/boot/stm32h7/Cargo.toml index 3069277ed..fddf4cfdb 100644 --- a/examples/boot/stm32h7/Cargo.toml +++ b/examples/boot/stm32h7/Cargo.toml | |||
| @@ -5,7 +5,7 @@ name = "embassy-boot-stm32f7-examples" | |||
| 5 | version = "0.1.0" | 5 | version = "0.1.0" |
| 6 | 6 | ||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] } | 8 | embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly", "time-tick-32768hz"] } |
| 9 | embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32h743zi", "time-driver-any", "exti"] } | 9 | embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32h743zi", "time-driver-any", "exti"] } |
| 10 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } | 10 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } |
| 11 | embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" } | 11 | embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" } |
diff --git a/examples/boot/stm32l0/Cargo.toml b/examples/boot/stm32l0/Cargo.toml index 13ca84367..b6fe9ee65 100644 --- a/examples/boot/stm32l0/Cargo.toml +++ b/examples/boot/stm32l0/Cargo.toml | |||
| @@ -5,9 +5,9 @@ name = "embassy-boot-stm32l0-examples" | |||
| 5 | version = "0.1.0" | 5 | version = "0.1.0" |
| 6 | 6 | ||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] } | 8 | embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly", "time-tick-32768hz"] } |
| 9 | embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l072cz", "time-driver-any", "exti", "memory-x"] } | 9 | embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l072cz", "time-driver-any", "exti", "memory-x"] } |
| 10 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32", features = ["thumbv6"] } | 10 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } |
| 11 | embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" } | 11 | embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" } |
| 12 | 12 | ||
| 13 | defmt = { version = "0.3", optional = true } | 13 | defmt = { version = "0.3", optional = true } |
diff --git a/examples/boot/stm32l0/README.md b/examples/boot/stm32l0/README.md index b498fdc2d..a0e8021fc 100644 --- a/examples/boot/stm32l0/README.md +++ b/examples/boot/stm32l0/README.md | |||
| @@ -15,7 +15,7 @@ application. | |||
| 15 | 15 | ||
| 16 | ``` | 16 | ``` |
| 17 | # Flash bootloader | 17 | # Flash bootloader |
| 18 | cargo flash --manifest-path ../../../embassy-boot/stm32/Cargo.toml --release --features embassy-stm32/stm32l072cz,thumbv6 --chip STM32L072CZTx | 18 | cargo flash --manifest-path ../../../embassy-boot/stm32/Cargo.toml --release --features embassy-stm32/stm32l072cz --chip STM32L072CZTx |
| 19 | # Build 'b' | 19 | # Build 'b' |
| 20 | cargo build --release --bin b | 20 | cargo build --release --bin b |
| 21 | # Generate binary for 'b' | 21 | # Generate binary for 'b' |
diff --git a/examples/boot/stm32l1/Cargo.toml b/examples/boot/stm32l1/Cargo.toml index b0b6e3d25..d3c66323e 100644 --- a/examples/boot/stm32l1/Cargo.toml +++ b/examples/boot/stm32l1/Cargo.toml | |||
| @@ -5,7 +5,7 @@ name = "embassy-boot-stm32l1-examples" | |||
| 5 | version = "0.1.0" | 5 | version = "0.1.0" |
| 6 | 6 | ||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] } | 8 | embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly", "time-tick-32768hz"] } |
| 9 | embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l151cb-a", "time-driver-any", "exti"] } | 9 | embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l151cb-a", "time-driver-any", "exti"] } |
| 10 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } | 10 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } |
| 11 | embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" } | 11 | embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" } |
diff --git a/examples/boot/stm32l4/Cargo.toml b/examples/boot/stm32l4/Cargo.toml index 705dbd0d6..234ea9b5c 100644 --- a/examples/boot/stm32l4/Cargo.toml +++ b/examples/boot/stm32l4/Cargo.toml | |||
| @@ -5,7 +5,7 @@ name = "embassy-boot-stm32l4-examples" | |||
| 5 | version = "0.1.0" | 5 | version = "0.1.0" |
| 6 | 6 | ||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] } | 8 | embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly", "time-tick-32768hz"] } |
| 9 | embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l475vg", "time-driver-any", "exti"] } | 9 | embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l475vg", "time-driver-any", "exti"] } |
| 10 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } | 10 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } |
| 11 | embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" } | 11 | embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" } |
diff --git a/examples/boot/stm32wl/Cargo.toml b/examples/boot/stm32wl/Cargo.toml index 41e6a112e..b6062b6a6 100644 --- a/examples/boot/stm32wl/Cargo.toml +++ b/examples/boot/stm32wl/Cargo.toml | |||
| @@ -5,7 +5,7 @@ name = "embassy-boot-stm32wl-examples" | |||
| 5 | version = "0.1.0" | 5 | version = "0.1.0" |
| 6 | 6 | ||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] } | 8 | embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly", "time-tick-32768hz"] } |
| 9 | embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32wl55jc-cm4", "time-driver-any", "exti"] } | 9 | embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32wl55jc-cm4", "time-driver-any", "exti"] } |
| 10 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } | 10 | embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } |
| 11 | embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" } | 11 | embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" } |
