Skip to content

Commit 74df54b

Browse files
committed
fix: fix nrf DFU by updating to new version
The new version properly erases the entire DFU partition and writes magic.
1 parent b6424d9 commit 74df54b

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

firmware/Cargo.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

firmware/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ embedded-storage-async = "0.4"
2121
embedded-hal = "1.0"
2222
embedded-hal-async = "1.0"
2323
embedded-hal-bus = "0.2"
24-
nrf-dfu-target = { version = "0.3.1", features = ["defmt"] }
24+
nrf-dfu-target = { version = "0.3.2", features = ["defmt"] }
2525
pinetime-flash = { version = "0.1.0", path = "../pinetime-flash", features = ["defmt"] }
2626
watchful-ui = { version = "0.1.0", path = "../watchful-ui", features = ["defmt"] }
2727
cst816s = "0.1.4"
@@ -60,6 +60,7 @@ hrs3300 = { git = "https://github.com/lulf/hrs3300-rs.git", branch = "hal-1.0" }
6060
nrf-mpsl = { git = "https://github.com/alexmoon/nrf-sdc.git", rev = "1dd59a3bc60309cb7f12ca2ba52566d63225a394" }
6161
nrf-sdc = { git = "https://github.com/alexmoon/nrf-sdc.git", rev = "1dd59a3bc60309cb7f12ca2ba52566d63225a394" }
6262
trouble-host = { git = "https://github.com/embassy-rs/trouble.git", rev = "07fa452e836f07a302596edb6a61e060d242e4ea" }
63+
#nrf-dfu-target = { path = "../../nrf-dfu" }
6364
#trouble-host = { path = "../../trouble/host" }
6465

6566
embassy-executor = { git = "https://github.com/embassy-rs/embassy.git", rev = "fe79af56141adfeacb3cfcefc4400da0c5aabb5f" }

rust-toolchain.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Before upgrading check that everything is available on all tier1 targets here:
22
# https://rust-lang.github.io/rustup-components-history
33
[toolchain]
4-
channel = "nightly-2024-07-16"
4+
channel = "nightly-2024-12-10"
55
components = [ "rust-src", "rustfmt", "llvm-tools-preview" ]
66
targets = [
77
"thumbv7em-none-eabi",

tools/mcuboot/mcuboot.bin

21.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)