Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build after #422. #477

Merged
merged 1 commit into from
May 24, 2024
Merged

Fix build after #422. #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions nrf-hal-common/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 4 additions & 7 deletions nrf52805-hal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"]
6 changes: 1 addition & 5 deletions nrf52805-hal/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
10 changes: 8 additions & 2 deletions xtask/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"]),
Expand Down
Loading