Merge branch 'main' into wip

This commit is contained in:
Sebastian Hugentobler 2024-09-25 10:27:17 +02:00
commit 19202249b9
15 changed files with 332 additions and 1188 deletions

1047
display/Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -5,26 +5,26 @@ version = "0.1.0"
edition = "2021"
[dependencies.embassy-nrf]
version = "0.1.0"
version = "0.2.0"
git = "https://github.com/embassy-rs/embassy.git"
rev = "cf0d227cca92a80e85575154d380d1ff73fb32cf"
rev = "0ede8479dc4c6a58cfab0a5d4df41c0592405971"
features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"]
[dependencies.embassy-embedded-hal]
version = "0.1.0"
version = "0.2.0"
git = "https://github.com/embassy-rs/embassy.git"
rev = "cf0d227cca92a80e85575154d380d1ff73fb32cf"
rev = "0ede8479dc4c6a58cfab0a5d4df41c0592405971"
[dependencies.embassy-executor]
version = "0.5.0"
version = "0.6.0"
git = "https://github.com/embassy-rs/embassy.git"
rev = "cf0d227cca92a80e85575154d380d1ff73fb32cf"
rev = "0ede8479dc4c6a58cfab0a5d4df41c0592405971"
features = ["task-arena-size-32768", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"]
[dependencies.embassy-time]
version = "0.3.0"
version = "0.3.2"
git = "https://github.com/embassy-rs/embassy.git"
rev = "cf0d227cca92a80e85575154d380d1ff73fb32cf"
rev = "0ede8479dc4c6a58cfab0a5d4df41c0592405971"
features = ["defmt", "defmt-timestamp-uptime"]
[dependencies.embassy-sync]
@ -35,7 +35,7 @@ rev = "cf0d227cca92a80e85575154d380d1ff73fb32cf"
[dependencies.nrf-softdevice]
version = "0.1.0"
git = "https://github.com/embassy-rs/nrf-softdevice.git"
rev = "3c53b8c454cc9331082053033485e713abcadbb5"
rev = "991d28e3c61687908acc53e748191eb59d00e27a"
features = ["defmt", "ble-peripheral", "ble-central", "critical-section-impl", "ble-gatt-server", "nrf52840", "s140"]
[dependencies]