Commit Graph

1275 Commits

Author SHA1 Message Date
Robert Jördens 057f3dccf6 remove unused dependencies 2021-05-12 13:09:22 +02:00
Robert Jördens 31332d220e remove unused dependencies 2021-05-12 12:59:58 +02:00
bors[bot] 76b9be6d93
Merge #355
355: dsp/lowpass,lockin: const generics r=jordens a=jordens



Co-authored-by: Robert Jördens <rj@quartiq.de>
2021-05-10 15:53:39 +00:00
Robert Jördens bcdb5e3c0f dsp/lowpass,lockin: const generics 2021-05-10 17:31:53 +02:00
Robert Jördens 66184ca089 Merge remote-tracking branch 'origin/master' into rj/itcm
* origin/master: (34 commits)
  Simplifying unit conversions
  Cleaning up conversion + comments
  Addressing review feedback
  Update src/hardware/dac.rs
  Renaming AdcSample -> AdcCode
  Updating float conversion
  Adding adc/dac code conversion utilities
  Simplifying settings lock
  Updating after review
  Updating delay
  Fixing merge
  Formatting
  Updating dependencies
  Fixing clippy
  Finalizing merge
  Merging lockin app functions
  Fixing system timer
  Fixing build, formatting
  Adding documentation
  Renaming files
  ...
2021-05-10 17:00:57 +02:00
bors[bot] 33549793ca
Merge #341
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>
2021-05-10 11:04:53 +00:00
Robert Jördens bd491cf584
Merge branch 'master' into rj/itcm 2021-05-10 12:09:01 +02:00
Ryan Summers 81bc569f0e Simplifying unit conversions 2021-05-10 11:40:36 +02:00
Ryan Summers fa886d2eac Cleaning up conversion + comments 2021-05-10 11:10:26 +02:00
Ryan Summers 65eb74b31e Merge branch 'feature/telemetry' of github.com:quartiq/stabilizer into feature/telemetry 2021-05-10 11:07:29 +02:00
Ryan Summers fcda2d5bd1 Addressing review feedback 2021-05-10 10:57:50 +02:00
Ryan Summers 6e94ffc138
Update src/hardware/dac.rs
Co-authored-by: Robert Jördens <rj@quartiq.de>
2021-05-07 14:23:03 +02:00
Ryan Summers 60b1b112b1 Renaming AdcSample -> AdcCode 2021-05-07 14:11:25 +02:00
Ryan Summers 923790b0b9 Updating float conversion 2021-05-07 14:02:25 +02:00
Ryan Summers b73a4d9e59 Adding adc/dac code conversion utilities 2021-05-07 13:50:34 +02:00
Ryan Summers d68fa87fec Simplifying settings lock 2021-05-07 13:04:25 +02:00
Ryan Summers 7b76b1f14c Updating after review 2021-05-07 13:02:14 +02:00
Ryan Summers 89eaefd8d5 Updating delay 2021-05-06 17:14:17 +02:00
Ryan Summers ff79e0a8ac Fixing merge 2021-05-06 17:10:38 +02:00
Ryan Summers 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
Ryan Summers e07f0a4e2a Formatting 2021-05-06 16:37:36 +02:00
Ryan Summers eeee5af296 Updating dependencies 2021-05-06 16:32:57 +02:00
Ryan Summers 03adb72aab Fixing clippy 2021-05-06 16:23:41 +02:00
Robert Jördens 97cca486b5 lockin: merge sample_phase/frequency computation 2021-05-06 16:22:42 +02:00
Ryan Summers 80b8716be4 Finalizing merge 2021-05-06 14:40:28 +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
Ryan Summers 8c581ea0a6 Merging lockin app functions 2021-05-06 13:02:39 +02:00
Ryan Summers 81a292a77e Fixing system timer 2021-05-06 12:45:13 +02:00
Ryan Summers 949ea9c1b3 Fixing build, formatting 2021-05-06 12:35:04 +02:00
Ryan Summers 4cbc826f00 Adding documentation 2021-05-06 12:33:07 +02:00
Ryan Summers 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
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 740e41d7cb Renaming files 2021-05-05 16:50:51 +02:00
Ryan Summers 8efd7d4417 Fixing design parameters file 2021-05-05 16:49:11 +02:00
Ryan Summers 0c6935587e Adding updated telemetry implementation 2021-05-05 16:46:53 +02:00
Ryan Summers 8144b3acf2 Updating constructors 2021-05-05 16:16:54 +02:00
Ryan Summers 4a656eedd2 Adding refactor for telemetry 2021-05-05 15:39:33 +02:00
Ryan Summers 06b328ff52 Adding WIP updates for telemetry 2021-05-05 14:42:17 +02:00
Ryan Summers e6180de147 Fixing style 2021-05-05 14:38:43 +02:00