Skip to content

Update smoltcp to 0.12. #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jordens merged 4 commits into from
Apr 30, 2026
Merged

Update smoltcp to 0.12. #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
857b5ca
Update `smoltcp` to 0.12.
reitermarkus Mar 28, 2025
992aa19
Fix dependency conflicts.
reitermarkus Apr 9, 2026
6f85e68
Fix validation.
reitermarkus Apr 29, 2026
afddb89
Remove unneeded trait bound.
reitermarkus Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 90 additions & 54 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 13 additions & 11 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,20 @@ usbd-serial = "0.2.2"
encdec = { version = "0.10", default-features = false }
crc-any = { version = "2.5.0", default-features = false }
panic-persist = { version = "0.3", features = ["custom-panic-handler", "utf8"] }
miniconf = { version = "0.18.0", features = ["json-core", "derive", "postcard"]}
miniconf = { version = "0.20", features = ["json-core", "derive", "postcard"]}
# NOTE: Keep this in sync with `py/pyproject.toml`.
miniconf_mqtt = "0.18.0"
miniconf_mqtt = "0.20"
# NOTE: Keep this in sync with the version used by `miniconf_mqtt`.
minimq = "0.9.0"
w5500 = "0.5"
minimq = "0.10.0"
w5500 = "0.6"
smlang= "0.8"
minireq = "0.5"
rtt-target = { version = "0.6", optional = true }
enum-iterator = { version = "2.1", default-features = false }
enc424j600 = "0.4"
embedded-hal = "1"
smoltcp-nal = { version = "0.5", features=["shared-stack"] }
serial-settings = "0.2"
smoltcp-nal = { version = "0.7", features=["shared-stack"] }
serial_settings = "0.2"
stm32f4xx-hal = {version = "0.22.1", features = ["stm32f407", "usb_fs"] }
postcard = "1"

Expand All @@ -78,11 +78,13 @@ built = { version = "0.7", features = ["git2"], default-features = false }
path = "ad5627"
version = "0.2"

[patch.crates-io.smoltcp]
# Locking to a patch where the poll() function no longer loops infinitely during packet floods. This
# can be removed once smoltcp is re-released.
git = "https://github.com/smoltcp-rs/smoltcp"
rev = "53caf70f640d5ccb3cd1492e1cb178bc7dfa3cdd"
[patch.crates-io]
miniconf = { git = "https://github.com/quartiq/miniconf.git" }
miniconf_mqtt = { git = "https://github.com/quartiq/miniconf.git" }
miniconf_derive = { git = "https://github.com/quartiq/miniconf.git" }
minireq = { git = "https://github.com/quartiq/minireq" }
serial_settings = { git = "https://github.com/quartiq/stabilizer" }
smoltcp-nal = { git = "https://github.com/quartiq/smoltcp-nal" }

[dependencies.ads7924]
path = "ads7924"
Expand Down
2 changes: 2 additions & 0 deletions rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[toolchain]
channel = "stable"
6 changes: 3 additions & 3 deletions src/hardware/external_mac.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ pub struct RxToken {
}

impl smoltcp::phy::RxToken for RxToken {
fn consume<R, F>(mut self, f: F) -> R
fn consume<R, F>(self, f: F) -> R
where
F: FnOnce(&mut [u8]) -> R,
F: FnOnce(&[u8]) -> R,
{
f(&mut self.frame_buffer[..self.length])
f(&self.frame_buffer[..self.length])
}
}

Expand Down
Loading
Loading