Skip to content

Commit c4e817e

Browse files
authored
Merge pull request #798 from quartiq/rj/bump-deps
bump deps and release 0.9.0
2 parents 8e67462 + f5b9856 commit c4e817e

File tree

6 files changed

+35
-34
lines changed

6 files changed

+35
-34
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](http://semver.org/).
77

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

1010
### Fixed
1111

Cargo.lock

Lines changed: 23 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "stabilizer"
33
# Keep versions in Cargo.toml and py/setup.py synchronized.
4-
version = "0.8.1"
4+
version = "0.9.0"
55
resolver = "2"
66
authors = [
77
"Robert Jördens <rj@quartiq.de>",
@@ -34,10 +34,10 @@ default-target = "thumbv7em-none-eabihf"
3434
members = ["ad9959"]
3535

3636
[dependencies]
37-
cortex-m = { version = "0.7.7", features = ["inline-asm"] }
37+
cortex-m = { version = "0.7.7", features = ["inline-asm", "critical-section-single-core"] }
3838
cortex-m-rt = { version = "0.7", features = ["device"] }
3939
log = { version = "0.4", features = ["max_level_trace", "release_max_level_info"] }
40-
rtt-target = { version = "0.3", features = ["cortex-m"] }
40+
rtt-target = "0.3"
4141
serde = { version = "1.0", features = ["derive"], default-features = false }
4242
serde-json-core = "0.5"
4343
heapless = { version = "0.7.16", features = ["serde"] }
@@ -46,7 +46,7 @@ embedded-hal = "0.2.7"
4646
num_enum = { version = "0.7.1", default-features = false }
4747
paste = "1"
4848
idsp = "0.12"
49-
ad9959 = { path = "ad9959", version = "0.2.0" }
49+
ad9959 = { path = "ad9959", version = "0.2.1" }
5050
mcp230xx = "1.0"
5151
mutex-trait = "0.2"
5252
fugit = "0.3"
@@ -59,22 +59,19 @@ lm75 = "0.2"
5959
enum-iterator = "1.4.1"
6060
rand_xorshift = "0.3.0"
6161
rand_core = "0.6.4"
62-
minimq = { git = "https://github.com/quartiq/minimq" } # "0.8"
62+
minimq = "0.8.0"
63+
# patch with https://github.com/rust-embedded-community/usb-device/pull/129
6364
usb-device = "0.2.9"
6465
usbd-serial = "0.1.1"
6566
# Keep this synced with the miniconf version in py/setup.py
66-
miniconf = { git = "https://github.com/quartiq/miniconf.git" } # "0.9"
67+
miniconf = "0.9.0"
6768
smoltcp-nal = { version = "0.4.1", features = ["shared-stack"]}
6869
bbqueue = "0.5"
6970

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

74-
[patch.crates-io.usb-device]
75-
git = "https://github.com/ryan-summers/usb-device"
76-
branch = "rs/issue-128-v0.2.9"
77-
7875
[features]
7976
nightly = [ ]
8077
pounder_v1_0 = [ ]

ad9959/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "ad9959"
3-
version = "0.2.0"
3+
version = "0.2.1"
44
authors = ["Ryan Summers <ryan.summers@vertigo-designs.com>"]
55
license = "MIT OR Apache-2.0"
66
edition = "2018"

py/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
"matplotlib",
1616
"gmqtt",
1717
# Keep this synced with the miniconf version in Cargo.toml
18-
"miniconf-mqtt@git+https://github.com/quartiq/miniconf@main#subdirectory=py/miniconf-mqtt",
18+
"miniconf-mqtt@git+https://github.com/quartiq/miniconf@v0.9.0#subdirectory=py/miniconf-mqtt",
1919
],
2020
)

src/net/data_stream.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ const FRAME_COUNT: usize = 4;
4646

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

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

0 commit comments

Comments
 (0)