Merge #357

357: Upgrade PACs and other dependencies r=Dirbaio a=jonas-schievink Fixes #350 Co-authored-by: Jonas Schievink <[email protected]> Co-authored-by: Dario Nieuwenhuis <[email protected]>
nrf-rs · Sep 27, 2021 · eb4ba6a · eb4ba6a
2 parents 23adfc5 + f8c94aa
commit eb4ba6a
Show file tree

Hide file tree

Showing 47 changed files with 261 additions and 266 deletions.
diff --git a/examples/blinky-button-demo/Cargo.toml b/examples/blinky-button-demo/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rt = "0.6.12"
+cortex-m = "0.7.3"
+cortex-m-rt = "0.7.0"
 rtt-target = {version = "0.2.0", features = ["cortex-m"] }
 nrf52832-hal = { features = ["rt"], path = "../../nrf52832-hal" }
 

diff --git a/examples/ccm-demo/Cargo.toml b/examples/ccm-demo/Cargo.toml
@@ -6,8 +6,8 @@ authors = [ "Thales Fragoso <[email protected]>"]
 publish = false
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rt = "0.6.12"
+cortex-m = "0.7.3"
+cortex-m-rt = "0.7.0"
 rtt-target = {version = "0.2.0", features = ["cortex-m"] }
 rand_core = "0.6.3"
 

diff --git a/examples/comp-demo/Cargo.toml b/examples/comp-demo/Cargo.toml
@@ -8,9 +8,10 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rtic = "0.5.3"
-rtt-target = {version = "0.2.0", features = ["cortex-m"] }
+cortex-m = "0.7.3"
+cortex-m-rt = { version = "0.7.0", features = ["device"] }
+cortex-m-rtic = { version = "0.5.9", features = ["cortex-m-7"], default-features = false }
+rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
 
 [dependencies.embedded-hal]

diff --git a/examples/ecb-demo/Cargo.toml b/examples/ecb-demo/Cargo.toml
@@ -6,9 +6,9 @@ authors = [ "Thales Fragoso <[email protected]>"]
 publish = false
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rt = "0.6.12"
-rtt-target = {version = "0.2.0", features = ["cortex-m"] }
+cortex-m = "0.7.3"
+cortex-m-rt = "0.7.0"
+rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 
 nrf52810-hal = { path = "../../nrf52810-hal", features = ["rt"], optional = true }
 nrf52811-hal = { path = "../../nrf52811-hal", features = ["rt"], optional = true }

diff --git a/examples/gpiote-demo/Cargo.toml b/examples/gpiote-demo/Cargo.toml
@@ -7,9 +7,10 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rtic = "0.5.3"
-rtt-target = {version = "0.2.0", features = ["cortex-m"] }
+cortex-m = "0.7.3"
+cortex-m-rt = { version = "0.7.0", features = ["device"] }
+cortex-m-rtic = { version = "0.5.9", features = ["cortex-m-7"], default-features = false }
+rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
 
 [dependencies.embedded-hal]

diff --git a/examples/hello-world/Cargo.toml b/examples/hello-world/Cargo.toml
@@ -8,8 +8,8 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rt = "0.6.12"
+cortex-m = "0.7.3"
+cortex-m-rt = "0.7.0"
 
 [dependencies.embedded-hal]
 version = "0.2.3"

diff --git a/examples/i2s-controller-demo/Cargo.toml b/examples/i2s-controller-demo/Cargo.toml
@@ -8,9 +8,10 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rtic = "0.5.3"
-rtt-target = {version = "0.2.0", features = ["cortex-m"] }
+cortex-m = "0.7.3"
+cortex-m-rt = { version = "0.7.0", features = ["device"] }
+cortex-m-rtic = { version = "0.5.9", features = ["cortex-m-7"], default-features = false }
+rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
 heapless = "0.5.5"
 small_morse = "0.1.0"

diff --git a/examples/i2s-peripheral-demo/Cargo.toml b/examples/i2s-peripheral-demo/Cargo.toml
@@ -8,9 +8,10 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rtic = "0.5.3"
-rtt-target = {version = "0.2.0", features = ["cortex-m"] }
+cortex-m = "0.7.3"
+cortex-m-rt = { version = "0.7.0", features = ["device"] }
+cortex-m-rtic = { version = "0.5.9", features = ["cortex-m-7"], default-features = false }
+rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
 
 [dependencies.embedded-hal]

diff --git a/examples/lpcomp-demo/Cargo.toml b/examples/lpcomp-demo/Cargo.toml
@@ -7,9 +7,10 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rtic = "0.5.3"
-rtt-target = {version = "0.2.0", features = ["cortex-m"] }
+cortex-m = "0.7.3"
+cortex-m-rt = { version = "0.7.0", features = ["device"] }
+cortex-m-rtic = { version = "0.5.9", features = ["cortex-m-7"], default-features = false }
+rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
 
 [dependencies.embedded-hal]

diff --git a/examples/nvmc-demo/Cargo.toml b/examples/nvmc-demo/Cargo.toml
@@ -8,9 +8,9 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rt = "0.6.12"
-embedded-storage = "0.1.0"
+cortex-m = "0.7.3"
+cortex-m-rt = "0.7.0"
+embedded-storage = "0.2.0"
 rtt-target = {version = "0.2.0", features = ["cortex-m"] }
 
 [dependencies.embedded-hal]

diff --git a/examples/nvmc-demo/src/main.rs b/examples/nvmc-demo/src/main.rs
@@ -28,11 +28,11 @@ fn main() -> ! {
     #[cfg(feature = "52840")]
     let mut nvmc = Nvmc::new(p.NVMC, unsafe { &mut CONFIG });
 
-    assert!(nvmc.try_erase(0, CONFIG_SIZE as u32 * 4).is_ok());
+    assert!(nvmc.erase(0, CONFIG_SIZE as u32 * 4).is_ok());
     let write_buf: [u8; 4] = [1, 2, 3, 4];
-    assert!(nvmc.try_write(0, &write_buf).is_ok());
+    assert!(nvmc.write(0, &write_buf).is_ok());
     let mut read_buf = [0u8; 2];
-    assert!(nvmc.try_read(0, &mut read_buf).is_ok());
+    assert!(nvmc.read(0, &mut read_buf).is_ok());
     assert_eq!(read_buf, write_buf[0..2]);
 
     rprintln!("What was written to flash was read!");

diff --git a/examples/ppi-demo/Cargo.toml b/examples/ppi-demo/Cargo.toml
@@ -6,8 +6,8 @@ authors = [ "Thales Fragoso <[email protected]>"]
 publish = false
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rt = "0.6.12"
+cortex-m = "0.7.3"
+cortex-m-rt = "0.7.0"
 rtt-target = {version = "0.2.0", features = ["cortex-m"] }
 
 nrf52810-hal = { path = "../../nrf52810-hal", features = ["rt"], optional = true }

diff --git a/examples/pwm-blinky-demo/Cargo.toml b/examples/pwm-blinky-demo/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rt = "0.6.12"
+cortex-m = "0.7.3"
+cortex-m-rt = "0.7.0"
 rtt-target = {version = "0.2.0", features = ["cortex-m"] }
 nb = "1.0.0"
 

diff --git a/examples/pwm-demo/Cargo.toml b/examples/pwm-demo/Cargo.toml
@@ -7,9 +7,10 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rtic = "0.5.3"
-rtt-target = {version = "0.2.0", features = ["cortex-m"] }
+cortex-m = "0.7.3"
+cortex-m-rt = { version = "0.7.0", features = ["device"] }
+cortex-m-rtic = { version = "0.5.9", features = ["cortex-m-7"], default-features = false }
+rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 
 [dependencies.embedded-hal]
 version = "0.2.3"

diff --git a/examples/qdec-demo/Cargo.toml b/examples/qdec-demo/Cargo.toml
@@ -7,9 +7,10 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rtic = "0.5.3"
-rtt-target = {version = "0.2.0", features = ["cortex-m"] }
+cortex-m = "0.7.3"
+cortex-m-rt = { version = "0.7.0", features = ["device"] }
+cortex-m-rtic = { version = "0.5.9", features = ["cortex-m-7"], default-features = false }
+rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
 
 [dependencies.embedded-hal]

diff --git a/examples/rtc-demo/Cargo.toml b/examples/rtc-demo/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rt = "0.6.12"
+cortex-m = "0.7.3"
+cortex-m-rt = "0.7.0"
 rtt-target = {version = "0.2.0", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
 

diff --git a/examples/rtic-demo/Cargo.toml b/examples/rtic-demo/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 publish = false
 
 [dependencies]
-cortex-m-rtic = "0.5.3"
+cortex-m-rtic = "0.5.9"
 panic-semihosting = "0.5.3"
 cortex-m-semihosting = "0.3.5"
 

diff --git a/examples/spi-demo/Cargo.toml b/examples/spi-demo/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 publish = false
 
 [dependencies]
-cortex-m-rt = "0.6.5"
+cortex-m-rt = "0.7.0"
 panic-halt = "0.2.0"
 embedded-hal-spy = "0.0.3"
 

diff --git a/examples/spis-demo/Cargo.toml b/examples/spis-demo/Cargo.toml
@@ -7,9 +7,10 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rtic = "0.5.3"
-rtt-target = {version = "0.2.0", features = ["cortex-m"] }
+cortex-m = "0.7.3"
+cortex-m-rt = { version = "0.7.0", features = ["device"] }
+cortex-m-rtic = { version = "0.5.9", features = ["cortex-m-7"], default-features = false }
+rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
 
 [dependencies.embedded-hal]

diff --git a/examples/twi-ssd1306/Cargo.toml b/examples/twi-ssd1306/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 publish = false
 
 [dependencies]
-cortex-m-rt = "0.6.12"
+cortex-m-rt = "0.7.0"
 ssd1306 = "0.2.6"
 embedded-graphics = "0.4.7"
 panic-semihosting = "0.5.3"

diff --git a/examples/twim-demo/Cargo.toml b/examples/twim-demo/Cargo.toml
@@ -7,9 +7,10 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rtic = "0.5.3"
-rtt-target = {version = "0.2.0", features = ["cortex-m"] }
+cortex-m = "0.7.3"
+cortex-m-rt = { version = "0.7.0", features = ["device"] }
+cortex-m-rtic = { version = "0.5.9", features = ["cortex-m-7"], default-features = false }
+rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
 
 [dependencies.embedded-hal]

diff --git a/examples/twis-demo/Cargo.toml b/examples/twis-demo/Cargo.toml
@@ -7,9 +7,10 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rtic = "0.5.3"
-rtt-target = {version = "0.2.0", features = ["cortex-m"] }
+cortex-m = "0.7.3"
+cortex-m-rt = { version = "0.7.0", features = ["device"] }
+cortex-m-rtic = { version = "0.5.9", features = ["cortex-m-7"], default-features = false }
+rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
 
 [dependencies.embedded-hal]

diff --git a/examples/twis-dma-demo/Cargo.toml b/examples/twis-dma-demo/Cargo.toml
@@ -7,9 +7,10 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rtic = "0.5.3"
-rtt-target = {version = "0.2.0", features = ["cortex-m"] }
+cortex-m = "0.7.3"
+cortex-m-rt = { version = "0.7.0", features = ["device"] }
+cortex-m-rtic = { version = "0.5.9", features = ["cortex-m-7"], default-features = false }
+rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
 
 [dependencies.embedded-hal]

diff --git a/examples/usb/Cargo.toml b/examples/usb/Cargo.toml
@@ -6,9 +6,9 @@ edition = "2018"
 publish = false
 
 [dependencies]
-cortex-m-rt = "0.6.12"
+cortex-m-rt = "0.7.0"
 panic-semihosting = "0.5.3"
-nrf52840-pac = "0.9.0"
+nrf52840-pac = "0.10.1"
 usb-device = "0.2.7"
 usbd-serial = "0.1.0"
 

diff --git a/examples/wdt-demo/Cargo.toml b/examples/wdt-demo/Cargo.toml
@@ -8,9 +8,10 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cortex-m = "0.6.2"
-cortex-m-rtic = "0.5.3"
-rtt-target = {version = "0.2.0", features = ["cortex-m"] }
+cortex-m = "0.7.3"
+cortex-m-rt = { version = "0.7.0", features = ["device"] }
+cortex-m-rtic = { version = "0.5.9", features = ["cortex-m-7"], default-features = false }
+rtt-target = { version = "0.3.1", features = ["cortex-m"] }
 nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
 
 [dependencies.embedded-hal]

diff --git a/nrf-hal-common/Cargo.toml b/nrf-hal-common/Cargo.toml
@@ -26,43 +26,43 @@ fixed = "1.0.0"
 rand_core = "0.6.3"
 cfg-if = "1.0.0"
 embedded-dma = "0.1.1"
-embedded-storage = "0.1.0"
+embedded-storage = "0.2.0"
 
 [dependencies.void]
 default-features = false
 version = "1.0.2"
 
 [dependencies.cast]
 default-features = false
-version = "0.2.3"
+version = "0.3.0"
 
-[dependencies.nrf51]
+[dependencies.nrf51-pac]
 optional = true
-version = "0.9.0"
+version = "0.10.1"
 
 [dependencies.nrf52810-pac]
 optional = true
-version = "0.9.0"
+version = "0.10.1"
 
 [dependencies.nrf52811-pac]
 optional = true
-version = "0.9.0"
+version = "0.10.1"
 
 [dependencies.nrf52832-pac]
 optional = true
-version = "0.9.0"
+version = "0.10.1"
 
 [dependencies.nrf52833-pac]
 optional = true
-version = "0.9.0"
+version = "0.10.1"
 
 [dependencies.nrf52840-pac]
 optional = true
-version = "0.9.0"
+version = "0.10.1"
 
 [dependencies.nrf9160-pac]
 optional = true
-version = "0.2.1"
+version = "0.10.1"
 
 [dependencies.nrf-usbd]
 version = "0.1.0"
@@ -74,7 +74,7 @@ version = "0.2.4"
 
 [features]
 doc = []
-51 = ["nrf51"]
+51 = ["nrf51-pac"]
 52810 = ["nrf52810-pac"]
 52811 = ["nrf52811-pac"]
 52832 = ["nrf52832-pac"]