Skip to content

Commit eb4ba6a

Browse files
bors[bot]jonas-schievinkDirbaio
authored
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]>
2 parents 23adfc5 + f8c94aa commit eb4ba6a

File tree

47 files changed

+261
-266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+261
-266
lines changed

examples/blinky-button-demo/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ edition = "2018"
77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
10-
cortex-m = "0.6.2"
11-
cortex-m-rt = "0.6.12"
10+
cortex-m = "0.7.3"
11+
cortex-m-rt = "0.7.0"
1212
rtt-target = {version = "0.2.0", features = ["cortex-m"] }
1313
nrf52832-hal = { features = ["rt"], path = "../../nrf52832-hal" }
1414

examples/ccm-demo/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ authors = [ "Thales Fragoso <[email protected]>"]
66
publish = false
77

88
[dependencies]
9-
cortex-m = "0.6.2"
10-
cortex-m-rt = "0.6.12"
9+
cortex-m = "0.7.3"
10+
cortex-m-rt = "0.7.0"
1111
rtt-target = {version = "0.2.0", features = ["cortex-m"] }
1212
rand_core = "0.6.3"
1313

examples/comp-demo/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ publish = false
88
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
99

1010
[dependencies]
11-
cortex-m = "0.6.2"
12-
cortex-m-rtic = "0.5.3"
13-
rtt-target = {version = "0.2.0", features = ["cortex-m"] }
11+
cortex-m = "0.7.3"
12+
cortex-m-rt = { version = "0.7.0", features = ["device"] }
13+
cortex-m-rtic = { version = "0.5.9", features = ["cortex-m-7"], default-features = false }
14+
rtt-target = { version = "0.3.1", features = ["cortex-m"] }
1415
nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
1516

1617
[dependencies.embedded-hal]

examples/ecb-demo/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ authors = [ "Thales Fragoso <[email protected]>"]
66
publish = false
77

88
[dependencies]
9-
cortex-m = "0.6.2"
10-
cortex-m-rt = "0.6.12"
11-
rtt-target = {version = "0.2.0", features = ["cortex-m"] }
9+
cortex-m = "0.7.3"
10+
cortex-m-rt = "0.7.0"
11+
rtt-target = { version = "0.3.1", features = ["cortex-m"] }
1212

1313
nrf52810-hal = { path = "../../nrf52810-hal", features = ["rt"], optional = true }
1414
nrf52811-hal = { path = "../../nrf52811-hal", features = ["rt"], optional = true }

examples/gpiote-demo/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ edition = "2018"
77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
10-
cortex-m = "0.6.2"
11-
cortex-m-rtic = "0.5.3"
12-
rtt-target = {version = "0.2.0", features = ["cortex-m"] }
10+
cortex-m = "0.7.3"
11+
cortex-m-rt = { version = "0.7.0", features = ["device"] }
12+
cortex-m-rtic = { version = "0.5.9", features = ["cortex-m-7"], default-features = false }
13+
rtt-target = { version = "0.3.1", features = ["cortex-m"] }
1314
nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
1415

1516
[dependencies.embedded-hal]

examples/hello-world/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ publish = false
88
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
99

1010
[dependencies]
11-
cortex-m = "0.6.2"
12-
cortex-m-rt = "0.6.12"
11+
cortex-m = "0.7.3"
12+
cortex-m-rt = "0.7.0"
1313

1414
[dependencies.embedded-hal]
1515
version = "0.2.3"

examples/i2s-controller-demo/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ publish = false
88
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
99

1010
[dependencies]
11-
cortex-m = "0.6.2"
12-
cortex-m-rtic = "0.5.3"
13-
rtt-target = {version = "0.2.0", features = ["cortex-m"] }
11+
cortex-m = "0.7.3"
12+
cortex-m-rt = { version = "0.7.0", features = ["device"] }
13+
cortex-m-rtic = { version = "0.5.9", features = ["cortex-m-7"], default-features = false }
14+
rtt-target = { version = "0.3.1", features = ["cortex-m"] }
1415
nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
1516
heapless = "0.5.5"
1617
small_morse = "0.1.0"

examples/i2s-peripheral-demo/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ publish = false
88
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
99

1010
[dependencies]
11-
cortex-m = "0.6.2"
12-
cortex-m-rtic = "0.5.3"
13-
rtt-target = {version = "0.2.0", features = ["cortex-m"] }
11+
cortex-m = "0.7.3"
12+
cortex-m-rt = { version = "0.7.0", features = ["device"] }
13+
cortex-m-rtic = { version = "0.5.9", features = ["cortex-m-7"], default-features = false }
14+
rtt-target = { version = "0.3.1", features = ["cortex-m"] }
1415
nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
1516

1617
[dependencies.embedded-hal]

examples/lpcomp-demo/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ edition = "2018"
77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
10-
cortex-m = "0.6.2"
11-
cortex-m-rtic = "0.5.3"
12-
rtt-target = {version = "0.2.0", features = ["cortex-m"] }
10+
cortex-m = "0.7.3"
11+
cortex-m-rt = { version = "0.7.0", features = ["device"] }
12+
cortex-m-rtic = { version = "0.5.9", features = ["cortex-m-7"], default-features = false }
13+
rtt-target = { version = "0.3.1", features = ["cortex-m"] }
1314
nrf52840-hal = { features = ["rt"], path = "../../nrf52840-hal" }
1415

1516
[dependencies.embedded-hal]

examples/nvmc-demo/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ publish = false
88
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
99

1010
[dependencies]
11-
cortex-m = "0.6.2"
12-
cortex-m-rt = "0.6.12"
13-
embedded-storage = "0.1.0"
11+
cortex-m = "0.7.3"
12+
cortex-m-rt = "0.7.0"
13+
embedded-storage = "0.2.0"
1414
rtt-target = {version = "0.2.0", features = ["cortex-m"] }
1515

1616
[dependencies.embedded-hal]

0 commit comments

Comments
 (0)