Commit Graph

1126 Commits

Author SHA1 Message Date
Robert Jördens bd491cf584
Merge branch 'master' into rj/itcm 2021-05-10 12:09:01 +02:00
bors[bot] bde0b0a4be
Merge #352
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>
2021-05-06 14:57:26 +00:00
Robert Jördens 97cca486b5 lockin: merge sample_phase/frequency computation 2021-05-06 16:22:42 +02:00
Ryan Summers 4780a97528 Fixing modulation waveform scale 2021-05-06 14:36:57 +02:00
Ryan Summers 9569df9e82 Renaming power -> magnitude 2021-05-06 14:34:09 +02:00
Ryan Summers 0bb7c1fdb0 Finalizing names 2021-05-06 14:33:22 +02:00
Ryan Summers 19dd57c6a8 Satisfying clippy 2021-05-06 13:46:55 +02:00
Ryan Summers a5c5e807b1 Fixing build 2021-05-06 13:26:02 +02:00
Ryan Summers ffc7f5f437 Removing telemetry period 2021-05-06 13:20:52 +02:00
Ryan Summers 1858257fc4 Formatting code 2021-05-06 13:18:40 +02:00
Ryan Summers e7b5334f6b Refactoring output configuration for lockin 2021-05-06 13:17:29 +02:00
Ryan Summers 19b606c385 Refactoring lockin binaries 2021-05-06 13:08:10 +02:00
bors[bot] ed34b69823
Merge #347
347: MQTT/Miniconf refactor r=ryan-summers a=ryan-summers

This PR refactors the MQTT/Miniconf API to make use of the refactored miniconf API. Routing has been moved to the `net` module.

**TODO**:
- [x] Test on hardware
- [x] Document modules
- [x] Merge dependency changes, update dependencies to use `rev`
- [x] Update `miniconf.py` to be `stabilizer.py`, update API

Co-authored-by: Ryan Summers <ryan.summers@vertigo-designs.com>
2021-05-05 15:39:26 +00:00
Ryan Summers 05dc80709e Updating docs and logger 2021-05-05 17:32:07 +02:00
Ryan Summers 1ad3f1d1a8 Cleaning up python script 2021-05-05 17:09:51 +02:00
Ryan Summers e6180de147 Fixing style 2021-05-05 14:38:43 +02:00
Ryan Summers f9b1b8df13 Adding comment about subscription failures 2021-05-05 14:33:34 +02:00
Ryan Summers 919f68c934 Updating miniconf utility after testing 2021-05-05 14:30:32 +02:00
Ryan Summers a3ff8aae75 Updating miniconf utility to use correlation data 2021-05-04 14:21:00 +02:00
Ryan Summers 1f8f63018a Cleaning up API 2021-05-04 13:50:17 +02:00
Ryan Summers 5c4ba78dd1 Refactoring MQTT architecture 2021-05-04 13:13:44 +02:00
Robert Jördens b8b3bc0873 gha: install gcc 2021-04-29 17:44:54 +02:00
Robert Jördens 780b3441a2 fmt 2021-04-29 17:33:20 +02:00
Robert Jördens f0c50d9678 Merge branch 'master' into rj/itcm
* master: (70 commits)
  Updating JSON syntax
  Updating trigger
  Adding bors timeout
  dual-iir: add some mqtt parameter docs
  changelog: spelling
  update lock
  let bors handle hitl
  prepare v0.5.0 release
  Updating code after review
  Adding comment, reverting change
  Adding sleep to HITL run
  Updating ping deadline
  Reverting unintended change
  Updating dependency revision
  Renaming interface to avoid confusion
  dual-iir: use InputPin re-export, rename digital_input
  Updating dependency
  dual-iir: add enable_hold, force_hold
  fix bench
  hardware: add digital input support
  ...
2021-04-29 17:28:58 +02:00
Robert Jördens 23bdd816a7 dependencies: align with master 2021-04-29 16:45:30 +02:00
Robert Jördens 9e66054d21 bump cortex-m-rt to 0.6.13+git 2021-04-29 16:45:30 +02:00
Robert Jördens cd3cfa63e6 memory.x: remove comment about old cortex-m-rt 2021-04-29 16:45:30 +02:00
Ryan Summers bc4fbc0e1c Merge branch 'master' into feature/mqtt-rework 2021-04-29 14:49:24 +02:00
bors[bot] 339332d815
Merge #349
349: HITL Check Update r=ryan-summers a=ryan-summers

Updating the HITL workflow to create the check locally before having the remote repository create it. This makes it belong to a deterministic test suite and always exist

Co-authored-by: Ryan Summers <ryan.summers@vertigo-designs.com>
2021-04-29 12:30:39 +00:00
Ryan Summers c9f61143f5 Updating JSON syntax 2021-04-29 14:15:16 +02:00
Ryan Summers 7906ef2f9d Updating trigger 2021-04-29 14:12:22 +02:00
Ryan Summers d6cc8f7ed5 Adding bors timeout 2021-04-29 14:07:42 +02:00
Ryan Summers eeb15efdff Adding lockfile 2021-04-29 13:20:26 +02:00
Ryan Summers fa1f501f0b Updating dependencies 2021-04-29 12:58:04 +02:00
Ryan Summers d742350bfd Updating failure printing 2021-04-29 12:12:46 +02:00
Ryan Summers 5499fc6b47 Updating miniconf to use updated API 2021-04-29 12:11:35 +02:00
Ryan Summers 7ddf2271f3 Refactoring net module 2021-04-29 11:54:16 +02:00
Ryan Summers aad026161f Refactoring to support DHCP 2021-04-29 11:28:35 +02:00
Ryan Summers 01349a39b3 Merge branch 'master' into feature/mqtt-rework 2021-04-29 11:07:00 +02:00
Ryan Summers 0922cc42af Adding new miniconf implementation 2021-04-28 21:03:38 +02:00
bors[bot] 738fc520a9
Merge #346
346: dual-iir: add some mqtt parameter docs r=jordens a=jordens



Co-authored-by: Robert Jördens <rj@quartiq.de>
2021-04-28 14:35:00 +00:00
Robert Jördens 61dc6e340e dual-iir: add some mqtt parameter docs 2021-04-28 16:27:59 +02:00
Ryan Summers f38e3b9608 Simplifying MQTT handling 2021-04-22 15:57:24 +02:00
Ryan Summers 36cc423f70 Refactoring MQTT to support telemetry 2021-04-22 15:16:33 +02:00
bors[bot] f5eb418a5c
Merge #342
342: prepare v0.5.0 release r=ryan-summers a=jordens

* update changelog
* bump version


Co-authored-by: Robert Jördens <rj@quartiq.de>
2021-04-21 15:52:06 +00:00
Robert Jördens 3a19d3dc6d changelog: spelling 2021-04-21 16:40:30 +02:00
Robert Jördens d9129ed028 update lock 2021-04-21 16:38:10 +02:00
Robert Jördens 5017d2f345
Merge branch 'master' into rj/prep-v0.5.0 2021-04-21 15:34:09 +02:00
bors[bot] 82787e2aab
Merge #343
343: let bors handle hitl r=jordens a=jordens



Co-authored-by: Robert Jördens <rj@quartiq.de>
2021-04-21 13:28:35 +00:00
Robert Jördens e5557582a2 let bors handle hitl 2021-04-21 15:03:28 +02:00