itsscb/embassy
1
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2025-09-26 20:00:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build of embassy-time with std+defmt.

Browse Source
This commit is contained in:
Dario Nieuwenhuis 2025-07-29 13:31:54 +02:00
parent f79b289c48
commit b00de39af8
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/ci/book.sh vendored
View File

@ -18,4 +18,3 @@ kubectl exec $POD -- mkdir -p /usr/share/nginx/html
kubectl cp book.tar $POD:/usr/share/nginx/html/
kubectl exec $POD -- find /usr/share/nginx/html
kubectl exec $POD -- tar -C /usr/share/nginx/html -xvf /usr/share/nginx/html/book.tar
3

1
ci.sh
View File

@ -44,6 +44,7 @@ cargo batch \
--- build --release --manifest-path embassy-embedded-hal/Cargo.toml --target thumbv7em-none-eabi --features time \
--- build --release --manifest-path embassy-sync/Cargo.toml --target thumbv6m-none-eabi --features defmt \
--- build --release --manifest-path embassy-time/Cargo.toml --target thumbv6m-none-eabi --features defmt,defmt-timestamp-uptime,mock-driver \
--- build --release --manifest-path embassy-time/Cargo.toml --features defmt,std \
--- build --release --manifest-path embassy-time-queue-utils/Cargo.toml --target thumbv6m-none-eabi \
--- build --release --manifest-path embassy-time-queue-utils/Cargo.toml --target thumbv6m-none-eabi --features generic-queue-8 \
--- build --release --manifest-path embassy-net/Cargo.toml --target thumbv7em-none-eabi --features defmt,tcp,udp,dns,proto-ipv4,medium-ethernet,packet-trace \

3
embassy-time/src/driver_std.rs
View File

@ -6,14 +6,12 @@ use embassy_time_driver::Driver;
use embassy_time_queue_utils::Queue;
#[derive(Debug)]
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
struct TimeDriver {
signaler: Signaler,
inner: Mutex<Inner>,
}
#[derive(Debug)]
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
struct Inner {
zero_instant: Option<StdInstant>,
queue: Queue,
@ -69,7 +67,6 @@ fn alarm_thread() {
}
#[derive(Debug)]
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
struct Signaler {
mutex: Mutex<bool>,
condvar: Condvar,