aboutsummaryrefslogtreecommitdiff
path: root/examples/boot
diff options
context:
space:
mode:
authorHenrik Alsér <[email protected]>2022-05-26 18:54:58 +0200
committerGitHub <[email protected]>2022-05-26 18:54:58 +0200
commite10fc2bada1c59420431f09a35f7aa09a5b45623 (patch)
tree4b05a177db2a3e86c86058714d9a4ed014aea486 /examples/boot
parent36a1f203648dcb402727ea3eb5d30cf1f6993795 (diff)
Async shared bus for SPI & I2C + rename embassy-traits (#769)
* Rename embassy-traits to embassy-embedded-hal * Rename embassy-traits to embassy-embedded-hal * Add shared bus for SPI and I2C * rustfmt * EHA alpha 1 * Rename embedded-traits in examples * rustfmt * rustfmt Co-authored-by: Henrik Alsér <[email protected]>
Diffstat (limited to 'examples/boot')
-rw-r--r--examples/boot/nrf/Cargo.toml2
-rw-r--r--examples/boot/nrf/src/bin/a.rs2
-rw-r--r--examples/boot/stm32f3/Cargo.toml2
-rw-r--r--examples/boot/stm32f3/src/bin/a.rs2
-rw-r--r--examples/boot/stm32f7/Cargo.toml2
-rw-r--r--examples/boot/stm32f7/src/bin/a.rs2
-rw-r--r--examples/boot/stm32h7/Cargo.toml2
-rw-r--r--examples/boot/stm32h7/src/bin/a.rs2
-rw-r--r--examples/boot/stm32l0/Cargo.toml2
-rw-r--r--examples/boot/stm32l0/src/bin/a.rs2
-rw-r--r--examples/boot/stm32l1/Cargo.toml2
-rw-r--r--examples/boot/stm32l1/src/bin/a.rs2
-rw-r--r--examples/boot/stm32l4/Cargo.toml2
-rw-r--r--examples/boot/stm32l4/src/bin/a.rs2
-rw-r--r--examples/boot/stm32wl/Cargo.toml2
-rw-r--r--examples/boot/stm32wl/src/bin/a.rs2
16 files changed, 16 insertions, 16 deletions
diff --git a/examples/boot/nrf/Cargo.toml b/examples/boot/nrf/Cargo.toml
index da8333b7c..42bc35430 100644
--- a/examples/boot/nrf/Cargo.toml
+++ b/examples/boot/nrf/Cargo.toml
@@ -8,7 +8,7 @@ version = "0.1.0"
8embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] } 8embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] }
9embassy-nrf = { version = "0.1.0", path = "../../../embassy-nrf", features = ["time-driver-rtc1", "gpiote", "nightly", "nrf52840"] } 9embassy-nrf = { version = "0.1.0", path = "../../../embassy-nrf", features = ["time-driver-rtc1", "gpiote", "nightly", "nrf52840"] }
10embassy-boot-nrf = { version = "0.1.0", path = "../../../embassy-boot/nrf" } 10embassy-boot-nrf = { version = "0.1.0", path = "../../../embassy-boot/nrf" }
11embassy-traits = { version = "0.1.0", path = "../../../embassy-traits" } 11embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" }
12 12
13defmt = { version = "0.3", optional = true } 13defmt = { version = "0.3", optional = true }
14defmt-rtt = { version = "0.3", optional = true } 14defmt-rtt = { version = "0.3", optional = true }
diff --git a/examples/boot/nrf/src/bin/a.rs b/examples/boot/nrf/src/bin/a.rs
index 7368e36ce..d45d0ff34 100644
--- a/examples/boot/nrf/src/bin/a.rs
+++ b/examples/boot/nrf/src/bin/a.rs
@@ -5,13 +5,13 @@
5#![feature(type_alias_impl_trait)] 5#![feature(type_alias_impl_trait)]
6 6
7use embassy_boot_nrf::FirmwareUpdater; 7use embassy_boot_nrf::FirmwareUpdater;
8use embassy_embedded_hal::adapter::BlockingAsync;
8use embassy_nrf::{ 9use embassy_nrf::{
9 gpio::{Input, Pull}, 10 gpio::{Input, Pull},
10 gpio::{Level, Output, OutputDrive}, 11 gpio::{Level, Output, OutputDrive},
11 nvmc::Nvmc, 12 nvmc::Nvmc,
12 Peripherals, 13 Peripherals,
13}; 14};
14use embassy_traits::adapter::BlockingAsync;
15use panic_reset as _; 15use panic_reset as _;
16 16
17static APP_B: &[u8] = include_bytes!("../../b.bin"); 17static APP_B: &[u8] = include_bytes!("../../b.bin");
diff --git a/examples/boot/stm32f3/Cargo.toml b/examples/boot/stm32f3/Cargo.toml
index d4ca600f8..fab6fd723 100644
--- a/examples/boot/stm32f3/Cargo.toml
+++ b/examples/boot/stm32f3/Cargo.toml
@@ -8,7 +8,7 @@ version = "0.1.0"
8embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] } 8embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] }
9embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f303re", "time-driver-any", "exti"] } 9embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f303re", "time-driver-any", "exti"] }
10embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } 10embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" }
11embassy-traits = { version = "0.1.0", path = "../../../embassy-traits" } 11embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" }
12 12
13defmt = { version = "0.3", optional = true } 13defmt = { version = "0.3", optional = true }
14defmt-rtt = { version = "0.3", optional = true } 14defmt-rtt = { version = "0.3", optional = true }
diff --git a/examples/boot/stm32f3/src/bin/a.rs b/examples/boot/stm32f3/src/bin/a.rs
index db9262f43..9ad798389 100644
--- a/examples/boot/stm32f3/src/bin/a.rs
+++ b/examples/boot/stm32f3/src/bin/a.rs
@@ -3,11 +3,11 @@
3#![feature(type_alias_impl_trait)] 3#![feature(type_alias_impl_trait)]
4 4
5use embassy_boot_stm32::FirmwareUpdater; 5use embassy_boot_stm32::FirmwareUpdater;
6use embassy_embedded_hal::adapter::BlockingAsync;
6use embassy_stm32::exti::ExtiInput; 7use embassy_stm32::exti::ExtiInput;
7use embassy_stm32::flash::Flash; 8use embassy_stm32::flash::Flash;
8use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; 9use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
9use embassy_stm32::Peripherals; 10use embassy_stm32::Peripherals;
10use embassy_traits::adapter::BlockingAsync;
11use panic_reset as _; 11use panic_reset as _;
12 12
13#[cfg(feature = "defmt-rtt")] 13#[cfg(feature = "defmt-rtt")]
diff --git a/examples/boot/stm32f7/Cargo.toml b/examples/boot/stm32f7/Cargo.toml
index 857b287d5..14500b198 100644
--- a/examples/boot/stm32f7/Cargo.toml
+++ b/examples/boot/stm32f7/Cargo.toml
@@ -8,7 +8,7 @@ version = "0.1.0"
8embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] } 8embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] }
9embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f767zi", "time-driver-any", "exti"] } 9embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f767zi", "time-driver-any", "exti"] }
10embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } 10embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" }
11embassy-traits = { version = "0.1.0", path = "../../../embassy-traits" } 11embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" }
12 12
13defmt = { version = "0.3", optional = true } 13defmt = { version = "0.3", optional = true }
14defmt-rtt = { version = "0.3", optional = true } 14defmt-rtt = { version = "0.3", optional = true }
diff --git a/examples/boot/stm32f7/src/bin/a.rs b/examples/boot/stm32f7/src/bin/a.rs
index ca154f0af..b4f49d579 100644
--- a/examples/boot/stm32f7/src/bin/a.rs
+++ b/examples/boot/stm32f7/src/bin/a.rs
@@ -3,11 +3,11 @@
3#![feature(type_alias_impl_trait)] 3#![feature(type_alias_impl_trait)]
4 4
5use embassy_boot_stm32::FirmwareUpdater; 5use embassy_boot_stm32::FirmwareUpdater;
6use embassy_embedded_hal::adapter::BlockingAsync;
6use embassy_stm32::exti::ExtiInput; 7use embassy_stm32::exti::ExtiInput;
7use embassy_stm32::flash::Flash; 8use embassy_stm32::flash::Flash;
8use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; 9use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
9use embassy_stm32::Peripherals; 10use embassy_stm32::Peripherals;
10use embassy_traits::adapter::BlockingAsync;
11use panic_reset as _; 11use panic_reset as _;
12 12
13#[cfg(feature = "defmt-rtt")] 13#[cfg(feature = "defmt-rtt")]
diff --git a/examples/boot/stm32h7/Cargo.toml b/examples/boot/stm32h7/Cargo.toml
index 1fd03906f..3069277ed 100644
--- a/examples/boot/stm32h7/Cargo.toml
+++ b/examples/boot/stm32h7/Cargo.toml
@@ -8,7 +8,7 @@ version = "0.1.0"
8embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] } 8embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] }
9embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32h743zi", "time-driver-any", "exti"] } 9embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32h743zi", "time-driver-any", "exti"] }
10embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } 10embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" }
11embassy-traits = { version = "0.1.0", path = "../../../embassy-traits" } 11embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" }
12 12
13defmt = { version = "0.3", optional = true } 13defmt = { version = "0.3", optional = true }
14defmt-rtt = { version = "0.3", optional = true } 14defmt-rtt = { version = "0.3", optional = true }
diff --git a/examples/boot/stm32h7/src/bin/a.rs b/examples/boot/stm32h7/src/bin/a.rs
index 1f23a8bc2..1d196e8a5 100644
--- a/examples/boot/stm32h7/src/bin/a.rs
+++ b/examples/boot/stm32h7/src/bin/a.rs
@@ -3,11 +3,11 @@
3#![feature(type_alias_impl_trait)] 3#![feature(type_alias_impl_trait)]
4 4
5use embassy_boot_stm32::FirmwareUpdater; 5use embassy_boot_stm32::FirmwareUpdater;
6use embassy_embedded_hal::adapter::BlockingAsync;
6use embassy_stm32::exti::ExtiInput; 7use embassy_stm32::exti::ExtiInput;
7use embassy_stm32::flash::Flash; 8use embassy_stm32::flash::Flash;
8use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; 9use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
9use embassy_stm32::Peripherals; 10use embassy_stm32::Peripherals;
10use embassy_traits::adapter::BlockingAsync;
11use panic_reset as _; 11use panic_reset as _;
12 12
13#[cfg(feature = "defmt-rtt")] 13#[cfg(feature = "defmt-rtt")]
diff --git a/examples/boot/stm32l0/Cargo.toml b/examples/boot/stm32l0/Cargo.toml
index 5cb1add5b..13ca84367 100644
--- a/examples/boot/stm32l0/Cargo.toml
+++ b/examples/boot/stm32l0/Cargo.toml
@@ -8,7 +8,7 @@ version = "0.1.0"
8embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] } 8embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] }
9embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l072cz", "time-driver-any", "exti", "memory-x"] } 9embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l072cz", "time-driver-any", "exti", "memory-x"] }
10embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32", features = ["thumbv6"] } 10embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32", features = ["thumbv6"] }
11embassy-traits = { version = "0.1.0", path = "../../../embassy-traits" } 11embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" }
12 12
13defmt = { version = "0.3", optional = true } 13defmt = { version = "0.3", optional = true }
14defmt-rtt = { version = "0.3", optional = true } 14defmt-rtt = { version = "0.3", optional = true }
diff --git a/examples/boot/stm32l0/src/bin/a.rs b/examples/boot/stm32l0/src/bin/a.rs
index 9e603a226..d4b252bf0 100644
--- a/examples/boot/stm32l0/src/bin/a.rs
+++ b/examples/boot/stm32l0/src/bin/a.rs
@@ -4,11 +4,11 @@
4 4
5use embassy::time::{Duration, Timer}; 5use embassy::time::{Duration, Timer};
6use embassy_boot_stm32::FirmwareUpdater; 6use embassy_boot_stm32::FirmwareUpdater;
7use embassy_embedded_hal::adapter::BlockingAsync;
7use embassy_stm32::exti::ExtiInput; 8use embassy_stm32::exti::ExtiInput;
8use embassy_stm32::flash::Flash; 9use embassy_stm32::flash::Flash;
9use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; 10use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
10use embassy_stm32::Peripherals; 11use embassy_stm32::Peripherals;
11use embassy_traits::adapter::BlockingAsync;
12use panic_reset as _; 12use panic_reset as _;
13 13
14#[cfg(feature = "defmt-rtt")] 14#[cfg(feature = "defmt-rtt")]
diff --git a/examples/boot/stm32l1/Cargo.toml b/examples/boot/stm32l1/Cargo.toml
index 9f97462f6..b0b6e3d25 100644
--- a/examples/boot/stm32l1/Cargo.toml
+++ b/examples/boot/stm32l1/Cargo.toml
@@ -8,7 +8,7 @@ version = "0.1.0"
8embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] } 8embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] }
9embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l151cb-a", "time-driver-any", "exti"] } 9embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l151cb-a", "time-driver-any", "exti"] }
10embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } 10embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" }
11embassy-traits = { version = "0.1.0", path = "../../../embassy-traits" } 11embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" }
12 12
13defmt = { version = "0.3", optional = true } 13defmt = { version = "0.3", optional = true }
14defmt-rtt = { version = "0.3", optional = true } 14defmt-rtt = { version = "0.3", optional = true }
diff --git a/examples/boot/stm32l1/src/bin/a.rs b/examples/boot/stm32l1/src/bin/a.rs
index 9e603a226..d4b252bf0 100644
--- a/examples/boot/stm32l1/src/bin/a.rs
+++ b/examples/boot/stm32l1/src/bin/a.rs
@@ -4,11 +4,11 @@
4 4
5use embassy::time::{Duration, Timer}; 5use embassy::time::{Duration, Timer};
6use embassy_boot_stm32::FirmwareUpdater; 6use embassy_boot_stm32::FirmwareUpdater;
7use embassy_embedded_hal::adapter::BlockingAsync;
7use embassy_stm32::exti::ExtiInput; 8use embassy_stm32::exti::ExtiInput;
8use embassy_stm32::flash::Flash; 9use embassy_stm32::flash::Flash;
9use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; 10use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
10use embassy_stm32::Peripherals; 11use embassy_stm32::Peripherals;
11use embassy_traits::adapter::BlockingAsync;
12use panic_reset as _; 12use panic_reset as _;
13 13
14#[cfg(feature = "defmt-rtt")] 14#[cfg(feature = "defmt-rtt")]
diff --git a/examples/boot/stm32l4/Cargo.toml b/examples/boot/stm32l4/Cargo.toml
index 53424a666..705dbd0d6 100644
--- a/examples/boot/stm32l4/Cargo.toml
+++ b/examples/boot/stm32l4/Cargo.toml
@@ -8,7 +8,7 @@ version = "0.1.0"
8embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] } 8embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] }
9embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l475vg", "time-driver-any", "exti"] } 9embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l475vg", "time-driver-any", "exti"] }
10embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } 10embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" }
11embassy-traits = { version = "0.1.0", path = "../../../embassy-traits" } 11embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" }
12 12
13defmt = { version = "0.3", optional = true } 13defmt = { version = "0.3", optional = true }
14defmt-rtt = { version = "0.3", optional = true } 14defmt-rtt = { version = "0.3", optional = true }
diff --git a/examples/boot/stm32l4/src/bin/a.rs b/examples/boot/stm32l4/src/bin/a.rs
index 41684b2f0..23b1d98bb 100644
--- a/examples/boot/stm32l4/src/bin/a.rs
+++ b/examples/boot/stm32l4/src/bin/a.rs
@@ -3,11 +3,11 @@
3#![feature(type_alias_impl_trait)] 3#![feature(type_alias_impl_trait)]
4 4
5use embassy_boot_stm32::FirmwareUpdater; 5use embassy_boot_stm32::FirmwareUpdater;
6use embassy_embedded_hal::adapter::BlockingAsync;
6use embassy_stm32::exti::ExtiInput; 7use embassy_stm32::exti::ExtiInput;
7use embassy_stm32::flash::Flash; 8use embassy_stm32::flash::Flash;
8use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; 9use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
9use embassy_stm32::Peripherals; 10use embassy_stm32::Peripherals;
10use embassy_traits::adapter::BlockingAsync;
11use panic_reset as _; 11use panic_reset as _;
12 12
13#[cfg(feature = "defmt-rtt")] 13#[cfg(feature = "defmt-rtt")]
diff --git a/examples/boot/stm32wl/Cargo.toml b/examples/boot/stm32wl/Cargo.toml
index fb64886e6..41e6a112e 100644
--- a/examples/boot/stm32wl/Cargo.toml
+++ b/examples/boot/stm32wl/Cargo.toml
@@ -8,7 +8,7 @@ version = "0.1.0"
8embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] } 8embassy = { version = "0.1.0", path = "../../../embassy", features = ["nightly"] }
9embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32wl55jc-cm4", "time-driver-any", "exti"] } 9embassy-stm32 = { version = "0.1.0", path = "../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32wl55jc-cm4", "time-driver-any", "exti"] }
10embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" } 10embassy-boot-stm32 = { version = "0.1.0", path = "../../../embassy-boot/stm32" }
11embassy-traits = { version = "0.1.0", path = "../../../embassy-traits" } 11embassy-embedded-hal = { version = "0.1.0", path = "../../../embassy-embedded-hal" }
12 12
13defmt = { version = "0.3", optional = true } 13defmt = { version = "0.3", optional = true }
14defmt-rtt = { version = "0.3", optional = true } 14defmt-rtt = { version = "0.3", optional = true }
diff --git a/examples/boot/stm32wl/src/bin/a.rs b/examples/boot/stm32wl/src/bin/a.rs
index b3e9efa75..1089eff1e 100644
--- a/examples/boot/stm32wl/src/bin/a.rs
+++ b/examples/boot/stm32wl/src/bin/a.rs
@@ -3,11 +3,11 @@
3#![feature(type_alias_impl_trait)] 3#![feature(type_alias_impl_trait)]
4 4
5use embassy_boot_stm32::FirmwareUpdater; 5use embassy_boot_stm32::FirmwareUpdater;
6use embassy_embedded_hal::adapter::BlockingAsync;
6use embassy_stm32::exti::ExtiInput; 7use embassy_stm32::exti::ExtiInput;
7use embassy_stm32::flash::Flash; 8use embassy_stm32::flash::Flash;
8use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed}; 9use embassy_stm32::gpio::{Input, Level, Output, Pull, Speed};
9use embassy_stm32::Peripherals; 10use embassy_stm32::Peripherals;
10use embassy_traits::adapter::BlockingAsync;
11use panic_reset as _; 11use panic_reset as _;
12 12
13#[cfg(feature = "defmt-rtt")] 13#[cfg(feature = "defmt-rtt")]