Skip to content

Switched to embassy_time 0.4.0 and embassy_executor 0.7.0 #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ defmt = { version = "0.3.8", optional = true }

embassy-sync = { version = "0.6.0" }
embassy-futures = { version = "0.1.1" }
embassy-time-driver = { version = "0.1.0", optional = true }
embassy-time = { version = "0.3.2", optional = true }
embassy-time-queue-utils = { version = "0.1", optional = true }
embassy-time-driver = { version = "0.2.0", optional = true }
embassy-time = { version = "0.4.0", optional = true }
embassy-usb-driver = "0.1.0"

nb = "1.1.0"
Expand All @@ -59,6 +60,7 @@ default = ["embassy", "rt"]
rt = ["dep:qingke-rt"]
highcode = ["qingke-rt/highcode"]
embassy = [
"dep:embassy-time-queue-utils",
"dep:embassy-time-driver",
"dep:embassy-time",
]
Expand Down
7 changes: 3 additions & 4 deletions examples/ch32l103/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ ch32-hal = { path = "../../", features = [
"rt",
"time-driver-tim2",
], default-features = false }
embassy-executor = { version = "0.6.0", features = [
"integrated-timers",
embassy-executor = { version = "0.7.0", features = [
"arch-riscv32",
"executor-thread",
] }
embassy-time = { version = "0.3.2" }
embassy-time = { version = "0.4.0" }

# This is okay because we should automatically use whatever ch32-hal uses
qingke = "*"
Expand All @@ -31,4 +30,4 @@ lto = true
opt-level = "z" # Optimize for size.

[profile.dev]
opt-level = 1 # At least some opt so binary is not insane
opt-level = 1 # At least some opt so binary is not insane
5 changes: 2 additions & 3 deletions examples/ch32v003/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@ ch32-hal = { path = "../../", features = [
"time-driver-tim2",
"rt",
] }
embassy-executor = { version = "0.6.0", features = [
"integrated-timers",
embassy-executor = { version = "0.7.0", features = [
"arch-spin",
"executor-thread",
"task-arena-size-128", # or better use nightly, but fails on recent Rust versions
] }
embassy-time = { version = "0.3.0" }
embassy-time = { version = "0.4.0" }

# This is okay because we should automatically use whatever ch32-hal uses
qingke = "*"
Expand Down
5 changes: 2 additions & 3 deletions examples/ch32v103/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ ch32-hal = { path = "../../", features = [
"rt",
"time-driver-tim2",
] }
embassy-executor = { version = "0.6.0", features = [
"integrated-timers",
embassy-executor = { version = "0.7.0", features = [
"arch-spin",
"executor-thread",
] }
embassy-time = { version = "0.3.2" }
embassy-time = { version = "0.4.0" }

# This is okay because we should automatically use whatever ch32-hal uses
qingke-rt = "*"
Expand Down
5 changes: 2 additions & 3 deletions examples/ch32v203/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ ch32-hal = { path = "../../", features = [
"time-driver-tim2",
], default-features = false }

embassy-executor = { version = "0.6.0", features = [
"integrated-timers",
embassy-executor = { version = "0.7.0", features = [
"arch-riscv32",
"executor-thread",
] }

embassy-time = { version = "0.3.2" }
embassy-time = { version = "0.4.0" }
embassy-usb = { version = "0.3.0" }
embassy-futures = { version = "0.1.0" }

Expand Down
5 changes: 2 additions & 3 deletions examples/ch32v208/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ ch32-hal = { path = "../../", features = [
"embassy",
"rt",
], default-features = false }
embassy-executor = { version = "0.6.0", features = [
"integrated-timers",
embassy-executor = { version = "0.7.0", features = [
"arch-riscv32",
"executor-thread",
] }
embassy-time = { version = "0.3.2" }
embassy-time = { version = "0.4.0" }

# This is okay because we should automatically use whatever ch32-hal uses
qingke-rt = "*"
Expand Down
5 changes: 2 additions & 3 deletions examples/ch32v305/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ ch32-hal = { path = "../../", features = [
"embassy",
"rt",
] }
embassy-executor = { version = "0.6.0", features = [
"integrated-timers",
embassy-executor = { version = "0.7.0", features = [
"arch-riscv32",
"executor-thread",
] }
embassy-time = { version = "0.3.2" }
embassy-time = { version = "0.4.0" }

qingke-rt = "*"
qingke = "*"
Expand Down
5 changes: 2 additions & 3 deletions examples/ch32v307/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@ ch32-hal = { path = "../../", features = [
"highcode",
"time-driver-tim1",
] }
embassy-executor = { version = "0.6.0", features = [
"integrated-timers",
embassy-executor = { version = "0.7.0", features = [
"arch-spin",
"executor-thread",
] }

critical-section = "1.2.0"

embassy-time = "0.3.2"
embassy-time = "0.4.0"
embassy-usb = "0.3.0"
nb = "1.1.0"

Expand Down
5 changes: 2 additions & 3 deletions examples/ch32x035/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ ch32-hal = { path = "../../", features = [
"embassy",
"rt",
] }
embassy-executor = { version = "0.6.0", features = [
"integrated-timers",
embassy-executor = { version = "0.7.0", features = [
"arch-riscv32",
"executor-thread",
] }
embassy-time = { version = "0.3.2" }
embassy-time = { version = "0.4.0" }

qingke-rt = "*"
qingke = "*"
Expand Down
5 changes: 2 additions & 3 deletions examples/ch641/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@ ch32-hal = { path = "../../", features = [
"time-driver-tim2",
"rt",
] }
embassy-executor = { version = "0.6.0", features = [
"integrated-timers",
embassy-executor = { version = "0.7.0", features = [
"arch-riscv32",
"executor-thread",
"task-arena-size-128", # or better use nightly, but fails on recent Rust versions
] }
embassy-time = { version = "0.3.2" }
embassy-time = { version = "0.4.0" }
embedded-hal = "1.0.0"

qingke-rt = "*"
Expand Down
Loading