Skip to content

Refactoring lockin binaries#352

Merged
bors[bot] merged 10 commits into
masterfrom
feature/lockin-merge
May 6, 2021
Merged

Refactoring lockin binaries#352
bors[bot] merged 10 commits into
masterfrom
feature/lockin-merge

Conversation

@ryan-summers

Copy link
Copy Markdown
Member

This PR merges lockin-external and lockin-internal into a single binary.

This has also refactored the output configuration to make it more configurable. This was needed to work well with the reference signal generation, as that output should necessarily just override a different setting.

Comment thread src/bin/lockin.rs Outdated
@ryan-summers ryan-summers mentioned this pull request May 6, 2021
@ryan-summers

Copy link
Copy Markdown
Member Author

Alright, testing on Stabilizer with an oscilloscope shows that both channels are independently configurable and miniconf.py shows them swapping over measurements as requested.

@jordens This is ready for review whenever you get a chance.

Comment thread src/bin/lockin.rs Outdated
Comment thread src/bin/lockin.rs Outdated
Comment thread src/bin/lockin.rs
@jordens

jordens commented May 6, 2021

Copy link
Copy Markdown
Member

bors merge

bors Bot added a commit that referenced this pull request May 6, 2021
352: Refactoring lockin binaries r=jordens a=ryan-summers

This PR merges `lockin-external` and `lockin-internal` into a single binary.

This has also refactored the output configuration to make it more configurable. This was needed to work well with the reference signal generation, as that output should necessarily just override a different setting.

Co-authored-by: Ryan Summers <ryan.summers@vertigo-designs.com>
Co-authored-by: Robert Jördens <rj@quartiq.de>
@ryan-summers

Copy link
Copy Markdown
Member Author

bors cancel

@bors

bors Bot commented May 6, 2021

Copy link
Copy Markdown
Contributor

Canceled.

@ryan-summers

Copy link
Copy Markdown
Member Author

bors merge

bors Bot added a commit that referenced this pull request May 6, 2021
352: Refactoring lockin binaries r=ryan-summers a=ryan-summers

This PR merges `lockin-external` and `lockin-internal` into a single binary.

This has also refactored the output configuration to make it more configurable. This was needed to work well with the reference signal generation, as that output should necessarily just override a different setting.

Co-authored-by: Ryan Summers <ryan.summers@vertigo-designs.com>
Co-authored-by: Robert Jördens <rj@quartiq.de>
@ryan-summers

Copy link
Copy Markdown
Member Author

bors cancel

@bors

bors Bot commented May 6, 2021

Copy link
Copy Markdown
Contributor

Canceled.

@ryan-summers

Copy link
Copy Markdown
Member Author

bors merge

@bors

bors Bot commented May 6, 2021

Copy link
Copy Markdown
Contributor

Build succeeded:

@bors
bors Bot merged commit bde0b0a into master May 6, 2021
@bors
bors Bot deleted the feature/lockin-merge branch May 6, 2021 15:05
bors Bot added a commit that referenced this pull request May 10, 2021
341: Feature/telemetry r=ryan-summers a=ryan-summers

This PR fixes #149 

This PR adds the following:
* A `SystemTimer` used for RTIC scheduling (required for schedule periods > ~2 seconds)
* A refactor of the `src/net` directory
* Addition of network stack sharing via proxy (identical to implementation from `shared-bus`)
* Addition of a telemetry task

This must be merged after #352 

Future Work:
* move `src/net/shared.rs` into `embedded-nal` or some other separate crate.
* Investigate removal of shared network stack by making smoltcp sockets owned and interrupt-safe

Co-authored-by: Ryan Summers <ryan.summers@vertigo-designs.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants