diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2023-04-16 22:00:07 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-04-16 22:00:07 +0000 |
| commit | 6ba2bb1a7fe39ecd2f34fb8a632f6568ed3bdcec (patch) | |
| tree | 74f3581b6798af0b31dcc4d7eb70dc2e1d56c6d0 | |
| parent | 1fdce6e52a51de89f48f002d5c92139f58029575 (diff) | |
| parent | a258e15c239305ba654e5d60a5f649b87855759f (diff) | |
Merge #1373
1373: rp: switch to released rp-pac v1.0 r=Dirbaio a=Dirbaio
bors r+
Co-authored-by: Dario Nieuwenhuis <[email protected]>
| -rw-r--r-- | embassy-rp/Cargo.toml | 3 | ||||
| -rw-r--r-- | embassy-rp/src/lib.rs | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/embassy-rp/Cargo.toml b/embassy-rp/Cargo.toml index 2ef2c8f07..b7ed6ccbb 100644 --- a/embassy-rp/Cargo.toml +++ b/embassy-rp/Cargo.toml | |||
| @@ -61,8 +61,7 @@ embedded-io = { version = "0.4.0", features = ["async"], optional = true } | |||
| 61 | embedded-storage = { version = "0.3" } | 61 | embedded-storage = { version = "0.3" } |
| 62 | rand_core = "0.6.4" | 62 | rand_core = "0.6.4" |
| 63 | 63 | ||
| 64 | rp2040-pac2 = { git = "https://github.com/embassy-rs/rp2040-pac2", rev="017e3c9007b2d3b6965f0d85b5bf8ce3fa6d7364", features = ["rt"] } | 64 | rp-pac = { version = "1", features = ["rt"] } |
| 65 | #rp2040-pac2 = { path = "../../rp2040-pac2", features = ["rt"] } | ||
| 66 | 65 | ||
| 67 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } | 66 | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } |
| 68 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.10", optional = true} | 67 | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-alpha.10", optional = true} |
diff --git a/embassy-rp/src/lib.rs b/embassy-rp/src/lib.rs index 9e99b2fbb..1d63f6c2e 100644 --- a/embassy-rp/src/lib.rs +++ b/embassy-rp/src/lib.rs | |||
| @@ -44,9 +44,9 @@ pub use embassy_cortex_m::executor; | |||
| 44 | pub use embassy_cortex_m::interrupt::_export::interrupt; | 44 | pub use embassy_cortex_m::interrupt::_export::interrupt; |
| 45 | pub use embassy_hal_common::{into_ref, Peripheral, PeripheralRef}; | 45 | pub use embassy_hal_common::{into_ref, Peripheral, PeripheralRef}; |
| 46 | #[cfg(feature = "unstable-pac")] | 46 | #[cfg(feature = "unstable-pac")] |
| 47 | pub use rp2040_pac2 as pac; | 47 | pub use rp_pac as pac; |
| 48 | #[cfg(not(feature = "unstable-pac"))] | 48 | #[cfg(not(feature = "unstable-pac"))] |
| 49 | pub(crate) use rp2040_pac2 as pac; | 49 | pub(crate) use rp_pac as pac; |
| 50 | 50 | ||
| 51 | embassy_hal_common::peripherals! { | 51 | embassy_hal_common::peripherals! { |
| 52 | PIN_0, | 52 | PIN_0, |
