aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorxoviat <[email protected]>2023-07-20 16:45:04 -0500
committerxoviat <[email protected]>2023-07-20 16:45:04 -0500
commit809d3476aac88ddba01cd16f0df3565e35beddea (patch)
tree1a02eb3c0a11ad9703c5c0e7de4f1f193fc64976 /examples
parent02d57afd51451fe9e7d224a0ea665a665ba2b72f (diff)
wpan: further optimize mac event
Diffstat (limited to 'examples')
-rw-r--r--examples/stm32wb/src/bin/mac_ffd.rs39
-rw-r--r--examples/stm32wb/src/bin/mac_ffd_net.rs35
-rw-r--r--examples/stm32wb/src/bin/mac_rfd.rs24
3 files changed, 25 insertions, 73 deletions
diff --git a/examples/stm32wb/src/bin/mac_ffd.rs b/examples/stm32wb/src/bin/mac_ffd.rs
index 7de30778f..1379ac6ba 100644
--- a/examples/stm32wb/src/bin/mac_ffd.rs
+++ b/examples/stm32wb/src/bin/mac_ffd.rs
@@ -73,10 +73,7 @@ async fn main(spawner: Spawner) {
73 }) 73 })
74 .await 74 .await
75 .unwrap(); 75 .unwrap();
76 { 76 defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
77 let evt = mbox.mac_subsystem.read().await.unwrap();
78 defmt::info!("{:#x}", *evt);
79 }
80 77
81 info!("setting extended address"); 78 info!("setting extended address");
82 let extended_address: u64 = 0xACDE480000000001; 79 let extended_address: u64 = 0xACDE480000000001;
@@ -87,10 +84,7 @@ async fn main(spawner: Spawner) {
87 }) 84 })
88 .await 85 .await
89 .unwrap(); 86 .unwrap();
90 { 87 defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
91 let evt = mbox.mac_subsystem.read().await.unwrap();
92 defmt::info!("{:#x}", *evt);
93 }
94 88
95 info!("setting short address"); 89 info!("setting short address");
96 let short_address: u16 = 0x1122; 90 let short_address: u16 = 0x1122;
@@ -101,10 +95,7 @@ async fn main(spawner: Spawner) {
101 }) 95 })
102 .await 96 .await
103 .unwrap(); 97 .unwrap();
104 { 98 defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
105 let evt = mbox.mac_subsystem.read().await.unwrap();
106 defmt::info!("{:#x}", *evt);
107 }
108 99
109 info!("setting association permit"); 100 info!("setting association permit");
110 let association_permit: bool = true; 101 let association_permit: bool = true;
@@ -115,10 +106,7 @@ async fn main(spawner: Spawner) {
115 }) 106 })
116 .await 107 .await
117 .unwrap(); 108 .unwrap();
118 { 109 defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
119 let evt = mbox.mac_subsystem.read().await.unwrap();
120 defmt::info!("{:#x}", *evt);
121 }
122 110
123 info!("setting TX power"); 111 info!("setting TX power");
124 let transmit_power: i8 = 2; 112 let transmit_power: i8 = 2;
@@ -129,10 +117,7 @@ async fn main(spawner: Spawner) {
129 }) 117 })
130 .await 118 .await
131 .unwrap(); 119 .unwrap();
132 { 120 defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
133 let evt = mbox.mac_subsystem.read().await.unwrap();
134 defmt::info!("{:#x}", *evt);
135 }
136 121
137 info!("starting FFD device"); 122 info!("starting FFD device");
138 mbox.mac_subsystem 123 mbox.mac_subsystem
@@ -147,10 +132,7 @@ async fn main(spawner: Spawner) {
147 }) 132 })
148 .await 133 .await
149 .unwrap(); 134 .unwrap();
150 { 135 defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
151 let evt = mbox.mac_subsystem.read().await.unwrap();
152 defmt::info!("{:#x}", *evt);
153 }
154 136
155 info!("setting RX on when idle"); 137 info!("setting RX on when idle");
156 let rx_on_while_idle: bool = true; 138 let rx_on_while_idle: bool = true;
@@ -161,18 +143,15 @@ async fn main(spawner: Spawner) {
161 }) 143 })
162 .await 144 .await
163 .unwrap(); 145 .unwrap();
164 { 146 defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
165 let evt = mbox.mac_subsystem.read().await.unwrap();
166 defmt::info!("{:#x}", *evt);
167 }
168 147
169 loop { 148 loop {
170 let evt = mbox.mac_subsystem.read().await; 149 let evt = mbox.mac_subsystem.read().await;
171 if let Ok(evt) = evt { 150 if let Ok(evt) = evt {
172 defmt::info!("parsed mac event"); 151 defmt::info!("parsed mac event");
173 defmt::info!("{:#x}", *evt); 152 defmt::info!("{:#x}", evt);
174 153
175 match *evt { 154 match evt {
176 MacEvent::MlmeAssociateInd(association) => mbox 155 MacEvent::MlmeAssociateInd(association) => mbox
177 .mac_subsystem 156 .mac_subsystem
178 .send_command(&AssociateResponse { 157 .send_command(&AssociateResponse {
diff --git a/examples/stm32wb/src/bin/mac_ffd_net.rs b/examples/stm32wb/src/bin/mac_ffd_net.rs
index a55b1fc77..bbcd0a70f 100644
--- a/examples/stm32wb/src/bin/mac_ffd_net.rs
+++ b/examples/stm32wb/src/bin/mac_ffd_net.rs
@@ -79,10 +79,7 @@ async fn main(spawner: Spawner) {
79 }) 79 })
80 .await 80 .await
81 .unwrap(); 81 .unwrap();
82 { 82 defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
83 let evt = mbox.mac_subsystem.read().await.unwrap();
84 defmt::info!("{:#x}", *evt);
85 }
86 83
87 info!("setting extended address"); 84 info!("setting extended address");
88 let extended_address: u64 = 0xACDE480000000001; 85 let extended_address: u64 = 0xACDE480000000001;
@@ -93,10 +90,7 @@ async fn main(spawner: Spawner) {
93 }) 90 })
94 .await 91 .await
95 .unwrap(); 92 .unwrap();
96 { 93 defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
97 let evt = mbox.mac_subsystem.read().await.unwrap();
98 defmt::info!("{:#x}", *evt);
99 }
100 94
101 info!("setting short address"); 95 info!("setting short address");
102 let short_address: u16 = 0x1122; 96 let short_address: u16 = 0x1122;
@@ -107,10 +101,7 @@ async fn main(spawner: Spawner) {
107 }) 101 })
108 .await 102 .await
109 .unwrap(); 103 .unwrap();
110 { 104 defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
111 let evt = mbox.mac_subsystem.read().await.unwrap();
112 defmt::info!("{:#x}", *evt);
113 }
114 105
115 info!("setting association permit"); 106 info!("setting association permit");
116 let association_permit: bool = true; 107 let association_permit: bool = true;
@@ -121,10 +112,7 @@ async fn main(spawner: Spawner) {
121 }) 112 })
122 .await 113 .await
123 .unwrap(); 114 .unwrap();
124 { 115 defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
125 let evt = mbox.mac_subsystem.read().await.unwrap();
126 defmt::info!("{:#x}", *evt);
127 }
128 116
129 info!("setting TX power"); 117 info!("setting TX power");
130 let transmit_power: i8 = 2; 118 let transmit_power: i8 = 2;
@@ -135,10 +123,7 @@ async fn main(spawner: Spawner) {
135 }) 123 })
136 .await 124 .await
137 .unwrap(); 125 .unwrap();
138 { 126 defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
139 let evt = mbox.mac_subsystem.read().await.unwrap();
140 defmt::info!("{:#x}", *evt);
141 }
142 127
143 info!("starting FFD device"); 128 info!("starting FFD device");
144 mbox.mac_subsystem 129 mbox.mac_subsystem
@@ -153,10 +138,7 @@ async fn main(spawner: Spawner) {
153 }) 138 })
154 .await 139 .await
155 .unwrap(); 140 .unwrap();
156 { 141 defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
157 let evt = mbox.mac_subsystem.read().await.unwrap();
158 defmt::info!("{:#x}", *evt);
159 }
160 142
161 info!("setting RX on when idle"); 143 info!("setting RX on when idle");
162 let rx_on_while_idle: bool = true; 144 let rx_on_while_idle: bool = true;
@@ -167,10 +149,7 @@ async fn main(spawner: Spawner) {
167 }) 149 })
168 .await 150 .await
169 .unwrap(); 151 .unwrap();
170 { 152 defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
171 let evt = mbox.mac_subsystem.read().await.unwrap();
172 defmt::info!("{:#x}", *evt);
173 }
174 153
175 let tx_queue = [ 154 let tx_queue = [
176 make_static!([0u8; 127]), 155 make_static!([0u8; 127]),
diff --git a/examples/stm32wb/src/bin/mac_rfd.rs b/examples/stm32wb/src/bin/mac_rfd.rs
index d1307a844..4d8b6601a 100644
--- a/examples/stm32wb/src/bin/mac_rfd.rs
+++ b/examples/stm32wb/src/bin/mac_rfd.rs
@@ -75,10 +75,7 @@ async fn main(spawner: Spawner) {
75 }) 75 })
76 .await 76 .await
77 .unwrap(); 77 .unwrap();
78 { 78 defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
79 let evt = mbox.mac_subsystem.read().await.unwrap();
80 defmt::info!("{:#x}", *evt);
81 }
82 79
83 info!("setting extended address"); 80 info!("setting extended address");
84 let extended_address: u64 = 0xACDE480000000002; 81 let extended_address: u64 = 0xACDE480000000002;
@@ -89,10 +86,7 @@ async fn main(spawner: Spawner) {
89 }) 86 })
90 .await 87 .await
91 .unwrap(); 88 .unwrap();
92 { 89 defmt::info!("{:#x}", mbox.mac_subsystem.read().await.unwrap());
93 let evt = mbox.mac_subsystem.read().await.unwrap();
94 defmt::info!("{:#x}", *evt);
95 }
96 90
97 info!("getting extended address"); 91 info!("getting extended address");
98 mbox.mac_subsystem 92 mbox.mac_subsystem
@@ -105,9 +99,9 @@ async fn main(spawner: Spawner) {
105 99
106 { 100 {
107 let evt = mbox.mac_subsystem.read().await.unwrap(); 101 let evt = mbox.mac_subsystem.read().await.unwrap();
108 info!("{:#x}", *evt); 102 info!("{:#x}", evt);
109 103
110 if let MacEvent::MlmeGetCnf(evt) = *evt { 104 if let MacEvent::MlmeGetCnf(evt) = evt {
111 if evt.pib_attribute_value_len == 8 { 105 if evt.pib_attribute_value_len == 8 {
112 let value = unsafe { core::ptr::read_unaligned(evt.pib_attribute_value_ptr as *const u64) }; 106 let value = unsafe { core::ptr::read_unaligned(evt.pib_attribute_value_ptr as *const u64) };
113 107
@@ -133,9 +127,9 @@ async fn main(spawner: Spawner) {
133 mbox.mac_subsystem.send_command(&a).await.unwrap(); 127 mbox.mac_subsystem.send_command(&a).await.unwrap();
134 let short_addr = { 128 let short_addr = {
135 let evt = mbox.mac_subsystem.read().await.unwrap(); 129 let evt = mbox.mac_subsystem.read().await.unwrap();
136 info!("{:#x}", *evt); 130 info!("{:#x}", evt);
137 131
138 if let MacEvent::MlmeAssociateCnf(conf) = *evt { 132 if let MacEvent::MlmeAssociateCnf(conf) = evt {
139 conf.assoc_short_address 133 conf.assoc_short_address
140 } else { 134 } else {
141 defmt::panic!() 135 defmt::panic!()
@@ -152,7 +146,7 @@ async fn main(spawner: Spawner) {
152 .unwrap(); 146 .unwrap();
153 { 147 {
154 let evt = mbox.mac_subsystem.read().await.unwrap(); 148 let evt = mbox.mac_subsystem.read().await.unwrap();
155 info!("{:#x}", *evt); 149 info!("{:#x}", evt);
156 } 150 }
157 151
158 info!("sending data"); 152 info!("sending data");
@@ -176,12 +170,12 @@ async fn main(spawner: Spawner) {
176 .unwrap(); 170 .unwrap();
177 { 171 {
178 let evt = mbox.mac_subsystem.read().await.unwrap(); 172 let evt = mbox.mac_subsystem.read().await.unwrap();
179 info!("{:#x}", *evt); 173 info!("{:#x}", evt);
180 } 174 }
181 175
182 loop { 176 loop {
183 match mbox.mac_subsystem.read().await { 177 match mbox.mac_subsystem.read().await {
184 Ok(evt) => info!("{:#x}", *evt), 178 Ok(evt) => info!("{:#x}", evt),
185 _ => continue, 179 _ => continue,
186 }; 180 };
187 } 181 }
generated by cgit (git 2.34.1) at 2026-04-05 22:06:46 +0000