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

Runtime sensor #162

Merged
merged 4 commits into from
Sep 26, 2024
Merged

Runtime sensor #162

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
04efd71
sensor: expose via mqtt
jordens Sep 25, 2024
bd47b2b
support sensor switching
jordens Sep 25, 2024
87fe3cb
bump miniconf/serial-settings
jordens Sep 26, 2024
2584b81
remove msrv
jordens Sep 26, 2024
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 .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
strategy:
matrix:
# keep MSRV in sync in ci.yaml and Cargo.toml
toolchain: [stable, '1.75.0']
toolchain: [stable]
features: ['']
continue-on-error: [false]
include:
Expand Down
63 changes: 16 additions & 47 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.

9 changes: 5 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ keywords = ["ethernet", "stm32h7", "adc", "dac", "physics"]
repository = "https://github.com/quartiq/thermostat-eem"
readme = "README.md"
exclude = [".gitignore"]
# keep MSRV in sync in ci.yaml and Cargo.toml
rust-version = "1.75.0"

[features]
default = ["all_differential"]
Expand Down Expand Up @@ -65,8 +63,8 @@ bytemuck = { version = "1.18.0", features = [
"derive",
], default-features = false }
# Note: Keep in-sync with `py/setup.py`
miniconf = { version = "0.13", features = ["json-core", "derive", "postcard"] }
miniconf_mqtt = "0.13"
miniconf = { version = "0.14", features = ["json-core", "derive", "postcard"] }
miniconf_mqtt = { version = "0.14" }
strum = { version = "0.26.1", default-features = false, features = ["derive"] }
serial-settings = "0.1"
postcard = "1"
Expand Down Expand Up @@ -95,3 +93,6 @@ codegen-units = 1

[build-dependencies]
built = { version = "0.7", features = ["git2"], default-features = false }

[patch.crates-io]
serial-settings = { git = "https://github.com/quartiq/stabilizer.git" }
4 changes: 2 additions & 2 deletions py/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ authors = [
{ name = "Norman Krackow", email = "[email protected]" },
]
dependencies = [
"miniconf-mqtt@git+https://github.com/quartiq/miniconf@v0.13.1#subdirectory=py/miniconf-mqtt",
"stabilizer@git+https://github.com/quartiq/stabilizer@v0.10.0#subdirectory=py",
"miniconf-mqtt@git+https://github.com/quartiq/miniconf@v0.14.0#subdirectory=py/miniconf-mqtt",
"stabilizer@git+https://github.com/quartiq/stabilizer@c8b4723#subdirectory=py",
]

[project.urls]
Expand Down
Loading
Loading