Merge pull request #477 from nrf-rs/buildfix

Fix build after #422.
nrf-rs · May 24, 2024 · eb8b34a · eb8b34a
2 parents 2db1606 + 55492ec
commit eb8b34a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/nrf-hal-common/src/lib.rs b/nrf-hal-common/src/lib.rs
@@ -150,9 +150,19 @@ pub mod target_constants {
     pub const SRAM_LOWER: usize = 0x2000_0000;
     pub const SRAM_UPPER: usize = 0x3000_0000;
 
-    #[cfg(any(feature = "51", feature = "52805", feature = "52810", feature = "52832"))]
+    #[cfg(any(
+        feature = "51",
+        feature = "52805",
+        feature = "52810",
+        feature = "52832"
+    ))]
     pub const FORCE_COPY_BUFFER_SIZE: usize = 255;
-    #[cfg(not(any(feature = "51", feature = "52805", feature = "52810", feature = "52832")))]
+    #[cfg(not(any(
+        feature = "51",
+        feature = "52805",
+        feature = "52810",
+        feature = "52832"
+    )))]
     pub const FORCE_COPY_BUFFER_SIZE: usize = 1024;
     const _CHECK_FORCE_COPY_BUFFER_SIZE: usize = EASY_DMA_SIZE - FORCE_COPY_BUFFER_SIZE;
     // ERROR: FORCE_COPY_BUFFER_SIZE must be <= EASY_DMA_SIZE

diff --git a/nrf52805-hal/Cargo.toml b/nrf52805-hal/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nrf52805-hal"
-version = "0.16.0"
+version = "0.17.1"
 edition = "2018"
 description = "HAL for nRF52805 microcontrollers"
 readme = "../README.md"
@@ -24,13 +24,10 @@ nrf52805-pac = "0.12.2"
 path = "../nrf-hal-common"
 default-features = false
 features = ["52805"]
-version = "=0.16.0"
-
-[dependencies.embedded-hal]
-features = ["unproven"]
-version = "0.2.3"
+version = "=0.17.1"
 
 [features]
 doc = []
+embedded-hal-02 = ["nrf-hal-common/embedded-hal-02"]
 rt = ["nrf52805-pac/rt"]
-default = ["rt"]
+default = ["rt", "embedded-hal-02"]
diff --git a/nrf52805-hal/src/lib.rs b/nrf52805-hal/src/lib.rs
@@ -1,14 +1,10 @@
 #![no_std]
-#![doc(html_root_url = "https://docs.rs/nrf52805-hal/0.16.0")]
+#![doc(html_root_url = "https://docs.rs/nrf52805-hal/0.17.1")]
 
-use embedded_hal as hal;
 pub use nrf_hal_common::*;
 
 pub mod prelude {
-    pub use crate::hal::prelude::*;
     pub use nrf_hal_common::prelude::*;
-
-    pub use crate::time::U32Ext;
 }
 
 pub use crate::ccm::Ccm;

diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
@@ -15,7 +15,10 @@ pub static HALS: &[(&str, &str)] = &[
 
 pub static EXAMPLES: &[(&str, &[&str])] = &[
     ("blinky-button-demo", &[]),
-    ("ccm-demo", &["52805", "52810", "52811", "52832", "52833", "52840"]),
+    (
+        "ccm-demo",
+        &["52805", "52810", "52811", "52832", "52833", "52840"],
+    ),
     ("comp-demo", &[]),
     (
         "ecb-demo",
@@ -35,7 +38,10 @@ pub static EXAMPLES: &[(&str, &[&str])] = &[
     ("pwm-demo", &[]),
     ("qdec-demo", &[]),
     ("rtc-demo", &[]),
-    ("rtic-demo", &["51", "52805", "52810", "52811", "52832", "52840"]),
+    (
+        "rtic-demo",
+        &["51", "52805", "52810", "52811", "52832", "52840"],
+    ),
     ("spi-demo", &[]),
     ("spis-demo", &[]),
     ("twi-ssd1306", &["52832", "52840"]),