Skip to content
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

bump deps and release 0.9.0 #798

Merged
merged 9 commits into from
Nov 1, 2023
+35 −34
Merged

bump deps and release 0.9.0 #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
aba6363
stream: udp header is 8 byte
jordens Sep 17, 2023
ed51b81
bump
jordens Oct 30, 2023
52d5d5d
bump specific branches
jordens Oct 30, 2023
3874a79
downgrade rtt-logger to 0.2
jordens Oct 30, 2023
4542af6
release 0.9.0 chores
jordens Nov 1, 2023
34d3b34
released minimq miniconf
jordens Nov 1, 2023
f4d5f73
Merge remote-tracking branch 'origin/main' into rj/bump-deps
jordens Nov 1, 2023
d21a7e2
bump shared-bus
jordens Nov 1, 2023
f5b9856
Update py/setup.py
jordens Nov 1, 2023
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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 <rj@quartiq.de>",
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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we going for a release? I can probably kick off a usb-device release as well, it's been a while since it went out. But also, there's more to do with this fix, so let's postpone

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Let's release. Since the issue is in a upstream crate presumable fixable by a patch release, and only affects windows, I'm happy to follow up on that with a patch here as well later.

branch = "rs/issue-128-v0.2.9"

[features]
nightly = [ ]
pounder_v1_0 = [ ]
Expand Down
2 changes: 1 addition & 1 deletion ad9959/Cargo.toml
View file
Open in desktop
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 <ryan.summers@vertigo-designs.com>"]
license = "MIT OR Apache-2.0"
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion py/setup.py
View file
Open in desktop
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
View file
Open in desktop
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
Loading