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.

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

MQTT settings and telemetry #261

Merged
merged 32 commits into from
Feb 19, 2021
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
f0e7c15
Adding WIP refactor for MQTT + settings
ryan-summers Jan 26, 2021
a772ccc
Adding WIP updates for StringSet
ryan-summers Jan 26, 2021
702ccc2
Using custom branch of miniconf
ryan-summers Jan 27, 2021
e954ba3
Merge branch 'master' into feature/mqtt-convert
ryan-summers Jan 30, 2021
b73286c
Removing MQTT interface
ryan-summers Jan 30, 2021
9a1bb5d
Fixing build
ryan-summers Jan 30, 2021
411a847
Updating smoltcp-nal
ryan-summers Jan 30, 2021
096f786
Expanding miniconf to lockin
ryan-summers Jan 30, 2021
913990d
Merge remote-tracking branch 'origin/rj/bump-hal-smoltcp' into featur…
ryan-summers Feb 3, 2021
9e1a6ec
Updating dependencies
ryan-summers Feb 3, 2021
738516e
Adding broken example
ryan-summers Feb 3, 2021
91f16c2
Adding working example
ryan-summers Feb 3, 2021
9e1f4a8
Merge branch 'master' into feature/mqtt-convert
ryan-summers Feb 17, 2021
13e0271
Adding simplified clocking semantics
ryan-summers Feb 17, 2021
cb16e9a
Updating settings update function
ryan-summers Feb 17, 2021
6b0595b
Fixing dsp toml
ryan-summers Feb 17, 2021
b66f80f
Fixing dependencies
ryan-summers Feb 17, 2021
50476f6
Adding settings support for lockin-external
ryan-summers Feb 17, 2021
e8711d8
Merge branch 'master' into feature/mqtt-convert
ryan-summers Feb 17, 2021
3c8cd58
Removing lockin-external changes
ryan-summers Feb 17, 2021
e8c4829
Adding docs for the cycle counter
ryan-summers Feb 17, 2021
a55b30e
Working around dependency injection bug
ryan-summers Feb 17, 2021
63a2220
Removing support for configuring IIR state
ryan-summers Feb 17, 2021
90ef083
Fixing style
ryan-summers Feb 17, 2021
78e69b1
s/criterion/easybench/ for less weight
jordens Feb 17, 2021
0425036
deps: make miniconf a patch
jordens Feb 17, 2021
65a0831
Merge branch 'master' into feature/mqtt-convert
ryan-summers Feb 19, 2021
2ac7568
Updating dependencies
ryan-summers Feb 19, 2021
c6ef78c
Pulling back easybench changes
ryan-summers Feb 19, 2021
04dff30
Fixing dependencies:
ryan-summers Feb 19, 2021
76f2f74
Removing information about legacy server
ryan-summers Feb 19, 2021
28db428
Fixing bench tests
ryan-summers Feb 19, 2021
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
68 changes: 66 additions & 2 deletions Cargo.lock

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

11 changes: 5 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ panic-semihosting = { version = "0.5", optional = true }
panic-halt = "0.2"
serde = { version = "1.0", features = ["derive"], default-features = false }
heapless = { version = "0.5", features = ["serde"] }
serde-json-core = "0.2"
cortex-m-rtic = "0.5.5"
embedded-hal = "0.2.4"
nb = "1.0.0"
Expand All @@ -45,15 +44,15 @@ enum-iterator = "0.6.0"
paste = "1"
dsp = { path = "dsp" }
ad9959 = { path = "ad9959" }
smoltcp-nal = "0.1.0"

[dependencies.miniconf]
git = "https://github.com/quartiq/miniconf.git"
branch = "rs/issue-21/terminal-array-elements"

[dependencies.mcp23017]
git = "https://github.com/mrd0ll4r/mcp23017.git"

[dependencies.smoltcp]
version = "0.7"
features = ["ethernet", "proto-ipv4", "socket-tcp", "proto-ipv6"]
default-features = false

[dependencies.stm32h7xx-hal]
features = ["stm32h743v", "rt", "unproven", "ethernet", "quadspi"]
git = "https://github.com/stm32-rs/stm32h7xx-hal"
Expand Down
4 changes: 4 additions & 0 deletions dsp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ libm = "0.2.1"
serde = { version = "1.0", features = ["derive"], default-features = false }
generic-array = "0.14"

[dependencies.miniconf]
ryan-summers marked this conversation as resolved.
Show resolved Hide resolved
git = "https://github.com/quartiq/miniconf.git"
branch = "rs/issue-21/terminal-array-elements"

[dev-dependencies]
criterion = "0.3"
rand = "0.8"
Expand Down
5 changes: 3 additions & 2 deletions dsp/src/iir.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use serde::{Deserialize, Serialize};
use miniconf::StringSet;
use serde::Deserialize;

use super::{abs, copysign, macc, max, min};
use core::f32;
Expand Down Expand Up @@ -38,7 +39,7 @@ pub type Vec5 = [f32; 5];
/// Therefore it can trivially implement bump-less transfer.
/// * Cascading multiple IIR filters allows stable and robust
/// implementation of transfer functions beyond bequadratic terms.
#[derive(Copy, Clone, Default, Deserialize, Serialize)]
#[derive(Copy, Clone, Debug, Default, Deserialize, StringSet)]
pub struct IIR {
pub ba: Vec5,
pub y_offset: f32,
Expand Down
Loading