From 86e52e67d0334159150689e4df4e38a7622fcddb Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Fri, 8 Apr 2022 12:58:57 +0200 Subject: [PATCH] Update to latest rust-lorawan version --- embassy-lora/Cargo.toml | 4 ++-- examples/stm32l0/Cargo.toml | 4 ++-- examples/stm32l0/src/bin/lorawan.rs | 10 ++-------- examples/stm32wl/Cargo.toml | 4 ++-- examples/stm32wl/src/bin/lorawan.rs | 10 ++-------- 5 files changed, 10 insertions(+), 22 deletions(-) diff --git a/embassy-lora/Cargo.toml b/embassy-lora/Cargo.toml index 7966e6d4c..97af7dd79 100644 --- a/embassy-lora/Cargo.toml +++ b/embassy-lora/Cargo.toml @@ -34,5 +34,5 @@ futures = { version = "0.3.17", default-features = false, features = [ "async-aw embedded-hal = { version = "0.2", features = ["unproven"] } bit_field = { version = "0.10" } -lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "0de1a2a31933f7c97887b5718c1755fa5ab93a42", default-features = false, features = ["async"] } -lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "0de1a2a31933f7c97887b5718c1755fa5ab93a42", default-features = false } +lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "607d7ee4917e26998b5f130304becde969b6b434", default-features = false, features = ["async"] } +lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "607d7ee4917e26998b5f130304becde969b6b434", default-features = false } diff --git a/examples/stm32l0/Cargo.toml b/examples/stm32l0/Cargo.toml index 8063e6c7e..a8850677d 100644 --- a/examples/stm32l0/Cargo.toml +++ b/examples/stm32l0/Cargo.toml @@ -15,8 +15,8 @@ embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = [" embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["sx127x", "time", "defmt"], optional = true} -lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "0de1a2a31933f7c97887b5718c1755fa5ab93a42", default-features = false, features = ["async"], optional = true } -lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "0de1a2a31933f7c97887b5718c1755fa5ab93a42", default-features = false, features = ["default-crypto"], optional = true } +lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "607d7ee4917e26998b5f130304becde969b6b434", default-features = false, features = ["async"], optional = true } +lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "607d7ee4917e26998b5f130304becde969b6b434", default-features = false, features = ["default-crypto"], optional = true } defmt = "0.3" defmt-rtt = "0.3" diff --git a/examples/stm32l0/src/bin/lorawan.rs b/examples/stm32l0/src/bin/lorawan.rs index 22304f8e5..93cdd1c9f 100644 --- a/examples/stm32l0/src/bin/lorawan.rs +++ b/examples/stm32l0/src/bin/lorawan.rs @@ -54,14 +54,8 @@ async fn main(_spawner: embassy::executor::Spawner, p: Peripherals) { .unwrap(); let region = region::EU868::default().into(); - let mut radio_buffer = [0; 256]; - let mut device: Device<'_, _, Crypto, _, _> = Device::new( - region, - radio, - LoraTimer, - Rng::new(p.RNG), - &mut radio_buffer[..], - ); + let mut device: Device<_, Crypto, _, _> = + Device::new(region, radio, LoraTimer, Rng::new(p.RNG)); defmt::info!("Joining LoRaWAN network"); diff --git a/examples/stm32wl/Cargo.toml b/examples/stm32wl/Cargo.toml index e95a009ce..1c2242f30 100644 --- a/examples/stm32wl/Cargo.toml +++ b/examples/stm32wl/Cargo.toml @@ -10,8 +10,8 @@ embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "def embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32wl55jc-cm4", "time-driver-any", "memory-x", "subghz", "unstable-pac", "exti"] } embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["stm32wl", "time"] } -lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "0de1a2a31933f7c97887b5718c1755fa5ab93a42", default-features = false, features = ["async"] } -lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "0de1a2a31933f7c97887b5718c1755fa5ab93a42", default-features = false, features = ["default-crypto"] } +lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "607d7ee4917e26998b5f130304becde969b6b434", default-features = false, features = ["async"] } +lorawan-encoding = { git = "https://github.com/ivajloip/rust-lorawan.git", rev = "607d7ee4917e26998b5f130304becde969b6b434", default-features = false, features = ["default-crypto"] } defmt = "0.3" defmt-rtt = "0.3" diff --git a/examples/stm32wl/src/bin/lorawan.rs b/examples/stm32wl/src/bin/lorawan.rs index db4725630..2e3221fcc 100644 --- a/examples/stm32wl/src/bin/lorawan.rs +++ b/examples/stm32wl/src/bin/lorawan.rs @@ -43,14 +43,8 @@ async fn main(_spawner: embassy::executor::Spawner, p: Peripherals) { let radio = unsafe { SubGhzRadio::new(&mut RADIO_STATE, radio, rfs, irq) }; let region = region::EU868::default().into(); - let mut radio_buffer = [0; 256]; - let mut device: Device<'_, _, Crypto, _, _> = Device::new( - region, - radio, - LoraTimer, - Rng::new(p.RNG), - &mut radio_buffer[..], - ); + let mut device: Device<_, Crypto, _, _> = + Device::new(region, radio, LoraTimer, Rng::new(p.RNG)); defmt::info!("Joining LoRaWAN network");