wip: added MAC commands

3 files changed, 207 insertions, 34 deletions

diff --git a/examples/stm32wb/Cargo.toml b/examples/stm32wb/Cargo.toml
index 109734546..f23c8afa6 100644
--- a/examples/stm32wb/Cargo.toml
+++ b/examples/stm32wb/Cargo.toml
@@ -36,7 +36,7 @@ name = "tl_mbox_mac"
 required-features = ["mac"]
 
 [[bin]] 
-name = "tl_mbox_mac_2"
+name = "mac_ffd"
 required-features = ["mac"]
 
 [[bin]] 
diff --git a/examples/stm32wb/src/bin/mac_ffd.rs b/examples/stm32wb/src/bin/mac_ffd.rs
new file mode 100644
index 000000000..4100d1ac5
--- /dev/null
+++ b/examples/stm32wb/src/bin/mac_ffd.rs
@@ -0,0 +1,174 @@
+#![no_std]
+#![no_main]
+#![feature(type_alias_impl_trait)]
+
+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::PibId;
+use embassy_stm32_wpan::sub::mm;
+use embassy_stm32_wpan::TlMbox;
+use {defmt_rtt as _, panic_probe as _};
+
+bind_interrupts!(struct Irqs{
+    IPCC_C1_RX => ReceiveInterruptHandler;
+    IPCC_C1_TX => TransmitInterruptHandler;
+});
+
+#[embassy_executor::task]
+async fn run_mm_queue(memory_manager: mm::MemoryManager) {
+    memory_manager.run_queue().await;
+}
+
+#[embassy_executor::main]
+async fn main(spawner: Spawner) {
+    /*
+        How to make this work:
+
+        - Obtain a NUCLEO-STM32WB55 from your preferred supplier.
+        - Download and Install STM32CubeProgrammer.
+        - Download stm32wb5x_FUS_fw.bin, stm32wb5x_BLE_Stack_full_fw.bin, and Release_Notes.html from
+          gh:STMicroelectronics/STM32CubeWB@2234d97/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x
+        - Open STM32CubeProgrammer
+        - On the right-hand pane, click "firmware upgrade" to upgrade the st-link firmware.
+        - Once complete, click connect to connect to the device.
+        - On the left hand pane, click the RSS signal icon to open "Firmware Upgrade Services".
+        - In the Release_Notes.html, find the memory address that corresponds to your device for the stm32wb5x_FUS_fw.bin file
+        - Select that file, the memory address, "verify download", and then "Firmware Upgrade".
+        - Once complete, in the Release_Notes.html, find the memory address that corresponds to your device for the
+          stm32wb5x_BLE_Stack_full_fw.bin file. It should not be the same memory address.
+        - Select that file, the memory address, "verify download", and then "Firmware Upgrade".
+        - Select "Start Wireless Stack".
+        - Disconnect from the device.
+        - In the examples folder for stm32wb, modify the memory.x file to match your target device.
+        - Run this example.
+
+        Note: extended stack versions are not supported at this time. Do not attempt to install a stack with "extended" in the name.
+    */
+
+    let p = embassy_stm32::init(Default::default());
+    info!("Hello World!");
+
+    let config = Config::default();
+    let mbox = TlMbox::init(p.IPCC, Irqs, config);
+
+    spawner.spawn(run_mm_queue(mbox.mm_subsystem)).unwrap();
+
+    let sys_event = mbox.sys_subsystem.read().await;
+    info!("sys event: {}", sys_event.payload());
+
+    core::mem::drop(sys_event);
+
+    let result = mbox.sys_subsystem.shci_c2_mac_802_15_4_init().await;
+    info!("initialized mac: {}", result);
+
+    info!("resetting");
+    let response = mbox
+        .mac_subsystem
+        .send_command(ResetRequest { set_default_pib: true })
+        .await;
+    info!("{}", response);
+
+    info!("setting extended address");
+    let extended_address: u64 = 0xACDE480000000001;
+    let response = mbox
+        .mac_subsystem
+        .send_command(SetRequest {
+            pib_attribute_ptr: &extended_address as *const _ as *const u8,
+            pib_attribute: PibId::ExtendedAddress,
+        })
+        .await;
+    info!("{}", response);
+
+    info!("setting short address");
+    let short_address: u16 = 0x1122;
+    let response = mbox
+        .mac_subsystem
+        .send_command(SetRequest {
+            pib_attribute_ptr: &short_address as *const _ as *const u8,
+            pib_attribute: PibId::ShortAddress,
+        })
+        .await;
+    info!("{}", response);
+
+    info!("setting association permit");
+    let association_permit: bool = true;
+    let response = mbox
+        .mac_subsystem
+        .send_command(SetRequest {
+            pib_attribute_ptr: &association_permit as *const _ as *const u8,
+            pib_attribute: PibId::AssociationPermit,
+        })
+        .await;
+    info!("{}", response);
+
+    info!("setting TX power");
+    let transmit_power: i8 = 2;
+    let response = mbox
+        .mac_subsystem
+        .send_command(SetRequest {
+            pib_attribute_ptr: &transmit_power as *const _ as *const u8,
+            pib_attribute: PibId::TransmitPower,
+        })
+        .await;
+    info!("{}", response);
+
+    info!("starting FFD device");
+    let response = mbox
+        .mac_subsystem
+        .send_command(StartRequest {
+            channel_number: 16,
+            beacon_order: 0x0F,
+            superframe_order: 0x0F,
+            pan_coordinator: true,
+            battery_life_extension: false,
+            ..Default::default()
+        })
+        .await;
+    info!("{}", response);
+
+    info!("setting RX on when idle");
+    let rx_on_while_idle: bool = true;
+    let response = mbox
+        .mac_subsystem
+        .send_command(SetRequest {
+            pib_attribute_ptr: &rx_on_while_idle as *const _ as *const u8,
+            pib_attribute: PibId::RxOnWhenIdle,
+        })
+        .await;
+    info!("{}", response);
+
+    // info!("association request");
+    // mbox.mac_subsystem
+    //     .send_command(AssociateRequest {
+    //         channel_number: 16,
+    //         channel_page: 0,
+    //         coord_addr_mode: 2,
+    //         coord_address: MacAddress { short: [0x22, 0x11] },
+    //         capability_information: 0x80,
+    //         coord_pan_id: [0xAA, 0x1A],
+    //         security_level: 0,
+
+    //         key_id_mode: 0,
+    //         key_index: 0,
+    //         key_source: [0; 8],
+    //     })
+    //     .await;
+    // info!("reading");
+    // let result = mbox.mac_subsystem.read().await;
+    // info!("{}", result.payload());
+
+    //
+    //    info!("starting ble...");
+    //    mbox.ble_subsystem.t_write(0x0c, &[]).await;
+    //
+    //    info!("waiting for ble...");
+    //    let ble_event = mbox.ble_subsystem.tl_read().await;
+    //
+    //    info!("ble event: {}", ble_event.payload());
+
+    info!("Test OK");
+    cortex_m::asm::bkpt();
+}
diff --git a/examples/stm32wb/src/bin/tl_mbox_mac_2.rs b/examples/stm32wb/src/bin/mac_rfd.rs
index e069adf87..938fe754f 100644
--- a/examples/stm32wb/src/bin/tl_mbox_mac_2.rs
+++ b/examples/stm32wb/src/bin/mac_rfd.rs
@@ -6,7 +6,8 @@ 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, MacAddress, ResetRequest, SetRequest};
+use embassy_stm32_wpan::sub::mac::commands::{AssociateRequest, ResetRequest, SetRequest, StartRequest};
+use embassy_stm32_wpan::sub::mac::typedefs::{AddressMode, MacAddress, PibId};
 use embassy_stm32_wpan::sub::mm;
 use embassy_stm32_wpan::TlMbox;
 use {defmt_rtt as _, panic_probe as _};
@@ -71,46 +72,44 @@ async fn main(spawner: Spawner) {
     info!("{}", response);
 
     info!("setting extended address");
-    let extended_address: u64 = 0xACDE480000000001;
-    defmt::debug!("{}", &extended_address as *const _ as *const u8);
+    let extended_address: u64 = 0xACDE480000000002;
     let response = mbox
         .mac_subsystem
         .send_command(SetRequest {
             pib_attribute_ptr: &extended_address as *const _ as *const u8,
-            pib_attribute: 0x6F,
-            stuffing: [0; 3],
+            pib_attribute: PibId::ExtendedAddress,
         })
         .await;
     info!("{}", response);
 
-    // info!("association request");
-    // mbox.mac_subsystem
-    //     .send_command(AssociateRequest {
-    //         channel_number: 16,
-    //         channel_page: 0,
-    //         coord_addr_mode: 2,
-    //         coord_address: MacAddress { short: [0x22, 0x11] },
-    //         capability_information: 0x80,
-    //         coord_pan_id: [0xAA, 0x1A],
-    //         security_level: 0,
-
-    //         key_id_mode: 0,
-    //         key_index: 0,
-    //         key_source: [0; 8],
-    //     })
-    //     .await;
-    // info!("reading");
-    // let result = mbox.mac_subsystem.read().await;
-    // info!("{}", result.payload());
-
-    //
-    //    info!("starting ble...");
-    //    mbox.ble_subsystem.t_write(0x0c, &[]).await;
-    //
-    //    info!("waiting for ble...");
-    //    let ble_event = mbox.ble_subsystem.tl_read().await;
-    //
-    //    info!("ble event: {}", ble_event.payload());
+    info!("assocation request");
+    let response = mbox
+        .mac_subsystem
+        .send_command(AssociateRequest {
+            channel_number: 16,
+            channel_page: 0,
+            coord_addr_mode: AddressMode::Short,
+            coord_address: MacAddress { short: [0x22, 0x11] },
+            capability_information: 0x80,
+            coord_pan_id: [0xAA, 0x1A],
+            security_level: 0x00,
+            key_id_mode: 0,
+            key_source: [0; 8],
+            key_index: 0,
+        })
+        .await;
+    info!("{}", response);
+
+    info!("setting short address");
+    let short: u64 = 0xACDE480000000002;
+    let response = mbox
+        .mac_subsystem
+        .send_command(SetRequest {
+            pib_attribute_ptr: &short as *const _ as *const u8,
+            pib_attribute: PibId::ShortAddress,
+        })
+        .await;
+    info!("{}", response);
 
     info!("Test OK");
     cortex_m::asm::bkpt();