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
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
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
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
Matt Huszagh
9d0aa40ce8
Revert "revert changes in main.rs and server.rs"
...
This reverts commit e599977983
.
2021-01-13 09:54:04 -08:00
Matt Huszagh
e599977983
revert changes in main.rs and server.rs
2021-01-13 08:59:27 -08:00
Matt Huszagh
76088efda5
dsp: add reciprocal_pll
2021-01-13 08:37:33 -08:00
Matt Huszagh
6aad92af43
fix bug in which real signal component is assigned twice
2021-01-12 18:36:18 -08:00
Matt Huszagh
07b7201b49
fix cargo fmt style
2021-01-12 17:26:42 -08:00
Matt Huszagh
a0d472b398
use only integer iir
2021-01-12 17:21:55 -08:00
Matt Huszagh
f974f4099c
remove TODO note relating ADC_BATCHES and calculate_timestamp_timer_period
...
Having both is not really redundant.
2021-01-12 16:17:58 -08:00
Matt Huszagh
80ed715f5a
shift sin/cos before demodulation product to avoid i64
2021-01-12 16:07:04 -08:00
Matt Huszagh
41ea2ebed4
use round up half integer rounding
2021-01-12 15:59:03 -08:00
Matt Huszagh
4c033c0f3e
move timestamp handling into new TimestampHandler struct
2021-01-12 13:06:49 -08:00
Matt Huszagh
e14aa8b613
move lock-in code to main.rs
2021-01-12 10:45:34 -08:00
Matt Huszagh
028f4a1bb2
fix small typos
2021-01-12 07:36:56 -08:00
Ryan Summers
db3a42a7b9
Update src/adc.rs
...
Co-authored-by: Robert Jördens <rj@quartiq.de>
2021-01-12 06:54:16 -08:00
Ryan Summers
bcf7a59993
Removing dac isr clear
2021-01-12 14:15:45 +01:00
Ryan Summers
09ecd3291a
Merge branch 'rs/issue-219/adc-setup' into feature/io-docs
2021-01-12 14:02:19 +01:00
Ryan Summers
6b170c25ed
Fixing timing synchronization
2021-01-12 13:29:15 +01:00
Ryan Summers
91975993cf
Fixing docs
2021-01-11 12:38:20 +01:00
Ryan Summers
d5c21efc9d
Adding extra DMA transfer to clear TXTF in ADC SPI transfers
2021-01-11 12:31:15 +01:00
Ryan Summers
5eab732d93
Adding information about DSP timing specifications
2021-01-06 15:38:04 +01:00
Ryan Summers
56366a013f
Specifying consequences of failing to meet timing
2021-01-06 15:34:12 +01:00
Ryan Summers
4b3ceb0c0b
Merge branch 'feature/io-docs' of github.com:vertigo-designs/stabilizer into feature/io-docs
2021-01-06 15:12:25 +01:00
Ryan Summers
eefb2acfda
Updating dependencies
2021-01-06 15:12:03 +01:00
Ryan Summers
cd4721b506
Merge branch 'master' into feature/io-docs
2021-01-06 15:10:30 +01:00
Ryan Summers
f825f52785
Apply suggestions from code review
...
Co-authored-by: Robert Jördens <rj@quartiq.de>
2021-01-06 06:08:07 -08:00
Ryan Summers
18068082ac
Fixing CI
2021-01-06 15:04:06 +01:00
Ryan Summers
e9cef7bbac
Fixing after review
2021-01-06 14:59:01 +01:00
Ryan Summers
8a98428ed4
Adding documentation
2021-01-06 14:42:36 +01:00
Ryan Summers
37595405c3
Merge branch 'feature/digital-input-stamp' into feature/pounder-timestamping
2021-01-06 13:34:55 +01:00
Ryan Summers
da34756df7
Adding support for pounder v1.1
2021-01-06 13:29:19 +01:00
Ryan Summers
3332a8e927
Updating branch dependencies
2021-01-06 12:59:24 +01:00
Ryan Summers
9e7bfd4371
Adding updates after review
2021-01-06 12:24:09 +01:00
Ryan Summers
2b6e6f59a4
Adding comment about sample rate
2021-01-04 18:09:16 +01:00
Ryan Summers
7ecd08d86b
More updates after PR review
2021-01-04 18:04:01 +01:00
Ryan Summers
67b6990fc0
Addressing PR review
2021-01-04 17:12:24 +01:00
Ryan Summers
ee8f4d849f
Adding documentation about double-buffered mode to DACs
2020-12-17 14:32:53 +01:00
Ryan Summers
fb1ea765ce
Updating DACs to utilize DBM
2020-12-17 14:27:47 +01:00
Ryan Summers
ec2aaecb48
Adding safety documentation
2020-12-17 14:11:28 +01:00
Ryan Summers
8fb37c2db9
Adding docs
2020-12-17 14:10:36 +01:00
Ryan Summers
438b291974
Updating DAC output format, adding DDS stream docs
2020-12-17 14:09:18 +01:00
Ryan Summers
8e4a7c8fa9
Adding documentation for ADCs and DACs
2020-12-15 16:46:12 +01:00
Ryan Summers
fc81f3d55d
Removing DMA support from DI0 timestamping
2020-12-15 14:34:14 +01:00
Ryan Summers
352884ea06
Fixing pounder timestamps after manual testing
2020-12-15 13:13:05 +01:00
Ryan Summers
72d14adfbf
Adding support for pounder ETR timestamping
2020-12-09 18:19:33 +01:00
Ryan Summers
e9d74ae6da
Adding support for pounder DDS timestamping
2020-12-09 15:13:04 +01:00
Ryan Summers
f8cab17ffc
Adding WIP for pounder timestamps
2020-12-09 13:44:26 +01:00
Ryan Summers
2e0681ebcc
Fixing power-of-two calculation
2020-12-08 16:38:07 +01:00
Ryan Summers
645a1cd832
Updating timestamper after testing
2020-12-08 16:14:27 +01:00
Ryan Summers
3886dab961
Update src/digital_input_stamper.rs
...
Co-authored-by: Robert Jördens <rj@quartiq.de>
2020-12-08 15:15:58 +01:00
Ryan Summers
4da892b8a2
Update src/digital_input_stamper.rs
...
Co-authored-by: Robert Jördens <rj@quartiq.de>
2020-12-08 15:15:51 +01:00
Ryan Summers
1a1d8fd8b9
Adding precise control of timer periods and prescalers
2020-12-08 14:25:46 +01:00
Ryan Summers
a134340726
Adding direct and DMA collection support for DI0 timestamps
2020-12-08 13:53:34 +01:00
Ryan Summers
f2e4f497fa
Removing DBM from input stamper
2020-12-08 11:29:59 +01:00
Ryan Summers
c00ac46c2c
Merge branch 'master' into feature/qspi-stream
2020-12-07 18:51:32 +01:00
Ryan Summers
35b4287fe1
Merge branch 'feature/qspi-stream' into feature/digital-input-stamp
2020-12-07 18:49:35 +01:00
Ryan Summers
551cc5d742
Adding support for DBM
2020-12-07 18:44:45 +01:00
Ryan Summers
6eaf2cc073
Updating timestamp buffer logic
2020-12-07 18:19:20 +01:00
Ryan Summers
b191a3f01d
Updating timestamp timer to be more precise
2020-12-07 18:11:46 +01:00
Ryan Summers
ec046bc42d
Refactoring timer timestamping
2020-12-07 17:58:36 +01:00
Ryan Summers
fc81c8b5d8
Updating API
2020-12-07 17:29:36 +01:00
Ryan Summers
93ab3b7dfd
Merge branch 'master' into feature/digital-input-stamp
2020-12-07 16:12:55 +01:00
Ryan Summers
14a647867a
Updating after review
2020-12-07 10:55:09 +01:00
Robert Jördens
4f8bdb971b
main.rs: style
2020-12-04 18:22:53 +01:00
Robert Jördens
b23d5fa0dc
main.rs: whitespace
2020-12-04 18:22:38 +01:00
Niklas Kuhrmeyer
24222821b5
Added cascaded IIR with server commands for up to 2 cascaded IIRs per channel.
2020-12-03 14:10:28 +01:00
Ryan Summers
f4a4357396
Fixing semantics
2020-12-02 18:08:49 +01:00
Ryan Summers
677d017c3c
Adding documentation
2020-12-02 17:40:24 +01:00
Ryan Summers
91f722f450
Fixing buffer size
2020-12-02 17:11:06 +01:00
Ryan Summers
d3bb5ab0e4
Merge branch 'master' into feature/qspi-stream
2020-12-02 17:08:33 +01:00
Ryan Summers
d93d0c7125
Adding updated QSPI stream writer
2020-12-02 17:01:40 +01:00
Robert Jördens
31fcdcc97d
Merge branch 'master' into feature/adc-dac-io-macros
...
* master:
cargo: add docs for target cpu/features
iir: more generic math helpers, use core::intrinsics
cargo fmt [nfc]
iir: vminnm/vmaxnm
iir: fmt [nfc]
iir: fix comment [nfc]
cargo-config: cm7 features
iir: copy_within is better than rotate_right
processing: use faster unsafe truncate
2020-12-02 14:56:52 +01:00
Ryan Summers
01a169ca69
Merge branch 'master' into feature/qspi-stream
2020-12-02 14:13:53 +01:00
Robert Jördens
34d59dac5d
adc: merge acquire_buffer and release_buffer again
2020-11-30 15:38:23 +01:00
Robert Jördens
b1301a6184
dac,adc: spelling
2020-11-30 15:06:15 +01:00
Robert Jördens
c72f959933
Merge remote-tracking branch 'origin/master' into feature/adc-dac-io-macros
...
* origin/master:
more nightly clippy lints
clippy lints
gha: clippy-check
build(deps): bump paste from 1.0.2 to 1.0.3
build(deps): bump panic-semihosting from 0.5.4 to 0.5.6
2020-11-30 15:03:42 +01:00
Robert Jördens
8769194166
Merge remote-tracking branch 'origin/master' into feature/iir-tweaks
...
* origin/master:
more nightly clippy lints
clippy lints
gha: clippy-check
build(deps): bump paste from 1.0.2 to 1.0.3
build(deps): bump panic-semihosting from 0.5.4 to 0.5.6
2020-11-30 12:57:58 +01:00
Robert Jördens
128e7dd78e
more nightly clippy lints
2020-11-26 16:45:57 +01:00
Robert Jördens
7fc6f5c4ad
clippy lints
2020-11-26 16:41:09 +01:00
Robert Jördens
ab50f55062
adc/dac: docstrings
2020-11-26 15:42:33 +01:00
Robert Jördens
8cf380a488
dac/adc: doc cleanup [nfc]
2020-11-26 14:40:24 +01:00
Robert Jördens
468929690d
iir: vminnm/vmaxnm
2020-11-26 14:26:44 +01:00
Robert Jördens
d8c6f39d0f
adc/dac: make the buffer handling more symmetric
2020-11-26 13:51:39 +01:00
Robert Jördens
754ebed50d
adc: transfer complete interrupt on Adc1
2020-11-26 11:55:15 +01:00
Robert Jördens
7189830896
main: put AFEs into a tuple
2020-11-26 11:34:43 +01:00
Robert Jördens
911fb66146
main: process() code duplication a bit
2020-11-26 11:34:43 +01:00
Robert Jördens
c04180635b
dacs: macros
2020-11-26 11:34:43 +01:00
Robert Jördens
1906185286
adc: macro
2020-11-26 11:02:37 +01:00
Robert Jördens
38dfd48c14
iir: fix comment [nfc]
2020-11-25 17:57:24 +01:00
Robert Jördens
cf086abaed
Merge remote-tracking branch 'origin/master' into fast-truncate
...
* origin/master:
Adding comment about checking for flag pass completion
Adding comments about execution hanging to transfer complete waits
Removing default parameter settings
Updating DAC SPI structures to own HAL SPI structure for safety guarantees
Moving constants to a new file
Removing copy to DAC buffers, adding in-place borrow of output buffers
Marking AXISRAM as NOLOAD
Refactoring timer channels to macros, adding safety notes
Adding DMA support for DAC writes
Adding sampling_timer file
Adding compile-time management of TIM2 channels
Reverting changeset
Adding documentation
Reverting openocd change
Adding updated docs for adc file
Combining ADC + DAC ISRs
Adding WIP updates
Formatting
Adding ADC/DAC modules
Adding WIP updates to using DMA
2020-11-25 17:38:03 +01:00
Ryan Summers
a07be010b6
Adding comment about checking for flag pass completion
2020-11-25 16:46:42 +01:00