From 99855fd94a0aec1a9d6da94593096c2c18af9830 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Tue, 31 May 2022 15:15:21 +0200 Subject: [PATCH 1/4] gitignore: only ignore root Cargo.toml Otherwise, `rg` and other tools that respect ignore files won't look into `Cargo.toml`s in subdirectories --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 892c0836..8c3071fa 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,8 @@ target/ [._]*.sw[a-p] **/*.rs.bk Cargo.lock -Cargo.toml -Cargo.my.toml +/Cargo.toml +/Cargo.my.toml # Created by https://www.gitignore.io/api/intellij+all From b977292ae74cc74e883e99d3c9245827e390638a Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Tue, 31 May 2022 15:15:38 +0200 Subject: [PATCH 2/4] Use `default-members` to make `cargo test` work --- .github/workflows/ci.yml | 2 +- Cargo.ci.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ef5b78d..ec8b9d4a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: thumbv7em-none-eabihf thumbv8m.main-none-eabi - name: Build Crates - run: mv Cargo.ci.toml Cargo.toml && cargo test -p xtask + run: mv Cargo.ci.toml Cargo.toml && cargo test env: RUSTFLAGS: ${{ matrix.rustflags }} diff --git a/Cargo.ci.toml b/Cargo.ci.toml index c561df5a..764c4b7c 100644 --- a/Cargo.ci.toml +++ b/Cargo.ci.toml @@ -13,6 +13,7 @@ members = [ "nrf9160-hal", "examples/*", ] +default-members = ["xtask"] exclude = ["examples/.cargo"] [profile.dev] From 2d2874f5af0ce738fce3860f54534ebce4c33697 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Tue, 31 May 2022 15:22:29 +0200 Subject: [PATCH 3/4] Update the changelog --- CHANGELOG.md | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14a969fe..6fa74bea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,21 @@ ## Unreleased -- Fixed the nvmc erase procedure on nRF91 & nRF53 ([#387]) -- Added support for the nrf5340-net-core. +### New Features + +- Support the nRF5340 Net Core ([#386]). +- Add internal VDD channels for the nRF51 ADC ([#382]). +- Implement `MultiWriteNorFlash` for the nRF9160 ([#383]). + +### Fixes + +- Fixed the nvmc erase procedure on nRF91 & nRF53 ([#387]). +- Fixed TWIM overruns being reported as `DataNack` errors ([#386]). + +[#382]: https://github.com/nrf-rs/nrf-hal/pull/382 +[#383]: https://github.com/nrf-rs/nrf-hal/pull/383 +[#386]: https://github.com/nrf-rs/nrf-hal/pull/386 +[#387]: https://github.com/nrf-rs/nrf-hal/pull/387 ## [0.15.0] From b8f6b897eb5e24bfc46781d8b4dbccc8ae9d2931 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Tue, 31 May 2022 15:30:09 +0200 Subject: [PATCH 4/4] 0.15.1 --- CHANGELOG.md | 5 +++++ nrf-hal-common/Cargo.toml | 2 +- nrf-hal-common/src/lib.rs | 2 +- nrf51-hal/Cargo.toml | 4 ++-- nrf51-hal/src/lib.rs | 2 +- nrf52810-hal/Cargo.toml | 4 ++-- nrf52810-hal/src/lib.rs | 2 +- nrf52811-hal/Cargo.toml | 4 ++-- nrf52811-hal/src/lib.rs | 2 +- nrf52832-hal/Cargo.toml | 4 ++-- nrf52832-hal/src/lib.rs | 2 +- nrf52833-hal/Cargo.toml | 4 ++-- nrf52833-hal/src/lib.rs | 2 +- nrf52840-hal/Cargo.toml | 4 ++-- nrf52840-hal/src/lib.rs | 2 +- nrf5340-app-hal/Cargo.toml | 4 ++-- nrf5340-app-hal/src/lib.rs | 2 +- nrf5340-net-hal/Cargo.toml | 4 ++-- nrf5340-net-hal/src/lib.rs | 2 +- nrf9160-hal/Cargo.toml | 4 ++-- nrf9160-hal/src/lib.rs | 2 +- 21 files changed, 34 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fa74bea..d4de6eba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +(no changes) + +## [0.15.1] + ### New Features - Support the nRF5340 Net Core ([#386]). @@ -334,3 +338,4 @@ None [0.14.0]: https://github.com/nrf-rs/nrf-hal/releases/tag/v0.14.0 [0.14.1]: https://github.com/nrf-rs/nrf-hal/releases/tag/v0.14.1 [0.15.0]: https://github.com/nrf-rs/nrf-hal/releases/tag/v0.15.0 +[0.15.1]: https://github.com/nrf-rs/nrf-hal/releases/tag/v0.15.1 diff --git a/nrf-hal-common/Cargo.toml b/nrf-hal-common/Cargo.toml index a4ae1992..322734e4 100644 --- a/nrf-hal-common/Cargo.toml +++ b/nrf-hal-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nrf-hal-common" -version = "0.15.0" +version = "0.15.1" description = "Implementation details of the nRF HAL crates. Don't use this directly, use one of the specific HAL crates instead (`nrfXYZ-hal`)." readme = "../README.md" diff --git a/nrf-hal-common/src/lib.rs b/nrf-hal-common/src/lib.rs index 15082f9e..5cb54b9f 100644 --- a/nrf-hal-common/src/lib.rs +++ b/nrf-hal-common/src/lib.rs @@ -1,7 +1,7 @@ //! Implementation details of the nRF HAL crates. Don't use this directly, use one of the specific //! HAL crates instead (`nrfXYZ-hal`). -#![doc(html_root_url = "https://docs.rs/nrf-hal-common/0.15.0")] +#![doc(html_root_url = "https://docs.rs/nrf-hal-common/0.15.1")] #![no_std] use embedded_hal as hal; diff --git a/nrf51-hal/Cargo.toml b/nrf51-hal/Cargo.toml index 551f4d77..b3f54f0d 100644 --- a/nrf51-hal/Cargo.toml +++ b/nrf51-hal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nrf51-hal" -version = "0.15.0" +version = "0.15.1" edition = "2018" description = "HAL for nRF51 microcontrollers" readme = "../README.md" @@ -25,7 +25,7 @@ nrf51-pac = "0.11.0" path = "../nrf-hal-common" default-features = false features = ["51"] -version = "=0.15.0" +version = "=0.15.1" [dependencies.embedded-hal] features = ["unproven"] diff --git a/nrf51-hal/src/lib.rs b/nrf51-hal/src/lib.rs index 69880252..e645ffd2 100644 --- a/nrf51-hal/src/lib.rs +++ b/nrf51-hal/src/lib.rs @@ -1,5 +1,5 @@ #![no_std] -#![doc(html_root_url = "https://docs.rs/nrf51-hal/0.15.0")] +#![doc(html_root_url = "https://docs.rs/nrf51-hal/0.15.1")] use embedded_hal as hal; pub use nrf_hal_common::*; diff --git a/nrf52810-hal/Cargo.toml b/nrf52810-hal/Cargo.toml index c8e511b4..9c49efb6 100644 --- a/nrf52810-hal/Cargo.toml +++ b/nrf52810-hal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nrf52810-hal" -version = "0.15.0" +version = "0.15.1" edition = "2018" description = "HAL for nRF52810 microcontrollers" readme = "../README.md" @@ -24,7 +24,7 @@ nrf52810-pac = "0.11.0" path = "../nrf-hal-common" default-features = false features = ["52810"] -version = "=0.15.0" +version = "=0.15.1" [dependencies.embedded-hal] features = ["unproven"] diff --git a/nrf52810-hal/src/lib.rs b/nrf52810-hal/src/lib.rs index e5421857..d118b06d 100644 --- a/nrf52810-hal/src/lib.rs +++ b/nrf52810-hal/src/lib.rs @@ -1,5 +1,5 @@ #![no_std] -#![doc(html_root_url = "https://docs.rs/nrf52810-hal/0.15.0")] +#![doc(html_root_url = "https://docs.rs/nrf52810-hal/0.15.1")] use embedded_hal as hal; pub use nrf_hal_common::*; diff --git a/nrf52811-hal/Cargo.toml b/nrf52811-hal/Cargo.toml index 5f63ded2..0d341c58 100644 --- a/nrf52811-hal/Cargo.toml +++ b/nrf52811-hal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nrf52811-hal" -version = "0.15.0" +version = "0.15.1" edition = "2018" description = "HAL for nRF52811 microcontrollers" readme = "../README.md" @@ -24,7 +24,7 @@ nrf52811-pac = "0.11.0" path = "../nrf-hal-common" default-features = false features = ["52811"] -version = "=0.15.0" +version = "=0.15.1" [dependencies.embedded-hal] features = ["unproven"] diff --git a/nrf52811-hal/src/lib.rs b/nrf52811-hal/src/lib.rs index 5da66608..8f7efdd8 100644 --- a/nrf52811-hal/src/lib.rs +++ b/nrf52811-hal/src/lib.rs @@ -1,5 +1,5 @@ #![no_std] -#![doc(html_root_url = "https://docs.rs/nrf52811-hal/0.15.0")] +#![doc(html_root_url = "https://docs.rs/nrf52811-hal/0.15.1")] use embedded_hal as hal; pub use nrf_hal_common::*; diff --git a/nrf52832-hal/Cargo.toml b/nrf52832-hal/Cargo.toml index 66f90c4b..863304cb 100644 --- a/nrf52832-hal/Cargo.toml +++ b/nrf52832-hal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nrf52832-hal" -version = "0.15.0" +version = "0.15.1" description = "HAL for nRF52832 microcontrollers" readme = "../README.md" @@ -22,7 +22,7 @@ nrf52832-pac = "0.11.0" path = "../nrf-hal-common" default-features = false features = ["52832"] -version = "=0.15.0" +version = "=0.15.1" [dependencies.embedded-hal] features = ["unproven"] diff --git a/nrf52832-hal/src/lib.rs b/nrf52832-hal/src/lib.rs index 767138d8..5bd7be46 100644 --- a/nrf52832-hal/src/lib.rs +++ b/nrf52832-hal/src/lib.rs @@ -1,5 +1,5 @@ #![no_std] -#![doc(html_root_url = "https://docs.rs/nrf52832-hal/0.15.0")] +#![doc(html_root_url = "https://docs.rs/nrf52832-hal/0.15.1")] use embedded_hal as hal; pub use nrf_hal_common::*; diff --git a/nrf52833-hal/Cargo.toml b/nrf52833-hal/Cargo.toml index 12fff00d..50f1249e 100644 --- a/nrf52833-hal/Cargo.toml +++ b/nrf52833-hal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nrf52833-hal" -version = "0.15.0" +version = "0.15.1" description = "HAL for nRF52833 microcontrollers" readme = "../README.md" @@ -25,7 +25,7 @@ nrf52833-pac = "0.11.0" path = "../nrf-hal-common" default-features = false features = ["52833"] -version = "=0.15.0" +version = "=0.15.1" [dependencies.embedded-hal] features = ["unproven"] diff --git a/nrf52833-hal/src/lib.rs b/nrf52833-hal/src/lib.rs index 17e36e60..0f339bdf 100644 --- a/nrf52833-hal/src/lib.rs +++ b/nrf52833-hal/src/lib.rs @@ -1,5 +1,5 @@ #![no_std] -#![doc(html_root_url = "https://docs.rs/nrf52833-hal/0.15.0")] +#![doc(html_root_url = "https://docs.rs/nrf52833-hal/0.15.1")] use embedded_hal as hal; pub use nrf_hal_common::*; diff --git a/nrf52840-hal/Cargo.toml b/nrf52840-hal/Cargo.toml index e3586b8c..e2f56f1a 100644 --- a/nrf52840-hal/Cargo.toml +++ b/nrf52840-hal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nrf52840-hal" -version = "0.15.0" +version = "0.15.1" description = "HAL for nRF52840 microcontrollers" readme = "../README.md" @@ -24,7 +24,7 @@ nrf52840-pac = "0.11.0" path = "../nrf-hal-common" default-features = false features = ["52840"] -version = "=0.15.0" +version = "=0.15.1" [dependencies.embedded-hal] features = ["unproven"] diff --git a/nrf52840-hal/src/lib.rs b/nrf52840-hal/src/lib.rs index 6bb154b4..f0589367 100644 --- a/nrf52840-hal/src/lib.rs +++ b/nrf52840-hal/src/lib.rs @@ -1,5 +1,5 @@ #![no_std] -#![doc(html_root_url = "https://docs.rs/nrf52840-hal/0.15.0")] +#![doc(html_root_url = "https://docs.rs/nrf52840-hal/0.15.1")] use embedded_hal as hal; pub use nrf_hal_common::*; diff --git a/nrf5340-app-hal/Cargo.toml b/nrf5340-app-hal/Cargo.toml index f0b65ea5..deab9823 100644 --- a/nrf5340-app-hal/Cargo.toml +++ b/nrf5340-app-hal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nrf5340-app-hal" -version = "0.15.0" +version = "0.15.1" description = "HAL for nRF5340 app SoC" readme = "../README.md" @@ -22,7 +22,7 @@ nrf5340-app-pac = "0.11.0" path = "../nrf-hal-common" default-features = false features = ["5340-app"] -version = "=0.15.0" +version = "=0.15.1" [dependencies.embedded-hal] features = ["unproven"] diff --git a/nrf5340-app-hal/src/lib.rs b/nrf5340-app-hal/src/lib.rs index eeeb7b82..59f8c171 100644 --- a/nrf5340-app-hal/src/lib.rs +++ b/nrf5340-app-hal/src/lib.rs @@ -1,5 +1,5 @@ #![no_std] -#![doc(html_root_url = "https://docs.rs/nrf5340-app-hal/0.15.0")] +#![doc(html_root_url = "https://docs.rs/nrf5340-app-hal/0.15.1")] use embedded_hal as hal; pub use nrf_hal_common::*; diff --git a/nrf5340-net-hal/Cargo.toml b/nrf5340-net-hal/Cargo.toml index bbe1206c..cef432f4 100644 --- a/nrf5340-net-hal/Cargo.toml +++ b/nrf5340-net-hal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nrf5340-net-hal" -version = "0.15.0" +version = "0.15.1" description = "HAL for nRF5340 net SoC" readme = "../README.md" @@ -18,7 +18,7 @@ nrf5340-net-pac = "0.11.0" path = "../nrf-hal-common" default-features = false features = ["5340-net"] -version = "=0.15.0" +version = "=0.15.1" [dependencies.embedded-hal] features = ["unproven"] diff --git a/nrf5340-net-hal/src/lib.rs b/nrf5340-net-hal/src/lib.rs index 9afd96ae..0a889f24 100644 --- a/nrf5340-net-hal/src/lib.rs +++ b/nrf5340-net-hal/src/lib.rs @@ -1,5 +1,5 @@ #![no_std] -#![doc(html_root_url = "https://docs.rs/nrf5340-net-hal/0.15.0")] +#![doc(html_root_url = "https://docs.rs/nrf5340-net-hal/0.15.1")] use embedded_hal as hal; pub use nrf_hal_common::*; diff --git a/nrf9160-hal/Cargo.toml b/nrf9160-hal/Cargo.toml index dd27d6d5..0fd247e4 100644 --- a/nrf9160-hal/Cargo.toml +++ b/nrf9160-hal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nrf9160-hal" -version = "0.15.0" +version = "0.15.1" description = "HAL for nRF9160 system-in-package" readme = "../README.md" @@ -21,7 +21,7 @@ nrf9160-pac = "0.11.0" path = "../nrf-hal-common" default-features = false features = ["9160"] -version = "=0.15.0" +version = "=0.15.1" [dependencies.embedded-hal] features = ["unproven"] diff --git a/nrf9160-hal/src/lib.rs b/nrf9160-hal/src/lib.rs index b45a3867..f7ae3df5 100644 --- a/nrf9160-hal/src/lib.rs +++ b/nrf9160-hal/src/lib.rs @@ -1,5 +1,5 @@ #![no_std] -#![doc(html_root_url = "https://docs.rs/nrf9160-hal/0.15.0")] +#![doc(html_root_url = "https://docs.rs/nrf9160-hal/0.15.1")] use embedded_hal as hal; pub use nrf_hal_common::*;