Commit Graph

689 Commits

Author SHA1 Message Date
Ryan Summers c628b8d57a
Update src/bin/lockin-internal-demo.rs
Co-authored-by: Robert Jördens <rj@quartiq.de>
2021-01-29 09:55:23 +01:00
Ryan Summers c030b97714
Apply suggestions from code review
Co-authored-by: Robert Jördens <rj@quartiq.de>
2021-01-26 12:49:45 +01:00
Ryan Summers 51085d175e Removing dead-code allowance 2021-01-26 12:23:17 +01:00
Ryan Summers e161f49822 Adding WIP lockin demo 2021-01-26 12:21:44 +01:00
Ryan Summers 43ff186bc6 Merge branch 'master' into feature/lockin-app-refactor 2021-01-26 10:53:25 +01:00
Ryan Summers 7c5a74c35e Renaming internal lockin 2021-01-26 10:52:35 +01:00
Robert Jördens 659a6879f7
Merge pull request #231 from quartiq/lockin-bin
Lockin bin
2021-01-22 16:25:56 +01:00
Robert Jördens 57a5c4ff9b make lockin a unittest, not integration test 2021-01-22 16:04:02 +01:00
Robert Jördens d0d2c6352d lockin: refactor to use common lockin processing 2021-01-22 16:00:05 +01:00
Robert Jördens eea5033d36 dsp bench: fix 2021-01-22 11:38:38 +01:00
Robert Jördens 0cd2140668 rafactor complex, cossin, atan2 2021-01-21 16:12:59 +01:00
Robert Jördens cb280c3303 lockin integration: reduce and refactor further 2021-01-21 15:01:17 +01:00
Robert Jördens 948e58c910 lockin: refactor Lockin 2021-01-21 14:57:44 +01:00
Robert Jördens 5af2b9c63a fmt 2021-01-20 15:34:56 +01:00
Robert Jördens c078de05cc lockin: fix adc value conversion 2021-01-20 15:31:46 +01:00
Robert Jördens 41a907a4bf Merge branch 'master' into lockin-bin
* master:
  hitl: undo bin change to make merging easier
  build(deps): bump serde from 1.0.118 to 1.0.120
  hitl: dispatch entire github object
  build(deps): bump log from 0.4.11 to 0.4.13
2021-01-20 15:20:12 +01:00
dependabot[bot] 19a9d92220
Merge pull request #233 from quartiq/dependabot/cargo/serde-1.0.120 2021-01-20 14:12:58 +00:00
dependabot[bot] 7554a1e696
Merge pull request #224 from quartiq/dependabot/cargo/log-0.4.13 2021-01-20 14:12:42 +00:00
Robert Jördens 1cf3ce322c
Merge pull request #235 from quartiq/hitl
hitl: dispatch entire github object
2021-01-20 15:10:54 +01:00
Robert Jördens 94c4f8e6f7 hitl: undo bin change to make merging easier 2021-01-20 15:09:50 +01:00
Robert Jördens 2236e5f8ab Merge remote-tracking branch 'origin/master' into hitl
* origin/master: (34 commits)
  Reordering lib.rs
  Removing main.rs
  Adding support for multiple applications
  Fixing build
  Moving panic configuration
  Reordering
  Refactoring to support multiple apps
  Updating timer compare offsets
  reciprocal_pll: remove unneeded type cast
  revert changes in main.rs and server.rs
  dsp: add reciprocal_pll
  fix bug in which real signal component is assigned twice
  fix cargo fmt style
  use only integer iir
  remove TODO note relating ADC_BATCHES and calculate_timestamp_timer_period
  shift sin/cos before demodulation product to avoid i64
  use round up half integer rounding
  move timestamp handling into new TimestampHandler struct
  move lock-in code to main.rs
  remove debug_assert in divide_round
  ...
2021-01-20 15:08:47 +01:00
Robert Jördens 775fb79ed9 ci: update 2021-01-20 15:02:35 +01:00
Robert Jördens d014ed0fe0 add lockin bin 2021-01-20 14:29:29 +01:00
Robert Jördens 603d6df6a4 Merge branch 'master' into lockin-bin
* master:
  Reordering lib.rs
  Removing main.rs
  Adding support for multiple applications
  Fixing build
  Moving panic configuration
  Reordering
  Refactoring to support multiple apps
2021-01-20 14:19:28 +01:00
Robert Jördens a31c9a5a7a
Merge pull request #234 from vertigo-designs/feature/multi-app-support
Feature/multi app support
2021-01-20 14:09:47 +01:00
Robert Jördens 507e334ec5 lockin: tweak impl 2021-01-20 14:07:57 +01:00
Ryan Summers 4d0b1b5566 Reordering lib.rs 2021-01-20 13:44:53 +01:00
Ryan Summers 86355c9c5d Removing main.rs 2021-01-20 13:44:16 +01:00
Ryan Summers 26677063ea Adding support for multiple applications 2021-01-20 13:43:34 +01:00
Ryan Summers 2ef27b8187 Formatting 2021-01-20 12:55:55 +01:00
Ryan Summers b2cbc6791d Restructuring 2021-01-20 12:55:45 +01:00
Ryan Summers f1f15aca65 Refactoring app structure 2021-01-20 12:49:07 +01:00
Ryan Summers a715680482 Merge branch 'master' into feature/lockin-app-refactor 2021-01-20 12:36:20 +01:00
Ryan Summers 058e474b78
Merge pull request #230 from vertigo-designs/feature/hardware-module
Refactoring to support multiple apps
2021-01-20 12:35:36 +01:00
dependabot[bot] 1f43e4d0b5
build(deps): bump serde from 1.0.118 to 1.0.120
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.118 to 1.0.120.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.118...v1.0.120)

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-20 04:01:24 +00:00
Robert Jördens 778f4ac4d5 lockin: wrapping_neg 2021-01-19 11:30:12 +01:00
Robert Jördens 720b143132 Merge remote-tracking branch 'origin/master' into lockin-bin
* origin/master:
  Updating timer compare offsets
  Removing dac isr clear
  Adding information about DSP timing specifications
  Specifying consequences of failing to meet timing
  Updating dependencies
  Apply suggestions from code review
  Adding documentation about double-buffered mode to DACs
  Updating DACs to utilize DBM
  Adding safety documentation
  Adding docs
  Updating DAC output format, adding DDS stream docs
  Adding documentation for ADCs and DACs
2021-01-19 11:12:50 +01:00
Robert Jördens 20488ea3bc lockin: refine 2021-01-19 11:01:21 +01:00
Robert Jördens 147b0a6982
Merge pull request #228 from matthuszagh/lockin-bin
Lock-in integration testing
2021-01-19 10:59:13 +01:00
Ryan Summers ac06f811ab Adding framework for initial lockin demo 2021-01-18 18:02:00 +01:00
Ryan Summers 573189bdd9 Fixing build 2021-01-18 17:23:21 +01:00
Ryan Summers 9d90d7b0d2 Adding WIP apps 2021-01-18 17:20:33 +01:00
Ryan Summers 6618e921fe Moving panic configuration 2021-01-18 16:55:56 +01:00
Ryan Summers 8dd72ae75e Reordering 2021-01-18 16:52:09 +01:00
Ryan Summers 20535a721d Refactoring to support multiple apps 2021-01-18 16:47:47 +01:00
Ryan Summers d447501c47
Merge pull request #208 from vertigo-designs/feature/io-docs
Adding documentation, updating DAC output timing
2021-01-18 13:54:56 +01:00
Ryan Summers 7a2f950667 Updating timer compare offsets 2021-01-18 13:41:23 +01:00
Ryan Summers 598a48b178 Merge branch 'master' into feature/io-docs 2021-01-18 13:25:03 +01:00
Matt Huszagh 73ffc873cd add lock-in integration test 2021-01-14 15:31:40 -08:00
Matt Huszagh f0eb58dfb2 swap sin and cos for demodulation
The in-phase component should be multiplied by the sin value and the
quadrature component should be multiplied by the cos value.
2021-01-14 14:51:07 -08:00