aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.github/ci/book.sh1
-rwxr-xr-xci.sh1
-rw-r--r--embassy-time/src/driver_std.rs3
3 files changed, 1 insertions, 4 deletions
diff --git a/.github/ci/book.sh b/.github/ci/book.sh
index dada4b348..6c300bf09 100755
--- a/.github/ci/book.sh
+++ b/.github/ci/book.sh
@@ -18,4 +18,3 @@ kubectl exec $POD -- mkdir -p /usr/share/nginx/html
18kubectl cp book.tar $POD:/usr/share/nginx/html/ 18kubectl cp book.tar $POD:/usr/share/nginx/html/
19kubectl exec $POD -- find /usr/share/nginx/html 19kubectl exec $POD -- find /usr/share/nginx/html
20kubectl exec $POD -- tar -C /usr/share/nginx/html -xvf /usr/share/nginx/html/book.tar 20kubectl exec $POD -- tar -C /usr/share/nginx/html -xvf /usr/share/nginx/html/book.tar
213
diff --git a/ci.sh b/ci.sh
index 1208086a6..bb918b186 100755
--- a/ci.sh
+++ b/ci.sh
@@ -44,6 +44,7 @@ cargo batch \
44 --- build --release --manifest-path embassy-embedded-hal/Cargo.toml --target thumbv7em-none-eabi --features time \ 44 --- build --release --manifest-path embassy-embedded-hal/Cargo.toml --target thumbv7em-none-eabi --features time \
45 --- build --release --manifest-path embassy-sync/Cargo.toml --target thumbv6m-none-eabi --features defmt \ 45 --- build --release --manifest-path embassy-sync/Cargo.toml --target thumbv6m-none-eabi --features defmt \
46 --- build --release --manifest-path embassy-time/Cargo.toml --target thumbv6m-none-eabi --features defmt,defmt-timestamp-uptime,mock-driver \ 46 --- build --release --manifest-path embassy-time/Cargo.toml --target thumbv6m-none-eabi --features defmt,defmt-timestamp-uptime,mock-driver \
47 --- build --release --manifest-path embassy-time/Cargo.toml --features defmt,std \
47 --- build --release --manifest-path embassy-time-queue-utils/Cargo.toml --target thumbv6m-none-eabi \ 48 --- build --release --manifest-path embassy-time-queue-utils/Cargo.toml --target thumbv6m-none-eabi \
48 --- build --release --manifest-path embassy-time-queue-utils/Cargo.toml --target thumbv6m-none-eabi --features generic-queue-8 \ 49 --- build --release --manifest-path embassy-time-queue-utils/Cargo.toml --target thumbv6m-none-eabi --features generic-queue-8 \
49 --- build --release --manifest-path embassy-net/Cargo.toml --target thumbv7em-none-eabi --features defmt,tcp,udp,dns,proto-ipv4,medium-ethernet,packet-trace \ 50 --- build --release --manifest-path embassy-net/Cargo.toml --target thumbv7em-none-eabi --features defmt,tcp,udp,dns,proto-ipv4,medium-ethernet,packet-trace \
diff --git a/embassy-time/src/driver_std.rs b/embassy-time/src/driver_std.rs
index a77eed75e..0cdb8f4ac 100644
--- a/embassy-time/src/driver_std.rs
+++ b/embassy-time/src/driver_std.rs
@@ -6,14 +6,12 @@ use embassy_time_driver::Driver;
6use embassy_time_queue_utils::Queue; 6use embassy_time_queue_utils::Queue;
7 7
8#[derive(Debug)] 8#[derive(Debug)]
9#[cfg_attr(feature = "defmt", derive(defmt::Format))]
10struct TimeDriver { 9struct TimeDriver {
11 signaler: Signaler, 10 signaler: Signaler,
12 inner: Mutex<Inner>, 11 inner: Mutex<Inner>,
13} 12}
14 13
15#[derive(Debug)] 14#[derive(Debug)]
16#[cfg_attr(feature = "defmt", derive(defmt::Format))]
17struct Inner { 15struct Inner {
18 zero_instant: Option<StdInstant>, 16 zero_instant: Option<StdInstant>,
19 queue: Queue, 17 queue: Queue,
@@ -69,7 +67,6 @@ fn alarm_thread() {
69} 67}
70 68
71#[derive(Debug)] 69#[derive(Debug)]
72#[cfg_attr(feature = "defmt", derive(defmt::Format))]
73struct Signaler { 70struct Signaler {
74 mutex: Mutex<bool>, 71 mutex: Mutex<bool>,
75 condvar: Condvar, 72 condvar: Condvar,