Skip to content

Commit

Permalink
Merge pull request #953 from quartiq/deps
Browse files Browse the repository at this point in the history
deps: update, including miniconf 0.15
  • Loading branch information
jordens authored Oct 1, 2024
2 parents 8299547 + c34a07e commit e7a228e
Show file tree
Hide file tree
Showing 11 changed files with 126 additions and 90 deletions.
79 changes: 57 additions & 22 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ minimq = "0.9.0"
usb-device = "0.3.2"
usbd-serial = "0.2"
# Keep this synced with the miniconf version in py/setup.py
miniconf = { version = "0.14", features = ["json-core", "derive", "postcard"] }
miniconf_mqtt = { version = "0.14" }
miniconf = { version = "0.15", features = ["json-core", "derive", "postcard"] }
miniconf_mqtt = { version = "0.15" }
tca9539 = "0.2"
smoltcp-nal = { version = "0.5", features = ["shared-stack"] }
postcard = "1"
Expand Down
2 changes: 1 addition & 1 deletion py/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies = [
"numpy",
"scipy",
"matplotlib",
"miniconf-mqtt@git+https://github.com/quartiq/miniconf@v0.14.0#subdirectory=py/miniconf-mqtt",
"miniconf-mqtt@git+https://github.com/quartiq/miniconf@v0.15.0#subdirectory=py/miniconf-mqtt",
]

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion serial-settings/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repository = "https://github.com/quartiq/stabilizer"
maintenance = { status = "actively-developed" }

[dependencies]
miniconf = { version = "0.14", features = ["json-core", "postcard"] }
miniconf = { version = "0.15", features = ["json-core", "postcard"] }
menu = { version = "0.6", features = ["echo"], git = "https://github.com/rust-embedded-community/menu.git" }
heapless = "0.8"
embedded-io = "0.6"
Expand Down
Loading

0 comments on commit e7a228e

Please sign in to comment.