Merge #388

388: 0.15.1 r=jonas-schievink a=jonas-schievink Co-authored-by: Jonas Schievink <[email protected]>
nrf-rs · May 31, 2022 · 7623e05 · 7623e05
2 parents 56e2752 + b8f6b89
commit 7623e05
Show file tree

Hide file tree

Showing 24 changed files with 53 additions and 34 deletions.
diff --git 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/.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
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,25 @@
 
 ## Unreleased
 
-- Fixed the nvmc erase procedure on nRF91 & nRF53 ([#387])
-- Added support for the nrf5340-net-core.
+(no changes)
+
+## [0.15.1]
+
+### 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]
 
@@ -321,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/Cargo.ci.toml b/Cargo.ci.toml
@@ -13,6 +13,7 @@ members = [
   "nrf9160-hal",
   "examples/*",
 ]
+default-members = ["xtask"]
 exclude = ["examples/.cargo"]
 
 [profile.dev]

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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::*;