Skip to content

Commit

Permalink
Merge pull request #798 from quartiq/rj/bump-deps
Browse files Browse the repository at this point in the history
bump deps and release 0.9.0
  • Loading branch information
jordens authored Nov 1, 2023
2 parents 8e67462 + f5b9856 commit c4e817e
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 34 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased](https://github.com/quartiq/stabilizer/compare/v0.8.1...main)
## [0.9.0](https://github.com/quartiq/stabilizer/compare/v0.8.1...v0.9.0)

### Fixed

Expand Down
42 changes: 23 additions & 19 deletions Cargo.lock

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

17 changes: 7 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "stabilizer"
# Keep versions in Cargo.toml and py/setup.py synchronized.
version = "0.8.1"
version = "0.9.0"
resolver = "2"
authors = [
"Robert Jördens <[email protected]>",
Expand Down Expand Up @@ -34,10 +34,10 @@ default-target = "thumbv7em-none-eabihf"
members = ["ad9959"]

[dependencies]
cortex-m = { version = "0.7.7", features = ["inline-asm"] }
cortex-m = { version = "0.7.7", features = ["inline-asm", "critical-section-single-core"] }
cortex-m-rt = { version = "0.7", features = ["device"] }
log = { version = "0.4", features = ["max_level_trace", "release_max_level_info"] }
rtt-target = { version = "0.3", features = ["cortex-m"] }
rtt-target = "0.3"
serde = { version = "1.0", features = ["derive"], default-features = false }
serde-json-core = "0.5"
heapless = { version = "0.7.16", features = ["serde"] }
Expand All @@ -46,7 +46,7 @@ embedded-hal = "0.2.7"
num_enum = { version = "0.7.1", default-features = false }
paste = "1"
idsp = "0.12"
ad9959 = { path = "ad9959", version = "0.2.0" }
ad9959 = { path = "ad9959", version = "0.2.1" }
mcp230xx = "1.0"
mutex-trait = "0.2"
fugit = "0.3"
Expand All @@ -59,22 +59,19 @@ lm75 = "0.2"
enum-iterator = "1.4.1"
rand_xorshift = "0.3.0"
rand_core = "0.6.4"
minimq = { git = "https://github.com/quartiq/minimq" } # "0.8"
minimq = "0.8.0"
# patch with https://github.com/rust-embedded-community/usb-device/pull/129
usb-device = "0.2.9"
usbd-serial = "0.1.1"
# Keep this synced with the miniconf version in py/setup.py
miniconf = { git = "https://github.com/quartiq/miniconf.git" } # "0.9"
miniconf = "0.9.0"
smoltcp-nal = { version = "0.4.1", features = ["shared-stack"]}
bbqueue = "0.5"

[dependencies.stm32h7xx-hal]
version = "0.15.0"
features = ["stm32h743v", "rt", "ethernet", "xspi", "usb_hs"]

[patch.crates-io.usb-device]
git = "https://github.com/ryan-summers/usb-device"
branch = "rs/issue-128-v0.2.9"

[features]
nightly = [ ]
pounder_v1_0 = [ ]
Expand Down
2 changes: 1 addition & 1 deletion ad9959/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ad9959"
version = "0.2.0"
version = "0.2.1"
authors = ["Ryan Summers <[email protected]>"]
license = "MIT OR Apache-2.0"
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion py/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"matplotlib",
"gmqtt",
# Keep this synced with the miniconf version in Cargo.toml
"miniconf-mqtt@git+https://github.com/quartiq/miniconf@main#subdirectory=py/miniconf-mqtt",
"miniconf-mqtt@git+https://github.com/quartiq/miniconf@v0.9.0#subdirectory=py/miniconf-mqtt",
],
)
4 changes: 2 additions & 2 deletions src/net/data_stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ const FRAME_COUNT: usize = 4;

// The size of each frame in bytes.
// Ensure the resulting ethernet frame is within the MTU:
// 1500 MTU - 40 IP6 header - 20 UDP header
const FRAME_SIZE: usize = 1500 - 40 - 20;
// 1500 MTU - 40 IP6 header - 8 UDP header
const FRAME_SIZE: usize = 1500 - 40 - 8;

// The size of the frame queue must be at least as large as the number of frame buffers. Every
// allocated frame buffer should fit in the queue.
Expand Down

0 comments on commit c4e817e

Please sign in to comment.