Robert Jördens
5ee7ef388e
Merge branch 'master' into rj/pounder-fixes
...
* master:
adapt to new heapless/serde-json-core after const-generics
Bump serde-json-core from 0.3.0 to 0.4.0
build(deps): bump heapless from 0.6.1 to 0.7.1
2021-05-28 21:44:07 +02:00
Robert Jördens
b8da9961b8
adapt to new heapless/serde-json-core after const-generics
2021-05-28 18:34:25 +02:00
Robert Jördens
2368a4f6ed
pounder: enum for gpio ext pins
...
This is currently unused but it's better to have enums than
a set of assorted constants.
2021-05-28 16:46:06 +02:00
Robert Jördens
3616f1fa5a
pounder: fix attenuator indices (latch and shiftreg)
...
Before the discriminant was used despite being a compiler implementaiton
detail. This now fixes the discriminant to match byte index in the attenuator
shift register and latch-enable index of the gpio extender.
2021-05-28 16:44:58 +02:00
Robert Jördens
94f60c100c
pounder io extender: hack around some bug
2021-05-28 16:44:11 +02:00
Robert Jördens
79f8838104
rf_power: fix measurement
2021-05-28 16:44:11 +02:00
Robert Jördens
fc78b087ee
attenuators: use robust latching sequence
...
To ensure that eatch call to latch() generates a rising edge, first
assert low, then high, not the other way round.
2021-05-28 16:43:29 +02:00
Robert Jördens
f1a58b7811
pounder: simplify attenuator spi interface
2021-05-28 16:41:58 +02:00
Robert Jördens
79d30b4c6b
setup: cleanup
2021-05-28 16:32:26 +02:00
Robert Jördens
c5d3837745
itcm: add some comments, make it safe
2021-05-28 16:03:40 +02:00
Robert Jördens
441c81d135
Merge branch 'master' into rj/itcm
2021-05-27 18:22:22 +02:00
Ryan Summers
f10bce709f
Updating the embedded-nal
2021-05-27 13:42:52 +02:00
Ryan Summers
23a93e9135
Removing spurious settings updates
2021-05-26 13:05:54 +02:00
Robert Jördens
4d5f1ab5e9
itcm: implement in rust and execute during setup()
2021-05-14 17:23:38 +02:00
Robert Jördens
bd8b3cd6f3
Merge remote-tracking branch 'origin/master' into rj/itcm
...
* origin/master:
deps: fix rtt-logger->rtt-target, cleanup, bump cortex-m
build(deps): bump embedded-hal from 0.2.4 to 0.2.5
Bump rtt-target from 0.2.2 to 0.3.1
Bump serde from 1.0.125 to 1.0.126
remove unused dependencies
remove unused dependencies
2021-05-14 08:18:33 +02:00
Robert Jördens
b9cee6345a
deps: fix rtt-logger->rtt-target, cleanup, bump cortex-m
2021-05-14 07:16:47 +02:00
Robert Jördens
5d37963ec2
Merge remote-tracking branch 'origin/master' into rj/log
...
* origin/master:
remove unused dependencies
remove unused dependencies
2021-05-13 18:27:11 +02:00
Robert Jördens
8eef23da6b
Merge branch 'rj/log' into rj/itcm
...
* rj/log:
refine panic handler and add some logging info
hitl: kill probe-run cleanly
set target-cpu=cortex-m7, MSRV 1.52.0, use probe-run
README: document lockin, cleanup instructions, use probe-run
CHANGELOG: update
README: streamline docs a bit, add probe-run
update hitl script
remove rtt feature
use rtt logging
dsp/lowpass,lockin: const generics
2021-05-13 15:20:20 +02:00
Robert Jördens
18a8053cab
refine panic handler and add some logging info
2021-05-13 15:18:22 +02:00
Robert Jördens
401e1b0681
remove rtt feature
2021-05-13 11:14:03 +02:00
Robert Jördens
5b616a2874
use rtt logging
2021-05-13 10:55:43 +02:00
Robert Jördens
31332d220e
remove unused dependencies
2021-05-12 12:59:58 +02: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
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
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