ff79e0a8ac
Fixing merge
2021-05-06 17:10:38 +02:00
61321c484a
Merge branch 'master' into feature/telemetry
2021-05-06 17:07:46 +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
e07f0a4e2a
Formatting
2021-05-06 16:37:36 +02:00
eeee5af296
Updating dependencies
2021-05-06 16:32:57 +02:00
03adb72aab
Fixing clippy
2021-05-06 16:23:41 +02:00
97cca486b5
lockin: merge sample_phase/frequency computation
2021-05-06 16:22:42 +02:00
80b8716be4
Finalizing merge
2021-05-06 14:40:28 +02:00
4780a97528
Fixing modulation waveform scale
2021-05-06 14:36:57 +02:00
9569df9e82
Renaming power -> magnitude
2021-05-06 14:34:09 +02:00
0bb7c1fdb0
Finalizing names
2021-05-06 14:33:22 +02:00
19dd57c6a8
Satisfying clippy
2021-05-06 13:46:55 +02:00
a5c5e807b1
Fixing build
2021-05-06 13:26:02 +02:00
ffc7f5f437
Removing telemetry period
2021-05-06 13:20:52 +02:00
1858257fc4
Formatting code
2021-05-06 13:18:40 +02:00
e7b5334f6b
Refactoring output configuration for lockin
2021-05-06 13:17:29 +02:00
19b606c385
Refactoring lockin binaries
2021-05-06 13:08:10 +02:00
8c581ea0a6
Merging lockin app functions
2021-05-06 13:02:39 +02:00
81a292a77e
Fixing system timer
2021-05-06 12:45:13 +02:00
949ea9c1b3
Fixing build, formatting
2021-05-06 12:35:04 +02:00
4cbc826f00
Adding documentation
2021-05-06 12:33:07 +02:00
e9c3e24863
Merge branch 'master' into feature/telemetry
2021-05-05 17:47:34 +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
05dc80709e
Updating docs and logger
2021-05-05 17:32:07 +02:00
1ad3f1d1a8
Cleaning up python script
2021-05-05 17:09:51 +02:00
740e41d7cb
Renaming files
2021-05-05 16:50:51 +02:00
8efd7d4417
Fixing design parameters file
2021-05-05 16:49:11 +02:00
0c6935587e
Adding updated telemetry implementation
2021-05-05 16:46:53 +02:00
8144b3acf2
Updating constructors
2021-05-05 16:16:54 +02:00
4a656eedd2
Adding refactor for telemetry
2021-05-05 15:39:33 +02:00
06b328ff52
Adding WIP updates for telemetry
2021-05-05 14:42:17 +02:00
e6180de147
Fixing style
2021-05-05 14:38:43 +02:00
f9b1b8df13
Adding comment about subscription failures
2021-05-05 14:33:34 +02:00
919f68c934
Updating miniconf utility after testing
2021-05-05 14:30:32 +02:00
4888f18f88
Adding rework to network module
2021-05-04 19:52:41 +02:00
5767973548
Merge branch 'feature/mqtt-rework' into feature/telemetry
2021-05-04 18:19:38 +02:00
a3ff8aae75
Updating miniconf utility to use correlation data
2021-05-04 14:21:00 +02:00
1f8f63018a
Cleaning up API
2021-05-04 13:50:17 +02:00
5c4ba78dd1
Refactoring MQTT architecture
2021-05-04 13:13:44 +02:00
b8b3bc0873
gha: install gcc
2021-04-29 17:44:54 +02:00
b35250efbf
Fixing ADC/voltage conversion functions
2021-04-29 17:39:19 +02:00
780b3441a2
fmt
2021-04-29 17:33:20 +02:00
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
23bdd816a7
dependencies: align with master
2021-04-29 16:45:30 +02:00
9e66054d21
bump cortex-m-rt to 0.6.13+git
2021-04-29 16:45:30 +02:00
cd3cfa63e6
memory.x: remove comment about old cortex-m-rt
2021-04-29 16:45:30 +02:00
4169cd8251
Adding AFE functions
2021-04-29 16:22:06 +02:00
e746e2a12c
Adding WIP telemetry
2021-04-29 15:55:36 +02:00
9e355ca573
Merge branch 'feature/mqtt-rework' into feature/telemetry
2021-04-29 14:56:25 +02:00
bc4fbc0e1c
Merge branch 'master' into feature/mqtt-rework
2021-04-29 14:49:24 +02:00
