From 6c9e373cb60c36d77544932131648ed64f6a72b2 Mon Sep 17 00:00:00 2001 From: Nathan Perry Date: Mon, 11 Nov 2024 11:59:31 -0500 Subject: wip net changes --- Cargo.lock | 4 ++++ Cargo.toml | 5 +++-- src/main.rs | 6 ++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3582899..048fd45 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4380,6 +4380,10 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +[[package]] +name = "ui" +version = "0.1.0-alpha0" + [[package]] name = "unescaper" version = "0.1.5" diff --git a/Cargo.toml b/Cargo.toml index 30a881e..d724eb5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,8 @@ members = [ ] exclude = [ - "pio_i2s" + "pio_i2s", + "test_fw/ui" ] [workspace.package] @@ -49,7 +50,7 @@ cortex-m-rt = { version = "0.7", default-features = false } ocularium_common = { path = "common" } -reqwless = { version = "0.13", default-features = false, features = ["alloc", "embedded-tls", "defmt"] } +reqwless = { version = "0.13", default-features = false, features = ["alloc", "defmt"] } pio = "0.2" diff --git a/src/main.rs b/src/main.rs index 2b839d7..61ef960 100644 --- a/src/main.rs +++ b/src/main.rs @@ -150,9 +150,9 @@ async fn _main(spawner: embassy_executor::Spawner) { molybdos::lib::usb::start!(molybdos::pal::UsbDriver, acm, &usb::UPLINK, &usb::DOWNLINK); - static NET_STATE: ConstStaticCell> = + static NET_STATE: ConstStaticCell> = ConstStaticCell::new(cdc_ncm::embassy_net::State::new()); - let (runner, dev) = ncm.into_embassy_net_device::(NET_STATE.take(), MAC); + let (runner, dev) = ncm.into_embassy_net_device::(NET_STATE.take(), MAC); spawner.must_spawn(ncm_task(runner)); @@ -227,8 +227,6 @@ async fn _main(spawner: embassy_executor::Spawner) { spawner.must_spawn(run_i2s(i2s, i2s_dma)); } - let target_addr = core::net::SocketAddrV4::new(Ipv4Addr::from([1, 1, 1, 1]), 80); - let state = TcpClientState::new(); let client = embassy_net::tcp::client::TcpClient::<1>::new(stack, &state); -- cgit v1.3.1