diff options
| author | Ghaith Oueslati <[email protected]> | 2023-06-12 14:28:23 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-06-12 14:28:23 +0100 |
| commit | cf83f6820cf2c6ece607cd60cfdab9d5e47efd04 (patch) | |
| tree | 6485dacac7e61c4378ac522e709edb0a86bd7523 /tests/stm32 | |
| parent | 2dd5ce83ec0421564e85b667f5dabd592f313e5c (diff) | |
| parent | 2d89cfb18f00aefbfa108728dfea3398e80ea3e4 (diff) | |
Merge pull request #3 from OueslatiGhaith/master
fix merge conflicts
Diffstat (limited to 'tests/stm32')
| -rw-r--r-- | tests/stm32/Cargo.toml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/stm32/Cargo.toml b/tests/stm32/Cargo.toml index f1b0ba121..3f48bf3f1 100644 --- a/tests/stm32/Cargo.toml +++ b/tests/stm32/Cargo.toml | |||
| @@ -25,7 +25,7 @@ not-gpdma = [] | |||
| 25 | teleprobe-meta = "1" | 25 | teleprobe-meta = "1" |
| 26 | 26 | ||
| 27 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 27 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } |
| 28 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | 28 | embassy-executor = { version = "0.2.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } |
| 29 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "tick-hz-32_768", "defmt-timestamp-uptime"] } | 29 | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "tick-hz-32_768", "defmt-timestamp-uptime"] } |
| 30 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "memory-x", "time-driver-any"] } | 30 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "memory-x", "time-driver-any"] } |
| 31 | embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } | 31 | embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } |
