Skip to content

Commit

Permalink
Merge pull request #15 from lulf/dfu-support
Browse files Browse the repository at this point in the history
Add DFU support
  • Loading branch information
lulf authored Jan 5, 2025
2 parents 2d61c4e + 4aa8187 commit bb6b132
Show file tree
Hide file tree
Showing 8 changed files with 281 additions and 197 deletions.
2 changes: 1 addition & 1 deletion firmware/.cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ runner = "probe-rs run --chip nRF52832_xxAA"
target = "thumbv7em-none-eabi"

[env]
DEFMT_LOG = "info"
DEFMT_LOG = "info,trouble_host=trace"
93 changes: 44 additions & 49 deletions firmware/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 14 additions & 10 deletions firmware/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,37 @@ embassy-futures = { version = "0.1" }
futures = { version = "0.3", default-features = false, features = ["async-await"]}
embassy-embedded-hal = { version = "0.2", default-features = false }
embassy-sync = { version = "0.6" }
embassy-executor = { version = "0.6", features = ["arch-cortex-m", "executor-thread", "defmt", "integrated-timers", "task-arena-size-8192"] }
embassy-executor = { version = "0.6", features = ["arch-cortex-m", "executor-thread", "defmt", "integrated-timers", "nightly"] }
embassy-time = { version = "0.3", features = ["defmt", "defmt-timestamp-uptime"] }
embassy-nrf = { version = "0.2", features = ["defmt", "nrf52832", "time-driver-rtc1", "rt", "gpiote", "unstable-pac", "time", "nfc-pins-as-gpio"] }
embedded-io = "0.6"
embedded-io-async = "0.6"
embedded-storage = "0.3"
embedded-storage-async = "0.4"
embedded-hal = "1.0"
nrf-dfu-target = { version = "0.1.1", features = ["defmt"] }
embedded-hal-async = "1.0"
embedded-hal-bus = "0.2"
nrf-dfu-target = { version = "0.3.0", features = ["defmt"] }
pinetime-flash = { version = "0.1.0", path = "../pinetime-flash", features = ["defmt"] }
watchful-ui = { version = "0.1.0", path = "../watchful-ui", features = ["defmt"] }
cst816s = "0.1.4"
hrs3300 = { version = "0.1.0" }

defmt = "0.3"
defmt-rtt = "0.4"
panic-probe = { version = "0.3", features = ["print-defmt"], optional = true }
defmt = "0.3.10"
defmt-rtt = "0.4.1"
panic-probe = { version = "0.3.2", features = ["print-defmt"], optional = true }
#defmt-brtt = { version = "0.1", features = ["async-await"] }
#
nrf-sdc = { version = "0.1.0", default-features = false, features = ["defmt", "nrf52832", "peripheral"] }
nrf-mpsl = { version = "0.1.0", default-features = false, features = ["defmt", "critical-section-impl"] }
bt-hci = { version = "0.1.2", default-features = false, features = ["defmt"] }
trouble-host = { version = "0.1.0", features = ["defmt", "gatt"] }
trouble-host = { version = "0.1.0", features = ["defmt", "gatt", "peripheral", "l2cap-tx-packet-pool-size-16"] }

static_cell = "1.1"
cortex-m = { version = "0.7.6", features = ["inline-asm"] }
cortex-m-rt = "0.7.0"
mipidsi = { version = "0.8", default-features = false, features = ["heapless"] }
heapless = "0.8"
heapless = { version = "0.8", features = ["defmt-03"] }
display-interface = "0.5"
embedded-graphics = "0.8"
embedded-text = "0.7"
Expand All @@ -54,9 +57,10 @@ vergen = { version = "8", features = ["build", "git", "gitcl"] }

[patch.crates-io]
hrs3300 = { git = "https://github.com/lulf/hrs3300-rs.git", branch = "hal-1.0" }
nrf-mpsl = { git = "https://github.com/alexmoon/nrf-sdc.git", rev = "9696ce04fd417dc5c448edbafab3fef23f2f34cd" }
nrf-sdc = { git = "https://github.com/alexmoon/nrf-sdc.git", rev = "9696ce04fd417dc5c448edbafab3fef23f2f34cd" }
trouble-host = { git = "https://github.com/embassy-rs/trouble.git", rev = "aa9a17f4aef51e67744fa922ba8c02c4bbf13fc2"}
nrf-mpsl = { git = "https://github.com/alexmoon/nrf-sdc.git", rev = "1dd59a3bc60309cb7f12ca2ba52566d63225a394" }
nrf-sdc = { git = "https://github.com/alexmoon/nrf-sdc.git", rev = "1dd59a3bc60309cb7f12ca2ba52566d63225a394" }
trouble-host = { git = "https://github.com/embassy-rs/trouble.git", rev = "07fa452e836f07a302596edb6a61e060d242e4ea" }
#trouble-host = { path = "../../trouble/host" }

embassy-executor = { git = "https://github.com/embassy-rs/embassy.git", rev = "fe79af56141adfeacb3cfcefc4400da0c5aabb5f" }
embassy-nrf = { git = "https://github.com/embassy-rs/embassy.git", rev = "fe79af56141adfeacb3cfcefc4400da0c5aabb5f" }
Expand Down
Loading

0 comments on commit bb6b132

Please sign in to comment.