Commit Graph

89 Commits

Author SHA1 Message Date
Robert Jördens f514205f8d stabilizer: don't flatten namespace, renames 2021-06-04 17:02:09 +02:00
Robert Jördens 50ea2f360c Merge branch 'master' into rj/visibility-cleanup
* master: (34 commits)
  miniconf: update example usage
  apps: spi isrs are spi errors
  pounder/timestamp: docs updatew
  pll: update tests and benches
  pll: merge advance into update (like rpll)
  pll: add advance()
  pounder_timestamper: use input capture prescaler
  Revert "Revert "pounder timestmper: don't use DMA""
  miniconf: add some checks, simplify
  miniconf.py: make retain an option
  refactor flatten_closures
  clippy recursion
  fix a few clippy lints on files that are touched
  Revert "pounder timestmper: don't use DMA"
  pounder timestmper: don't use DMA
  lockin: dma fence
  lockin: port to fast double buffered DMA
  dma: implement overflow checking
  pounder: clippy
  pounder: add comment on channel enum
  ...
2021-06-04 11:59:54 +02:00
Robert Jördens d84c79af2e apps: spi isrs are spi errors 2021-06-04 10:50:09 +02:00
Robert Jördens 93081c25c2 refactor flatten_closures 2021-06-01 17:55:42 +02:00
Robert Jördens c5a2704c41 dma: implement overflow checking 2021-06-01 13:11:16 +02:00
Robert Jördens 73187ba053 Merge branch 'master' into rj/fast-dbm
* 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
  setup: cleanup
  itcm: add some comments, make it safe
  build(deps): bump ndarray from 0.15.1 to 0.15.2
  Updating dependencies
  Updating the embedded-nal
  Removing spurious settings updates
  deps: add rationales for git dependencies
  itcm: implement in rust and execute during setup()
  remove duplicate linker option
  gha: install gcc
  fmt
  dependencies: align with master
  bump cortex-m-rt to 0.6.13+git
  memory.x: remove comment about old cortex-m-rt
  enable itcm/dtcm explicitly
  load process into itcm
2021-06-01 12:52:05 +02:00
Robert Jördens 8ccc2f2275 Merge branch 'master' into rj/visibility-cleanup
* 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
  setup: cleanup
  itcm: add some comments, make it safe
  build(deps): bump ndarray from 0.15.1 to 0.15.2
  Updating dependencies
  Updating the embedded-nal
  deps: add rationales for git dependencies
  itcm: implement in rust and execute during setup()
  remove duplicate linker option
  gha: install gcc
  fmt
  dependencies: align with master
  bump cortex-m-rt to 0.6.13+git
  memory.x: remove comment about old cortex-m-rt
  enable itcm/dtcm explicitly
  load process into itcm
2021-05-28 21:50:53 +02:00
Robert Jördens 441c81d135
Merge branch 'master' into rj/itcm 2021-05-27 18:22:22 +02:00
Robert Jördens 316dbb3d2e dual-iir: fmt 2021-05-26 17:59:30 +02:00
Robert Jördens bf92f6209a Merge branch 'master' into rj/visibility-cleanup
* master:
  Removing spurious settings updates
2021-05-26 16:04:18 +02:00
Ryan Summers 23a93e9135 Removing spurious settings updates 2021-05-26 13:05:54 +02:00
Robert Jördens c13859d486 dual-iir: add closure nesting helper macro 2021-05-25 12:05:19 +02:00
Robert Jördens 2a9657f98c dual-iir: destructure resources 2021-05-24 22:41:22 +02:00
Robert Jördens 3165c680d6 dma: don't swap buffers
* This uses a new closure-based method to the DMA HAL implementation which
  gives access to the inactive buffer directly.
* It removes changing addresses, the third buffer for DBM, the inactive
  address poisoning, and allows the cancellation of the redundant repeat
  memory barriers and compiler fences.
* This is now around 20 instructions per buffer down from about 100 cycles
  before.
* Also introduces a new `SampleBuffer` type alias.
* The required unpacking of the resources structure is a bit annoying
  but could probably abstraced away.

TODO:

* Test
* Adapt `lockin`
2021-05-24 20:56:11 +02:00
Robert Jördens e58e7f179e clean up item visibility
* There isn't much API that would only be used accross modules within
  stabilizer/dsp but should not be pub beyond stabilizer/dsp.
* Therefore it's easier to let the definition determine visibility and
  the mod.rs/lib.rs determine location in the namesapce.
* Blanket use pub items in mod and lib.
2021-05-17 13:01:45 +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 fa886d2eac Cleaning up conversion + comments 2021-05-10 11:10:26 +02:00
Ryan Summers 60b1b112b1 Renaming AdcSample -> AdcCode 2021-05-07 14:11: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 e07f0a4e2a Formatting 2021-05-06 16:37:36 +02:00
Ryan Summers 03adb72aab Fixing clippy 2021-05-06 16:23:41 +02:00
Ryan Summers 4cbc826f00 Adding documentation 2021-05-06 12:33:07 +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 5767973548 Merge branch 'feature/mqtt-rework' into feature/telemetry 2021-05-04 18:19:38 +02:00
Ryan Summers 5c4ba78dd1 Refactoring MQTT architecture 2021-05-04 13:13:44 +02:00
Ryan Summers b35250efbf Fixing ADC/voltage conversion functions 2021-04-29 17:39:19 +02:00
Robert Jördens 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
Ryan Summers e746e2a12c Adding WIP telemetry 2021-04-29 15:55:36 +02:00
Ryan Summers f49ba30e2d Merge branch 'feature/mqtt-rework' into feature/telemetry 2021-04-29 12:26:46 +02:00
Ryan Summers 01349a39b3 Merge branch 'master' into feature/mqtt-rework 2021-04-29 11:07:00 +02:00
Robert Jördens 61dc6e340e dual-iir: add some mqtt parameter docs 2021-04-28 16:27:59 +02:00
Ryan Summers 36cc423f70 Refactoring MQTT to support telemetry 2021-04-22 15:16:33 +02:00
Ryan Summers afcf058590 Refactoring telemetry to support binaries 2021-04-20 14:12:47 +02:00
Ryan Summers 1c9f30b4d5 Merge branch 'rs/issue-276/unique-identifiers' into feature/telemetry 2021-04-20 13:46:37 +02:00
Ryan Summers 065221e89f Merge branch 'master' into rs/issue-276/unique-identifiers 2021-04-19 15:52:29 +02:00
Ryan Summers 1a08634dcb Renaming interface to avoid confusion 2021-04-19 12:17:41 +02:00
Ryan Summers f32949ed17 Merge branch 'master' into feature/phy-reset 2021-04-19 12:10:37 +02:00
Ryan Summers f442418f16 Merge branch 'master' into feature/telemetry 2021-04-15 15:43:40 +02:00
Ryan Summers 854f45ae15 Updating tick rates 2021-04-15 15:08:57 +02:00
Ryan Summers 330f67d3c8 Adding WIP telemetry implementation for dual-iir 2021-04-15 14:40:47 +02:00
Robert Jördens 8cc06d39c4 dual-iir: use InputPin re-export, rename digital_input 2021-04-15 13:47:10 +02:00
Robert Jördens 2bfed7b669 dual-iir: add enable_hold, force_hold
* Also use Settings as resource directly and copy it bulk (like
  lockin-external)
2021-04-14 16:09:54 +02:00
Robert Jördens 8954c94a20 hardware: add digital input support
* The inputs of the buffer are not pulled up/down. That might make them
  unusable if left floating.
2021-04-14 15:53:52 +02:00
Ryan Summers 033420b934 Adding custom identifier prefix calculations 2021-04-13 15:38:30 +02:00