max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for rust-lorawan and lora-phy version 2.

Browse Source
This commit is contained in:
ceekdee
2023-09-24 10:33:03 -05:00
parent 65d36f9f99
commit 7d5e62d4a7
21 changed files with 56 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/nrf52840/Cargo.toml
View File

@ -38,7 +38,7 @@ embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defm
embedded-io = { version = "0.5.0", features = ["defmt-03"] }
embedded-io-async = { version = "0.5.0", optional = true, features = ["defmt-03"] }
embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["time", "defmt"], optional = true }
lora-phy = { version = "1", optional = true }
lora-phy = { version = "2", optional = true }
lorawan-device = { version = "0.10.0", default-features = false, features = ["async", "external-lora-phy"], optional = true }
lorawan = { version = "0.7.3", default-features = false, features = ["default-crypto"], optional = true }
embassy-net-esp-hosted = { version = "0.1.0", path = "../../embassy-net-esp-hosted", features = ["defmt"], optional = true }
@ -67,4 +67,5 @@ microfft = "0.5.0"
debug = 2
[patch.crates-io]
lora-phy = { git = "https://github.com/embassy-rs/lora-phy", rev = "1323eccc1c470d4259f95f4f315d1be830d572a3"}
lorawan-device = { git = "https://github.com/ivajloip/rust-lorawan", rev = "b0502c1a802427638cc8bcd928fc632d13b778b6"}
lorawan = { git = "https://github.com/ivajloip/rust-lorawan", rev = "b0502c1a802427638cc8bcd928fc632d13b778b6"}

4
examples/nrf52840/src/bin/lora_cad.rs
View File

@ -41,10 +41,8 @@ async fn main(_spawner: Spawner) {
let iv =
GenericSx126xInterfaceVariant::new(nss, reset, dio1, busy, Some(rf_switch_rx), Some(rf_switch_tx)).unwrap();
let mut delay = Delay;
let mut lora = {
match LoRa::new(SX1261_2::new(BoardType::Rak4631Sx1262, spim, iv), false, &mut delay).await {
match LoRa::new(SX1261_2::new(BoardType::Rak4631Sx1262, spim, iv), false, Delay).await {
Ok(l) => l,
Err(err) => {
info!("Radio error = {}", err);

11
examples/nrf52840/src/bin/lora_lorawan.rs
View File

@ -20,6 +20,7 @@ use lora_phy::LoRa;
use lorawan::default_crypto::DefaultFactory as Crypto;
use lorawan_device::async_device::lora_radio::LoRaRadio;
use lorawan_device::async_device::{region, Device, JoinMode};
use lorawan_device::{AppEui, AppKey, DevEui};
use {defmt_rtt as _, panic_probe as _};
const LORAWAN_REGION: region::Region = region::Region::EU868; // warning: set this appropriately for the region
@ -47,10 +48,8 @@ async fn main(_spawner: Spawner) {
let iv =
GenericSx126xInterfaceVariant::new(nss, reset, dio1, busy, Some(rf_switch_rx), Some(rf_switch_tx)).unwrap();
let mut delay = Delay;
let lora = {
match LoRa::new(SX1261_2::new(BoardType::Rak4631Sx1262, spim, iv), true, &mut delay).await {
match LoRa::new(SX1261_2::new(BoardType::Rak4631Sx1262, spim, iv), true, Delay).await {
Ok(l) => l,
Err(err) => {
info!("Radio error = {}", err);
@ -68,9 +67,9 @@ async fn main(_spawner: Spawner) {
// TODO: Adjust the EUI and Keys according to your network credentials
match device
.join(&JoinMode::OTAA {
deveui: [0, 0, 0, 0, 0, 0, 0, 0],
appeui: [0, 0, 0, 0, 0, 0, 0, 0],
appkey: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
deveui: DevEui::from([0, 0, 0, 0, 0, 0, 0, 0]),
appeui: AppEui::from([0, 0, 0, 0, 0, 0, 0, 0]),
appkey: AppKey::from([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),
})
.await
{

6
examples/nrf52840/src/bin/lora_p2p_receive.rs
View File

@ -41,10 +41,8 @@ async fn main(_spawner: Spawner) {
let iv =
GenericSx126xInterfaceVariant::new(nss, reset, dio1, busy, Some(rf_switch_rx), Some(rf_switch_tx)).unwrap();
let mut delay = Delay;
let mut lora = {
match LoRa::new(SX1261_2::new(BoardType::Rak4631Sx1262, spim, iv), false, &mut delay).await {
match LoRa::new(SX1261_2::new(BoardType::Rak4631Sx1262, spim, iv), false, Delay).await {
Ok(l) => l,
Err(err) => {
info!("Radio error = {}", err);
@ -88,7 +86,7 @@ async fn main(_spawner: Spawner) {
};
match lora
.prepare_for_rx(&mdltn_params, &rx_pkt_params, None, true, false, 0, 0x00ffffffu32)
.prepare_for_rx(&mdltn_params, &rx_pkt_params, None, None, false)
.await
{
Ok(()) => {}

8
examples/nrf52840/src/bin/lora_p2p_receive_duty_cycle.rs
View File

@ -41,10 +41,8 @@ async fn main(_spawner: Spawner) {
let iv =
GenericSx126xInterfaceVariant::new(nss, reset, dio1, busy, Some(rf_switch_rx), Some(rf_switch_tx)).unwrap();
let mut delay = Delay;
let mut lora = {
match LoRa::new(SX1261_2::new(BoardType::Rak4631Sx1262, spim, iv), false, &mut delay).await {
match LoRa::new(SX1261_2::new(BoardType::Rak4631Sx1262, spim, iv), false, Delay).await {
Ok(l) => l,
Err(err) => {
info!("Radio error = {}", err);
@ -92,14 +90,12 @@ async fn main(_spawner: Spawner) {
.prepare_for_rx(
&mdltn_params,
&rx_pkt_params,
None,
Some(&DutyCycleParams {
rx_time: 300_000, // 300_000 units * 15.625 us/unit = 4.69 s
sleep_time: 200_000, // 200_000 units * 15.625 us/unit = 3.13 s
}),
false,
false,
0,
0,
)
.await
{

6
examples/nrf52840/src/bin/lora_p2p_send.rs
View File

@ -41,10 +41,8 @@ async fn main(_spawner: Spawner) {
let iv =
GenericSx126xInterfaceVariant::new(nss, reset, dio1, busy, Some(rf_switch_rx), Some(rf_switch_tx)).unwrap();
let mut delay = Delay;
let mut lora = {
match LoRa::new(SX1261_2::new(BoardType::Rak4631Sx1262, spim, iv), false, &mut delay).await {
match LoRa::new(SX1261_2::new(BoardType::Rak4631Sx1262, spim, iv), false, Delay).await {
Ok(l) => l,
Err(err) => {
info!("Radio error = {}", err);
@ -97,7 +95,7 @@ async fn main(_spawner: Spawner) {
}
};
match lora.sleep(&mut delay).await {
match lora.sleep(false).await {
Ok(()) => info!("Sleep successful"),
Err(err) => info!("Sleep unsuccessful = {}", err),
}