nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-25 08:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3232 from embassy-rs/misc-fixes-44

Browse Source 
Misc fixes.
This commit is contained in:
Dario Nieuwenhuis 2024-08-07 13:01:33 +00:00 committed by GitHub
commit 891c5ee105
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
29 changed files with 50 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embassy-net-esp-hosted/src/proto.rs
View File

@ -1,3 +1,5 @@
#![allow(unused)]
use heapless::{String, Vec};
/// internal supporting structures for CtrlMsg

7
embassy-net/src/lib.rs
View File

@ -415,8 +415,11 @@ impl<D: Driver> Stack<D> {
/// ## Example
/// ```ignore
/// let config = embassy_net::Config::dhcpv4(Default::default());
///// Init network stack
/// static RESOURCES: StaticCell<embassy_net::StackResources<2>> = StaticCell::new();
/// // Init network stack
/// // NOTE: DHCP and DNS need one socket slot if enabled. This is why we're
/// // provisioning space for 3 sockets here: one for DHCP, one for DNS, and one for your code (e.g. TCP).
/// // If you use more sockets you must increase this. If you don't enable DHCP or DNS you can decrease it.
/// static RESOURCES: StaticCell<embassy_net::StackResources<3>> = StaticCell::new();
/// static STACK: StaticCell<embassy_net::Stack> = StaticCell::new();
/// let stack = &*STACK.init(embassy_net::Stack::new(
/// device,

2
embassy-stm32-wpan/src/mac/commands.rs
View File

@ -1,3 +1,5 @@
#![allow(unused)]
use core::{mem, slice};
use super::opcodes::OpcodeM4ToM0;

9
examples/nrf52840/src/bin/ethernet_enc28j60.rs
View File

@ -66,16 +66,11 @@ async fn main(spawner: Spawner) {
let seed = u64::from_le_bytes(seed);
// Init network stack
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
static STACK: StaticCell<
Stack<Enc28j60<ExclusiveDevice<Spim<'static, peripherals::SPI3>, Output<'static>, Delay>, Output<'static>>>,
> = StaticCell::new();
let stack = STACK.init(Stack::new(
device,
config,
RESOURCES.init(StackResources::<2>::new()),
seed,
));
let stack = STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
unwrap!(spawner.spawn(net_task(stack)));

2
examples/nrf52840/src/bin/usb_ethernet.rs
View File

@ -115,7 +115,7 @@ async fn main(spawner: Spawner) {
let seed = u64::from_le_bytes(seed);
// Init network stack
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
static STACK: StaticCell<Stack<Device<'static, MTU>>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));

9
examples/nrf52840/src/bin/wifi_esp_hosted.rs
View File

@ -89,14 +89,9 @@ async fn main(spawner: Spawner) {
let seed = u64::from_le_bytes(seed);
// Init network stack
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
static STACK: StaticCell<Stack<hosted::NetDriver<'static>>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
config,
RESOURCES.init(StackResources::<2>::new()),
seed,
));
let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
unwrap!(spawner.spawn(net_task(stack)));

2
examples/rp/src/bin/ethernet_w5500_multisocket.rs
View File

@ -76,7 +76,7 @@ async fn main(spawner: Spawner) {
let stack = &*STACK.init(Stack::new(
device,
embassy_net::Config::dhcpv4(Default::default()),
RESOURCES.init(StackResources::<3>::new()),
RESOURCES.init(StackResources::new()),
seed,
));

4
examples/rp/src/bin/ethernet_w5500_tcp_client.rs
View File

@ -75,11 +75,11 @@ async fn main(spawner: Spawner) {
// Init network stack
static STACK: StaticCell<Stack<Device<'static>>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
embassy_net::Config::dhcpv4(Default::default()),
RESOURCES.init(StackResources::<2>::new()),
RESOURCES.init(StackResources::new()),
seed,
));

4
examples/rp/src/bin/ethernet_w5500_tcp_server.rs
View File

@ -74,11 +74,11 @@ async fn main(spawner: Spawner) {
// Init network stack
static STACK: StaticCell<Stack<Device<'static>>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
embassy_net::Config::dhcpv4(Default::default()),
RESOURCES.init(StackResources::<2>::new()),
RESOURCES.init(StackResources::new()),
seed,
));

4
examples/rp/src/bin/ethernet_w5500_udp.rs
View File

@ -72,11 +72,11 @@ async fn main(spawner: Spawner) {
// Init network stack
static STACK: StaticCell<Stack<Device<'static>>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
embassy_net::Config::dhcpv4(Default::default()),
RESOURCES.init(StackResources::<2>::new()),
RESOURCES.init(StackResources::new()),
seed,
));

9
examples/rp/src/bin/usb_ethernet.rs
View File

@ -109,13 +109,8 @@ async fn main(spawner: Spawner) {
// Init network stack
static STACK: StaticCell<Stack<Device<'static, MTU>>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
config,
RESOURCES.init(StackResources::<2>::new()),
seed,
));
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
unwrap!(spawner.spawn(net_task(stack)));

4
examples/rp/src/bin/wifi_ap_tcp_server.rs
View File

@ -81,11 +81,11 @@ async fn main(spawner: Spawner) {
// Init network stack
static STACK: StaticCell<Stack<cyw43::NetDriver<'static>>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
net_device,
config,
RESOURCES.init(StackResources::<2>::new()),
RESOURCES.init(StackResources::new()),
seed,
));

4
examples/rp/src/bin/wifi_tcp_server.rs
View File

@ -84,11 +84,11 @@ async fn main(spawner: Spawner) {
// Init network stack
static STACK: StaticCell<Stack<cyw43::NetDriver<'static>>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
net_device,
config,
RESOURCES.init(StackResources::<2>::new()),
RESOURCES.init(StackResources::new()),
seed,
));

2
examples/rp/src/bin/wifi_webrequest.rs
View File

@ -91,7 +91,7 @@ async fn main(spawner: Spawner) {
let stack = &*STACK.init(Stack::new(
net_device,
config,
RESOURCES.init(StackResources::<5>::new()),
RESOURCES.init(StackResources::new()),
seed,
));

7
examples/std/src/bin/net.rs
View File

@ -52,12 +52,7 @@ async fn main_task(spawner: Spawner) {
// Init network stack
static STACK: StaticCell<Stack<TunTapDevice>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
config,
RESOURCES.init(StackResources::<3>::new()),
seed,
));
let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
// Launch network task
spawner.spawn(net_task(stack)).unwrap();

7
examples/std/src/bin/net_dns.rs
View File

@ -51,12 +51,7 @@ async fn main_task(spawner: Spawner) {
// Init network stack
static STACK: StaticCell<Stack<TunTapDevice>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack: &Stack<_> = &*STACK.init(Stack::new(
device,
config,
RESOURCES.init(StackResources::<3>::new()),
seed,
));
let stack: &Stack<_> = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
// Launch network task
spawner.spawn(net_task(stack)).unwrap();

2
examples/std/src/bin/net_ppp.rs
View File

@ -102,7 +102,7 @@ async fn main_task(spawner: Spawner) {
let stack = &*STACK.init(Stack::new(
device,
Config::default(), // don't configure IP yet
RESOURCES.init(StackResources::<3>::new()),
RESOURCES.init(StackResources::new()),
seed,
));

7
examples/std/src/bin/net_udp.rs
View File

@ -50,12 +50,7 @@ async fn main_task(spawner: Spawner) {
// Init network stack
static STACK: StaticCell<Stack<TunTapDevice>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
config,
RESOURCES.init(StackResources::<3>::new()),
seed,
));
let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
// Launch network task
spawner.spawn(net_task(stack)).unwrap();

7
examples/std/src/bin/tcp_accept.rs
View File

@ -64,12 +64,7 @@ async fn main_task(spawner: Spawner) {
// Init network stack
static STACK: StaticCell<Stack<TunTapDevice>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
config,
RESOURCES.init(StackResources::<3>::new()),
seed,
));
let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
// Launch network task
spawner.spawn(net_task(stack)).unwrap();

9
examples/stm32f4/src/bin/eth.rs
View File

@ -89,13 +89,8 @@ async fn main(spawner: Spawner) -> ! {
// Init network stack
static STACK: StaticCell<Stack<Device>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
config,
RESOURCES.init(StackResources::<2>::new()),
seed,
));
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
// Launch network task
unwrap!(spawner.spawn(net_task(stack)));

9
examples/stm32f4/src/bin/eth_w5500.rs
View File

@ -93,13 +93,8 @@ async fn main(spawner: Spawner) -> ! {
//});
static STACK: StaticCell<Stack<Device>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
config,
RESOURCES.init(StackResources::<2>::new()),
seed,
));
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
// Launch network task
unwrap!(spawner.spawn(net_task(stack)));

9
examples/stm32f4/src/bin/usb_ethernet.rs
View File

@ -145,13 +145,8 @@ async fn main(spawner: Spawner) {
// Init network stack
static STACK: StaticCell<Stack<Device<'static, MTU>>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
config,
RESOURCES.init(StackResources::<2>::new()),
seed,
));
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
unwrap!(spawner.spawn(net_task(stack)));

9
examples/stm32f7/src/bin/eth.rs
View File

@ -90,13 +90,8 @@ async fn main(spawner: Spawner) -> ! {
// Init network stack
static STACK: StaticCell<Stack<Device>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
config,
RESOURCES.init(StackResources::<2>::new()),
seed,
));
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
// Launch network task
unwrap!(spawner.spawn(net_task(stack)));

9
examples/stm32h5/src/bin/eth.rs
View File

@ -93,13 +93,8 @@ async fn main(spawner: Spawner) -> ! {
// Init network stack
static STACK: StaticCell<Stack<Device>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
config,
RESOURCES.init(StackResources::<2>::new()),
seed,
));
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
// Launch network task
unwrap!(spawner.spawn(net_task(&stack)));

7
examples/stm32h7/src/bin/eth.rs
View File

@ -93,12 +93,7 @@ async fn main(spawner: Spawner) -> ! {
// Init network stack
static STACK: StaticCell<Stack<Device>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
config,
RESOURCES.init(StackResources::<3>::new()),
seed,
));
let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
// Launch network task
unwrap!(spawner.spawn(net_task(&stack)));

7
examples/stm32h7/src/bin/eth_client.rs
View File

@ -93,12 +93,7 @@ async fn main(spawner: Spawner) -> ! {
// Init network stack
static STACK: StaticCell<Stack<Device>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
config,
RESOURCES.init(StackResources::<3>::new()),
seed,
));
let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
// Launch network task
unwrap!(spawner.spawn(net_task(stack)));

7
examples/stm32h7/src/bin/eth_client_mii.rs
View File

@ -99,12 +99,7 @@ async fn main(spawner: Spawner) -> ! {
// Init network stack
static STACK: StaticCell<Stack<Device>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
config,
RESOURCES.init(StackResources::<3>::new()),
seed,
));
let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
// Launch network task
unwrap!(spawner.spawn(net_task(stack)));

9
examples/stm32l4/src/bin/spe_adin1110_http_server.rs
View File

@ -207,13 +207,8 @@ async fn main(spawner: Spawner) {
// Init network stack
static STACK: StaticCell<Stack<Device<'static>>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
ip_cfg,
RESOURCES.init(StackResources::<2>::new()),
seed,
));
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(device, ip_cfg, RESOURCES.init(StackResources::new()), seed));
// Launch network task
unwrap!(spawner.spawn(net_task(stack)));

9
examples/stm32l5/src/bin/usb_ethernet.rs
View File

@ -122,13 +122,8 @@ async fn main(spawner: Spawner) {
// Init network stack
static STACK: StaticCell<Stack<Device<'static, MTU>>> = StaticCell::new();
static RESOURCES: StaticCell<StackResources<2>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(
device,
config,
RESOURCES.init(StackResources::<2>::new()),
seed,
));
static RESOURCES: StaticCell<StackResources<3>> = StaticCell::new();
let stack = &*STACK.init(Stack::new(device, config, RESOURCES.init(StackResources::new()), seed));
unwrap!(spawner.spawn(net_task(stack)));