diff --git a/Software/MainBoard/rust/Cargo.lock b/Software/MainBoard/rust/Cargo.lock index 29247aa..20cba2d 100644 --- a/Software/MainBoard/rust/Cargo.lock +++ b/Software/MainBoard/rust/Cargo.lock @@ -313,47 +313,6 @@ dependencies = [ "syn 2.0.110", ] -[[package]] -name = "defmt" -version = "0.3.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0963443817029b2024136fc4dd07a5107eb8f977eaf18fcd1fdeb11306b64ad" -dependencies = [ - "defmt 1.0.1", -] - -[[package]] -name = "defmt" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "548d977b6da32fa1d1fda2876453da1e7df63ad0304c8b3dae4dbe7b96f39b78" -dependencies = [ - "bitflags 1.3.2", - "defmt-macros", -] - -[[package]] -name = "defmt-macros" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d4fc12a85bcf441cfe44344c4b72d58493178ce635338a3f3b78943aceb258e" -dependencies = [ - "defmt-parser", - "proc-macro-error2", - "proc-macro2", - "quote", - "syn 2.0.110", -] - -[[package]] -name = "defmt-parser" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" -dependencies = [ - "thiserror", -] - [[package]] name = "delegate" version = "0.13.4" @@ -980,7 +939,6 @@ dependencies = [ "num-traits", "portable-atomic", "portable_atomic_enum", - "smoltcp", ] [[package]] @@ -1761,7 +1719,6 @@ dependencies = [ "portable-atomic", "serde", "serde_json", - "smoltcp", "sntpc", "static_cell", "strum_macros", @@ -1820,28 +1777,6 @@ dependencies = [ "toml_edit", ] -[[package]] -name = "proc-macro-error-attr2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "proc-macro-error2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" -dependencies = [ - "proc-macro-error-attr2", - "proc-macro2", - "quote", - "syn 2.0.110", -] - [[package]] name = "proc-macro2" version = "1.0.103" @@ -2104,9 +2039,7 @@ dependencies = [ "bitflags 1.3.2", "byteorder", "cfg-if", - "defmt 0.3.100", "heapless 0.8.0", - "log", "managed", ] @@ -2231,26 +2164,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "thiserror" -version = "2.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "2.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.110", -] - [[package]] name = "time" version = "0.3.44" diff --git a/Software/MainBoard/rust/Cargo.toml b/Software/MainBoard/rust/Cargo.toml index ce9fdaf..2bc8ad7 100644 --- a/Software/MainBoard/rust/Cargo.toml +++ b/Software/MainBoard/rust/Cargo.toml @@ -52,7 +52,7 @@ esp-rtos = { version = "0.2.0", features = ["esp32c6", "embassy", "esp-radio"] } esp-backtrace = { version = "0.18.1", features = ["esp32c6", "panic-handler", "println", "colors", "custom-halt"] } esp-println = { version = "0.16.1", features = ["esp32c6", "log-04", "auto"] } esp-storage = { version = "0.8.1", features = ["esp32c6"] } -esp-radio = { version = "0.17.0", features = ["esp32c6", "log-04", "smoltcp", "wifi", "unstable"] } +esp-radio = { version = "0.17.0", features = ["esp32c6", "log-04", "wifi", "unstable"] } esp-alloc = { version = "0.9.0", features = ["esp32c6", "internal-heap-stats"] } # Async runtime (Embassy core) @@ -70,21 +70,6 @@ embassy-net = { version = "0.7.1", features = [ "proto-ipv4", "dns" ] } -smoltcp = { version = "0.12.0", default-features = false, features = [ - "alloc", - "log", - "medium-ethernet", - "multicast", - "proto-dhcpv4", - "proto-ipv6", - "proto-dns", - "proto-ipv4", - "socket-dns", - "socket-icmp", - "socket-raw", - "socket-tcp", - "socket-udp", -] } sntpc = { version = "0.6.1", default-features = false, features = ["log", "embassy-socket", "embassy-socket-ipv6"] } edge-dhcp = "0.6.0" edge-nal = "0.5.0" diff --git a/Software/MainBoard/rust/src/hal/esp.rs b/Software/MainBoard/rust/src/hal/esp.rs index 3210642..5dfd2f4 100644 --- a/Software/MainBoard/rust/src/hal/esp.rs +++ b/Software/MainBoard/rust/src/hal/esp.rs @@ -13,7 +13,8 @@ use alloc::{format, string::String, vec, vec::Vec}; use core::net::{IpAddr, Ipv4Addr, SocketAddr}; use core::sync::atomic::Ordering; use embassy_executor::Spawner; -use embassy_net::udp::UdpSocket; +use embassy_net::dns::DnsQueryType; +use embassy_net::udp::{PacketMetadata, UdpSocket}; use embassy_net::{DhcpConfig, Ipv4Cidr, Runner, Stack, StackResources, StaticConfigV4}; use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex; use embassy_sync::mutex::Mutex; @@ -43,8 +44,6 @@ use mcutie::{ QoS, Topic, }; use portable_atomic::AtomicBool; -use smoltcp::socket::udp::PacketMetadata; -use smoltcp::wire::DnsQueryType; use sntpc::{get_time, NtpContext, NtpTimestampGenerator}; #[esp_hal::ram(unstable(rtc_fast), unstable(persistent))]