make it work, disgustingly

2 files changed, 60 insertions, 8 deletions

diff --git a/examples/stm32wb/src/bin/mac_ffd.rs b/examples/stm32wb/src/bin/mac_ffd.rs
index 4e2578a21..37d36fcdd 100644
--- a/examples/stm32wb/src/bin/mac_ffd.rs
+++ b/examples/stm32wb/src/bin/mac_ffd.rs
@@ -6,8 +6,9 @@ use defmt::*;
 use embassy_executor::Spawner;
 use embassy_stm32::bind_interrupts;
 use embassy_stm32::ipcc::{Config, ReceiveInterruptHandler, TransmitInterruptHandler};
-use embassy_stm32_wpan::sub::mac::commands::{ResetRequest, SetRequest, StartRequest};
-use embassy_stm32_wpan::sub::mac::typedefs::{MacChannel, PibId};
+use embassy_stm32_wpan::sub::mac::commands::{AssociateResponse, ResetRequest, SetRequest, StartRequest};
+use embassy_stm32_wpan::sub::mac::event::MacEvent;
+use embassy_stm32_wpan::sub::mac::typedefs::{MacChannel, MacStatus, PanId, PibId, SecurityLevel};
 use embassy_stm32_wpan::sub::mm;
 use embassy_stm32_wpan::TlMbox;
 use {defmt_rtt as _, panic_probe as _};
@@ -123,7 +124,7 @@ async fn main(spawner: Spawner) {
     info!("starting FFD device");
     mbox.mac_subsystem
         .send_command(&StartRequest {
-            pan_id: [0xAA, 0x1A],
+            pan_id: PanId([0x1A, 0xAA]),
             channel_number: MacChannel::Channel16,
             beacon_order: 0x0F,
             superframe_order: 0x0F,
@@ -151,5 +152,28 @@ async fn main(spawner: Spawner) {
     loop {
         let evt = mbox.mac_subsystem.read().await;
         defmt::info!("{:#x}", evt);
+
+        if let Ok(evt) = evt {
+            match evt {
+                MacEvent::MlmeAssociateInd(association) => mbox
+                    .mac_subsystem
+                    .send_command(&AssociateResponse {
+                        device_address: association.device_address,
+                        assoc_short_address: [0x33, 0x44],
+                        status: MacStatus::Success,
+                        security_level: SecurityLevel::Unsecure,
+                        ..Default::default()
+                    })
+                    .await
+                    .unwrap(),
+                MacEvent::McpsDataInd(data_ind) => {
+                    let data_addr = data_ind.msdu_ptr;
+                    let mut a = [0u8; 256];
+                    unsafe { data_addr.copy_to(&mut a as *mut _, data_ind.msdu_length as usize) }
+                    info!("{}", a[..data_ind.msdu_length as usize])
+                }
+                _ => {}
+            }
+        }
     }
 }
diff --git a/examples/stm32wb/src/bin/mac_rfd.rs b/examples/stm32wb/src/bin/mac_rfd.rs
index e5f8d54c9..756709132 100644
--- a/examples/stm32wb/src/bin/mac_rfd.rs
+++ b/examples/stm32wb/src/bin/mac_rfd.rs
@@ -6,10 +6,10 @@ use defmt::*;
 use embassy_executor::Spawner;
 use embassy_stm32::bind_interrupts;
 use embassy_stm32::ipcc::{Config, ReceiveInterruptHandler, TransmitInterruptHandler};
-use embassy_stm32_wpan::sub::mac::commands::{AssociateRequest, GetRequest, ResetRequest, SetRequest};
+use embassy_stm32_wpan::sub::mac::commands::{AssociateRequest, DataRequest, GetRequest, ResetRequest, SetRequest};
 use embassy_stm32_wpan::sub::mac::event::MacEvent;
 use embassy_stm32_wpan::sub::mac::typedefs::{
-    AddressMode, Capabilities, KeyIdMode, MacAddress, MacChannel, PibId, SecurityLevel,
+    AddressMode, Capabilities, KeyIdMode, MacAddress, MacChannel, PanId, PibId, SecurityLevel,
 };
 use embassy_stm32_wpan::sub::mm;
 use embassy_stm32_wpan::TlMbox;
@@ -112,7 +112,7 @@ async fn main(spawner: Spawner) {
         coord_addr_mode: AddressMode::Short,
         coord_address: MacAddress { short: [34, 17] },
         capability_information: Capabilities::ALLOCATE_ADDRESS,
-        coord_pan_id: [0xAA, 0x1A],
+        coord_pan_id: PanId([0x1A, 0xAA]),
         security_level: SecurityLevel::Unsecure,
         key_id_mode: KeyIdMode::Implicite,
         key_source: [0; 8],
@@ -123,11 +123,16 @@ async fn main(spawner: Spawner) {
     let evt = mbox.mac_subsystem.read().await;
     info!("{:#x}", evt);
 
+    let short_addr = if let Ok(MacEvent::MlmeAssociateCnf(conf)) = evt {
+        conf.assoc_short_address
+    } else {
+        defmt::panic!()
+    };
+
     info!("setting short address");
-    let short: u64 = 0xACDE480000000002;
     mbox.mac_subsystem
         .send_command(&SetRequest {
-            pib_attribute_ptr: &short as *const _ as *const u8,
+            pib_attribute_ptr: &short_addr as *const _ as *const u8,
             pib_attribute: PibId::ShortAddress,
         })
         .await
@@ -135,6 +140,29 @@ async fn main(spawner: Spawner) {
     let evt = mbox.mac_subsystem.read().await;
     info!("{:#x}", evt);
 
+    info!("sending data");
+    let mut data_buffer = [0u8; 256];
+    let data = b"Hello from embassy!";
+    data_buffer[..data.len()].copy_from_slice(data);
+    mbox.mac_subsystem
+        .send_command(&DataRequest {
+            src_addr_mode: AddressMode::Short,
+            dst_addr_mode: AddressMode::Short,
+            dst_pan_id: PanId::BROADCAST,
+            dst_address: MacAddress::BROADCAST,
+            msdu_handle: 0x02,
+            ack_tx: 0x00,
+            gts_tx: false,
+            msdu_ptr: &data_buffer as *const _ as *const u8,
+            msdu_length: data.len() as u8,
+            security_level: SecurityLevel::Unsecure,
+            ..Default::default()
+        })
+        .await
+        .unwrap();
+    let evt = mbox.mac_subsystem.read().await;
+    info!("{:#x}", evt);
+
     loop {
         let evt = mbox.mac_subsystem.read().await;
         info!("{:#x}", evt);