Commit Graph

232 Commits

Author SHA1 Message Date
Ryan Summers b8c0abcea2 Updating HAL SPI usage to master version 2021-06-14 18:47:37 +02:00
Robert Jördens a3c2d8a6d4 deps: bump indirect dependencies 2021-06-04 22:32:32 +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 c5a2704c41 dma: implement overflow checking 2021-06-01 13:11:16 +02:00
Robert Jördens 63716111df Merge branch 'master' into rj/fast-dbm
* master:
  pounder: clippy
  pounder: add comment on channel enum
  ad9959: refactor pad()
  pounder: enum for gpio ext pins
  pounder: fix attenuator indices (latch and shiftreg)
  pounder io extender: hack around some bug
  rf_power: fix measurement
  attenuators: use robust latching sequence
  deps: use mcp23017 release
  pounder: simplify attenuator spi interface
2021-06-01 12:52:58 +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 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 d493867c76 Merge remote-tracking branch 'origin/dependabot/cargo/serde-json-core-0.4.0' into rj/const-gen
* origin/dependabot/cargo/serde-json-core-0.4.0:
  Bump serde-json-core from 0.3.0 to 0.4.0
2021-05-28 18:24:58 +02:00
Robert Jördens a9f5943296 deps: use mcp23017 release 2021-05-28 16:42:42 +02:00
dependabot[bot] 440e542eae
Bump serde-json-core from 0.3.0 to 0.4.0
Bumps [serde-json-core](https://github.com/rust-embedded-community/serde-json-core) from 0.3.0 to 0.4.0.
- [Release notes](https://github.com/rust-embedded-community/serde-json-core/releases)
- [Changelog](https://github.com/rust-embedded-community/serde-json-core/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-embedded-community/serde-json-core/compare/v0.3.0...v0.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-28 14:40:51 +00:00
dependabot[bot] e9e98678c1
build(deps): bump heapless from 0.6.1 to 0.7.1
Bumps [heapless](https://github.com/japaric/heapless) from 0.6.1 to 0.7.1.
- [Release notes](https://github.com/japaric/heapless/releases)
- [Changelog](https://github.com/japaric/heapless/blob/master/CHANGELOG.md)
- [Commits](https://github.com/japaric/heapless/compare/v0.6.1...v0.7.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-28 14:40:46 +00:00
bors[bot] 9587088de2
Merge #322
322: rj/itcm r=jordens a=jordens

* close #315
* would profit from cortex-m-rtic 0.6 elevating the attributes to the actual ISR thus removing the veneer

Co-authored-by: Robert Jördens <rj@quartiq.de>
2021-05-28 14:34:28 +00:00
Robert Jördens 441c81d135
Merge branch 'master' into rj/itcm 2021-05-27 18:22:22 +02:00
dependabot[bot] 14c6847469
build(deps): bump ndarray from 0.15.1 to 0.15.2
Bumps [ndarray](https://github.com/rust-ndarray/ndarray) from 0.15.1 to 0.15.2.
- [Release notes](https://github.com/rust-ndarray/ndarray/releases)
- [Changelog](https://github.com/rust-ndarray/ndarray/blob/master/RELEASES.md)
- [Commits](https://github.com/rust-ndarray/ndarray/compare/0.15.1...0.15.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-27 15:53:15 +00:00
Ryan Summers fc2801ecbb Updating dependencies 2021-05-27 17:15:31 +02:00
Ryan Summers f10bce709f Updating the embedded-nal 2021-05-27 13:42:52 +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 b3c7a450f5 deps: adjust mcp23017 git after merging 2021-05-17 09:29:43 +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
dependabot[bot] 012c4fe375
build(deps): bump embedded-hal from 0.2.4 to 0.2.5
Bumps [embedded-hal](https://github.com/rust-embedded/embedded-hal) from 0.2.4 to 0.2.5.
- [Release notes](https://github.com/rust-embedded/embedded-hal/releases)
- [Changelog](https://github.com/rust-embedded/embedded-hal/blob/v0.2.5/CHANGELOG.md)
- [Commits](https://github.com/rust-embedded/embedded-hal/compare/v0.2.4...v0.2.5)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-13 17:15:34 +00:00
dependabot[bot] d8469cac92
Bump rtt-target from 0.2.2 to 0.3.1
Bumps [rtt-target](https://github.com/mvirkkunen/rtt-target) from 0.2.2 to 0.3.1.
- [Release notes](https://github.com/mvirkkunen/rtt-target/releases)
- [Commits](https://github.com/mvirkkunen/rtt-target/compare/v0.2.2...v0.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-13 16:53:07 +00:00
dependabot[bot] 0e2eaa3d1d
Bump serde from 1.0.125 to 1.0.126
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.125 to 1.0.126.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.125...v1.0.126)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-13 16:35:43 +00: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 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 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
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 eeee5af296 Updating dependencies 2021-05-06 16:32:57 +02:00
Ryan Summers 8144b3acf2 Updating constructors 2021-05-05 16:16:54 +02:00
Ryan Summers 06b328ff52 Adding WIP updates for telemetry 2021-05-05 14:42:17 +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
Robert Jördens 9e66054d21 bump cortex-m-rt to 0.6.13+git 2021-04-29 16:45:30 +02:00
Ryan Summers eeb15efdff Adding lockfile 2021-04-29 13:20:26 +02:00
Ryan Summers aad026161f Refactoring to support DHCP 2021-04-29 11:28:35 +02:00
Ryan Summers 01349a39b3 Merge branch 'master' into feature/mqtt-rework 2021-04-29 11:07:00 +02:00
Ryan Summers 0922cc42af Adding new miniconf implementation 2021-04-28 21:03:38 +02:00
Ryan Summers f38e3b9608 Simplifying MQTT handling 2021-04-22 15:57:24 +02:00
Ryan Summers 36cc423f70 Refactoring MQTT to support telemetry 2021-04-22 15:16:33 +02:00
Robert Jördens d9129ed028 update lock 2021-04-21 16:38:10 +02:00
Ryan Summers b2285d1ba2 Updating dependency revision 2021-04-19 15:55:02 +02:00
Ryan Summers d333a25301 Updating dependency 2021-04-15 12:24:49 +02:00