Skip to content

Commit

Permalink
Merge #346
Browse files Browse the repository at this point in the history
346: 0.13.0 r=jonas-schievink a=jonas-schievink

bors r+

Co-authored-by: Jonas Schievink <[email protected]>
  • Loading branch information
bors[bot] and jonas-schievink authored Aug 5, 2021
2 parents f336a2a + 8777e97 commit 82056db
Show file tree
Hide file tree
Showing 18 changed files with 29 additions and 25 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

(no changes)

## [0.13.0]

### New Features

- USB support ([#295]).
Expand Down Expand Up @@ -260,3 +264,4 @@ None
[0.12.0]: https://github.com/nrf-rs/nrf-hal/releases/tag/v0.12.0
[0.12.1]: https://github.com/nrf-rs/nrf-hal/releases/tag/v0.12.1
[0.12.2]: https://github.com/nrf-rs/nrf-hal/releases/tag/v0.12.2
[0.13.0]: https://github.com/nrf-rs/nrf-hal/releases/tag/v0.13.0
3 changes: 1 addition & 2 deletions examples/usb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name = "usb"
version = "0.1.0"
authors = ["Jonas Schievink <[email protected]>"]
edition = "2018"
publish = false

[dependencies]
cortex-m-rt = "0.6.12"
Expand All @@ -12,6 +13,4 @@ usb-device = "0.2.7"
usbd-serial = "0.1.0"

[dependencies.nrf52840-hal]
version = "0.12.0"
path = "../../nrf52840-hal"

2 changes: 1 addition & 1 deletion nrf-hal-common/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nrf-hal-common"
version = "0.12.2"
version = "0.13.0"
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"

Expand Down
2 changes: 1 addition & 1 deletion nrf-hal-common/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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.12.2")]
#![doc(html_root_url = "https://docs.rs/nrf-hal-common/0.13.0")]
#![no_std]

use embedded_hal as hal;
Expand Down
4 changes: 2 additions & 2 deletions nrf51-hal/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nrf51-hal"
version = "0.12.2"
version = "0.13.0"
edition = "2018"
description = "HAL for nRF51 microcontrollers"
readme = "../README.md"
Expand All @@ -25,7 +25,7 @@ nrf51 = "0.9.0"
path = "../nrf-hal-common"
default-features = false
features = ["51"]
version = "=0.12.2"
version = "=0.13.0"

[dependencies.embedded-hal]
features = ["unproven"]
Expand Down
2 changes: 1 addition & 1 deletion nrf51-hal/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![no_std]
#![doc(html_root_url = "https://docs.rs/nrf51-hal/0.12.2")]
#![doc(html_root_url = "https://docs.rs/nrf51-hal/0.13.0")]

use embedded_hal as hal;
pub use nrf_hal_common::*;
Expand Down
4 changes: 2 additions & 2 deletions nrf52810-hal/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nrf52810-hal"
version = "0.12.2"
version = "0.13.0"
edition = "2018"
description = "HAL for nRF52810 microcontrollers"
readme = "../README.md"
Expand All @@ -24,7 +24,7 @@ nrf52810-pac = "0.9.0"
path = "../nrf-hal-common"
default-features = false
features = ["52810"]
version = "=0.12.2"
version = "=0.13.0"

[dependencies.embedded-hal]
features = ["unproven"]
Expand Down
2 changes: 1 addition & 1 deletion nrf52810-hal/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![no_std]
#![doc(html_root_url = "https://docs.rs/nrf52810-hal/0.12.2")]
#![doc(html_root_url = "https://docs.rs/nrf52810-hal/0.13.0")]

use embedded_hal as hal;
pub use nrf_hal_common::*;
Expand Down
4 changes: 2 additions & 2 deletions nrf52811-hal/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nrf52811-hal"
version = "0.12.2"
version = "0.13.0"
edition = "2018"
description = "HAL for nRF52811 microcontrollers"
readme = "../README.md"
Expand All @@ -24,7 +24,7 @@ nrf52811-pac = "0.9.1"
path = "../nrf-hal-common"
default-features = false
features = ["52811"]
version = "=0.12.2"
version = "=0.13.0"

[dependencies.embedded-hal]
features = ["unproven"]
Expand Down
2 changes: 1 addition & 1 deletion nrf52811-hal/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![no_std]
#![doc(html_root_url = "https://docs.rs/nrf52811-hal/0.12.2")]
#![doc(html_root_url = "https://docs.rs/nrf52811-hal/0.13.0")]

use embedded_hal as hal;
pub use nrf_hal_common::*;
Expand Down
4 changes: 2 additions & 2 deletions nrf52832-hal/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nrf52832-hal"
version = "0.12.2"
version = "0.13.0"
description = "HAL for nRF52832 microcontrollers"
readme = "../README.md"

Expand All @@ -22,7 +22,7 @@ nrf52832-pac = "0.9.0"
path = "../nrf-hal-common"
default-features = false
features = ["52832"]
version = "=0.12.2"
version = "=0.13.0"

[dependencies.embedded-hal]
features = ["unproven"]
Expand Down
2 changes: 1 addition & 1 deletion nrf52832-hal/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![no_std]
#![doc(html_root_url = "https://docs.rs/nrf52832-hal/0.12.2")]
#![doc(html_root_url = "https://docs.rs/nrf52832-hal/0.13.0")]

use embedded_hal as hal;
pub use nrf_hal_common::*;
Expand Down
4 changes: 2 additions & 2 deletions nrf52833-hal/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nrf52833-hal"
version = "0.12.2"
version = "0.13.0"
description = "HAL for nRF52833 microcontrollers"
readme = "../README.md"

Expand All @@ -25,7 +25,7 @@ nrf52833-pac = "0.9.0"
path = "../nrf-hal-common"
default-features = false
features = ["52833"]
version = "=0.12.2"
version = "=0.13.0"

[dependencies.embedded-hal]
features = ["unproven"]
Expand Down
2 changes: 1 addition & 1 deletion nrf52833-hal/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![no_std]
#![doc(html_root_url = "https://docs.rs/nrf52833-hal/0.12.2")]
#![doc(html_root_url = "https://docs.rs/nrf52833-hal/0.13.0")]

use embedded_hal as hal;
pub use nrf_hal_common::*;
Expand Down
4 changes: 2 additions & 2 deletions nrf52840-hal/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nrf52840-hal"
version = "0.12.2"
version = "0.13.0"
description = "HAL for nRF52840 microcontrollers"
readme = "../README.md"

Expand All @@ -24,7 +24,7 @@ nrf52840-pac = "0.9.0"
path = "../nrf-hal-common"
default-features = false
features = ["52840"]
version = "=0.12.2"
version = "=0.13.0"

[dependencies.embedded-hal]
features = ["unproven"]
Expand Down
2 changes: 1 addition & 1 deletion nrf52840-hal/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![no_std]
#![doc(html_root_url = "https://docs.rs/nrf52840-hal/0.12.2")]
#![doc(html_root_url = "https://docs.rs/nrf52840-hal/0.13.0")]

use embedded_hal as hal;
pub use nrf_hal_common::*;
Expand Down
4 changes: 2 additions & 2 deletions nrf9160-hal/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "nrf9160-hal"
version = "0.12.2"
version = "0.13.0"
description = "HAL for nRF9160 system-in-package"
readme = "../README.md"

Expand All @@ -21,7 +21,7 @@ nrf9160-pac = "0.2.0"
path = "../nrf-hal-common"
default-features = false
features = ["9160"]
version = "=0.12.2"
version = "=0.13.0"

[dependencies.embedded-hal]
features = ["unproven"]
Expand Down
2 changes: 1 addition & 1 deletion nrf9160-hal/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![no_std]
#![doc(html_root_url = "https://docs.rs/nrf9160-hal/0.12.2")]
#![doc(html_root_url = "https://docs.rs/nrf9160-hal/0.13.0")]

use embedded_hal as hal;
pub use nrf_hal_common::*;
Expand Down

0 comments on commit 82056db

Please sign in to comment.