Commit Graph

212 Commits

Author SHA1 Message Date
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
401e1b0681 remove rtt feature 2021-05-13 11:14:03 +02:00
5b616a2874 use rtt logging 2021-05-13 10:55:43 +02:00
31332d220e remove unused dependencies 2021-05-12 12:59:58 +02:00
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
bd491cf584
Merge branch 'master' into rj/itcm 2021-05-10 12:09:01 +02:00
eeee5af296 Updating dependencies 2021-05-06 16:32:57 +02:00
8144b3acf2 Updating constructors 2021-05-05 16:16:54 +02:00
06b328ff52 Adding WIP updates for telemetry 2021-05-05 14:42:17 +02:00
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
23bdd816a7 dependencies: align with master 2021-04-29 16:45:30 +02:00
9e66054d21 bump cortex-m-rt to 0.6.13+git 2021-04-29 16:45:30 +02:00
fa1f501f0b Updating dependencies 2021-04-29 12:58:04 +02:00
aad026161f Refactoring to support DHCP 2021-04-29 11:28:35 +02:00
01349a39b3 Merge branch 'master' into feature/mqtt-rework 2021-04-29 11:07:00 +02:00
0922cc42af Adding new miniconf implementation 2021-04-28 21:03:38 +02:00
f38e3b9608 Simplifying MQTT handling 2021-04-22 15:57:24 +02:00
36cc423f70 Refactoring MQTT to support telemetry 2021-04-22 15:16:33 +02:00
770a468177 prepare v0.5.0 release
* update changelog
* bump version
2021-04-21 14:45:12 +02:00
b2285d1ba2 Updating dependency revision 2021-04-19 15:55:02 +02:00
1b4d31dbd9 Updating NAL to support TCP port randomization 2021-04-08 15:28:11 +02:00
c24eb17d1e Using main branch commit 2021-04-08 14:02:56 +02:00
164fd5969d Updating smoltcp-nal 2021-04-08 13:56:57 +02:00
d0c1bef55f Updating dependencies 2021-04-08 13:37:24 +02:00
885cc1fb27 Merge branch 'master' into feature/phy-reset 2021-04-08 13:35:59 +02:00
46902b39b4 dependencies: update, move hashes to Cargo.toml
cargo update -p doesn't work well if the hashes are only on .lock
2021-04-07 16:44:39 +02:00
1ca8aa98b0 hal 0.9.0 2021-04-07 16:35:57 +02:00
14bae09935 load process into itcm
needs newer fixed cortex-m-rt 0.6.13+unreleased
relevant? https://reviews.llvm.org/D81986
2021-03-29 17:34:17 +02:00
769945d7a2 Adding patch comment 2021-03-25 09:26:36 +01:00
4b9954761e Updating smoltcp dependency 2021-03-25 09:24:58 +01:00
9459152f6f Updating dependencies 2021-03-24 13:40:17 +01:00
a717630c53 Adding prototype PHY reset detection 2021-03-17 20:16:39 +01:00
dependabot[bot]
1b328a3d28
build(deps): bump heapless from 0.5.6 to 0.6.1
Bumps [heapless](https://github.com/japaric/heapless) from 0.5.6 to 0.6.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.5.6...v0.6.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-17 15:28:50 +00:00
0577a99bbe Updating dependencies 2021-03-17 15:55:30 +01:00
8c616cebec Adding unstaged changes 2021-03-15 12:30:18 +01:00
3c574467a2 Updating dependencies 2021-03-15 12:29:03 +01:00
4a9c2fe23a Updating after DHCP PR review 2021-03-15 11:41:13 +01:00
e5505925a9 Merge branch 'master' into feature/dhcp-support 2021-03-15 11:38:28 +01:00
c2cb9a440c Adding initial DHCP support prototype 2021-03-04 17:26:10 +01:00
e1247ec970
Merge branch 'master' into panic-led 2021-03-04 15:17:15 +01:00
dependabot[bot]
d47c44de9a
build(deps): bump cortex-m-rtic from 0.5.5 to 0.5.6
Bumps [cortex-m-rtic](https://github.com/rtic-rs/cortex-m-rtic) from 0.5.5 to 0.5.6.
- [Release notes](https://github.com/rtic-rs/cortex-m-rtic/releases)
- [Changelog](https://github.com/rtic-rs/cortex-m-rtic/blob/v0.5.6/CHANGELOG.md)
- [Commits](https://github.com/rtic-rs/cortex-m-rtic/compare/v0.5.5...v0.5.6)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-04 04:07:51 +00:00
843173f29d panic: always turn on red leds, and halt 2021-03-03 16:36:10 +01:00
6f1532c2a3 Updating dependencies 2021-03-02 17:11:19 +01:00
40c04c67c5 Updating dependencies 2021-03-02 17:00:11 +01:00
c2b00db9e9 Updating minimq/miniconf dependencies 2021-03-02 16:43:19 +01:00
c553e72df4 Updating miniconf dependencies 2021-03-01 14:46:12 +01:00
6c6c2e64a7 lockin: make order generic 2021-02-23 16:58:13 +01:00
2ac7568d5b Updating dependencies 2021-02-19 10:36:39 +01:00
04250360c1 deps: make miniconf a patch 2021-02-17 18:40:03 +01:00
b66f80f784 Fixing dependencies 2021-02-17 16:30:39 +01:00
9e1f4a864c Merge branch 'master' into feature/mqtt-convert 2021-02-17 11:44:10 +01:00
efbf750b20 Merge remote-tracking branch 'origin/master' into rj/misc
* origin/master:
  Upgrade to serde-json-core v0.2.0
2021-02-15 08:55:40 +01:00
cfc4cb382d dependencies: hal ref is on master now [nfc] 2021-02-15 08:53:55 +01:00
David Nadlinger
4130292706 Upgrade to serde-json-core v0.2.0
This also fixes the network interface for writing IIR coefficients.
2021-02-13 00:07:15 +00:00
91f16c2961 Adding working example 2021-02-03 19:55:58 +01:00
738516eedb Adding broken example 2021-02-03 15:13:37 +01:00
9e1a6ec4d5 Updating dependencies 2021-02-03 14:06:09 +01:00
913990d531 Merge remote-tracking branch 'origin/rj/bump-hal-smoltcp' into feature/mqtt-convert 2021-02-03 14:02:20 +01:00
5fc4720593 Merge remote-tracking branch 'origin/dependabot/cargo/smoltcp-0.7.0' into rj/bump-hal-smoltcp
* origin/dependabot/cargo/smoltcp-0.7.0:
  build(deps): bump smoltcp from 0.6.0 to 0.7.0
2021-02-03 13:04:16 +01:00
dependabot[bot]
b8fcf416cb
build(deps): bump cortex-m-log from 0.6.2 to 0.7.0
Bumps [cortex-m-log](https://github.com/DoumanAsh/cortex-m-log) from 0.6.2 to 0.7.0.
- [Release notes](https://github.com/DoumanAsh/cortex-m-log/releases)
- [Commits](https://github.com/DoumanAsh/cortex-m-log/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-31 18:00:41 +00:00
411a847a88 Updating smoltcp-nal 2021-01-30 18:48:27 +01:00
b73286c188 Removing MQTT interface 2021-01-30 15:00:58 +01:00
702ccc231d Using custom branch of miniconf 2021-01-27 18:15:35 +01:00
a772ccc38a Adding WIP updates for StringSet 2021-01-26 19:14:23 +01:00
f0e7c153ba Adding WIP refactor for MQTT + settings 2021-01-26 14:28:06 +01:00
dependabot[bot]
7134df9749
build(deps): bump smoltcp from 0.6.0 to 0.7.0
Bumps [smoltcp](https://github.com/smoltcp-rs/smoltcp) from 0.6.0 to 0.7.0.
- [Release notes](https://github.com/smoltcp-rs/smoltcp/releases)
- [Changelog](https://github.com/smoltcp-rs/smoltcp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/smoltcp-rs/smoltcp/compare/v0.6.0...v0.7.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-20 04:01:23 +00:00
29a89637f8 Merge branch 'master' into feature/pounder-timestamping 2021-01-06 14:45:56 +01:00
da34756df7 Adding support for pounder v1.1 2021-01-06 13:29:19 +01:00
3332a8e927 Updating branch dependencies 2021-01-06 12:59:24 +01:00
a85738a651 dsp: add host benchmark 2020-12-11 15:19:13 +01:00
72d14adfbf Adding support for pounder ETR timestamping 2020-12-09 18:19:33 +01:00
fc81c8b5d8 Updating API 2020-12-07 17:29:36 +01:00
bc1ee21fcd cargo: update, remove old badge, cleanup 2020-12-06 21:01:43 +01:00
468929690d iir: vminnm/vmaxnm 2020-11-26 14:26:44 +01:00
2b443f9334 Merge branch 'master' into feature/dma-updates 2020-11-24 16:49:11 +01:00
11e6688a14 Refactoring timer channels to macros, adding safety notes 2020-11-23 14:30:29 +01:00
Matt Huszagh
d24dfb302e dsp crate: drop version dependency and remove boilerplate from cargo 2020-11-22 10:32:40 -08:00
Matt Huszagh
3eb43c6b99 move iir to new dsp crate 2020-11-22 07:59:12 -08:00
91809cf255 Adding DMA support for DAC writes 2020-11-13 10:47:44 +01:00
aa36446f95 Adding updated docs for adc file 2020-11-11 11:57:14 +01:00
db3bb511b4 Merge branch 'master' into feature/dma-updates 2020-11-10 16:55:25 +01:00
2e9fdd9d4d Updating stm32h7xx-hal 2020-11-05 08:06:42 +01:00
20e9b6543c Adding WIP updates to using DMA 2020-11-03 09:36:03 +01:00
c058d4bcde Adding updates for 0.8.0 of the HAL 2020-10-28 15:41:27 +01:00
17c8e4d2e1 Updating to new HAL 2020-10-26 16:58:29 +01:00
dac6f73d5e WIP updates 2020-10-19 17:12:02 +02:00
4a95b6e2b0 Cargo.toml: fix stm32h7xx-hal override
Doing it via dependencies.stm32h7xx-hal causes cargo vendor to fail with:

error: failed to sync

Caused by:
  found duplicate version of package `stm32h7xx-hal v0.5.0` vendored from two sources:

        source 1: registry `https://github.com/rust-lang/crates.io-index`
        source 2: https://github.com/quartiq/stm32h7xx-hal.git?branch=feature/pounder-support#ff00e938
2020-09-11 18:34:15 +08:00
dependabot[bot]
989aefc2b6
build(deps): bump cortex-m-rtic from 0.5.4 to 0.5.5
Bumps [cortex-m-rtic](https://github.com/rtic-rs/cortex-m-rtic) from 0.5.4 to 0.5.5.
- [Release notes](https://github.com/rtic-rs/cortex-m-rtic/releases)
- [Changelog](https://github.com/rtic-rs/cortex-m-rtic/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rtic-rs/cortex-m-rtic/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-08-28 04:15:56 +00:00
dependabot[bot]
30b3cf6861
build(deps): bump cortex-m-rtic from 0.5.3 to 0.5.4
Bumps [cortex-m-rtic](https://github.com/rtic-rs/cortex-m-rtic) from 0.5.3 to 0.5.4.
- [Release notes](https://github.com/rtic-rs/cortex-m-rtic/releases)
- [Changelog](https://github.com/rtic-rs/cortex-m-rtic/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rtic-rs/cortex-m-rtic/compare/v0.5.3...v0.5.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-08-27 04:15:36 +00:00
bors[bot]
1d3d313c29
Merge #119
119: build(deps): bump embedded-hal from 0.2.3 to 0.2.4 r=jordens a=dependabot[bot]

[//]: # (dependabot-start)
⚠️  **Dependabot is rebasing this PR** ⚠️ 

If you make any changes to it yourself then they will take precedence over the rebase.

---

[//]: # (dependabot-end)

Bumps [embedded-hal](https://github.com/japaric/embedded-hal) from 0.2.3 to 0.2.4.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/rust-embedded/embedded-hal/blob/master/CHANGELOG.md">embedded-hal's changelog</a>.</em></p>
<blockquote>
<h1>Change Log</h1>
<p>All notable changes to this project will be documented in this file.</p>
<p>The format is based on <a href="http://keepachangelog.com/">Keep a Changelog</a>
and this project adheres to <a href="http://semver.org/">Semantic Versioning</a>.</p>
<h2>[Unreleased]</h2>
<h2>[v1.0.0-alpha.1] - 2020-06-16</h2>
<p>*** This is an alpha release with breaking changes (sorry) ***</p>
<h3>Added</h3>
<ul>
<li>A nonblocking trait for interfacing with random number generation hardware.</li>
</ul>
<h3>Changed</h3>
<ul>
<li>All traits have been marked as proven (<code>unproven</code> feature has been removed).</li>
<li>All trait methods have been made fallible.</li>
<li>All trait methods have been renamed <code>try_*</code> (i.e. <code>try_send</code>) for consistency.</li>
<li>The <code>Capture</code>, <code>Pwm</code>, <code>PwmPin</code> and <code>Qei</code> traits have been moved into their own
<code>capture</code>, <code>pwm</code> and <code>qei</code> modules for consistency.</li>
<li>Void has been replaced with <code>core::convert::Infallible</code> which should be used
in trait implementations where methods cannot fail.</li>
<li>A new <a href="https://github.com/rust-embedded/embedded-hal#how-to-add-a-new-trait">process</a>
has been adopted for the addition of traits to the embedded-hal.</li>
<li>The minimum supported Rust version is 1.35 due to <a href="https://github-redirect.dependabot.com/rust-lang/rust/issues/54973">this issue</a>.</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a href="https://github.com/japaric/embedded-hal/commits">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=embedded-hal&package-manager=cargo&previous-version=0.2.3&new-version=0.2.4)](https://help.github.com/articles/configuring-automated-security-fixes)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)


</details>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-08 09:32:40 +00:00
dependabot[bot]
66564d5bc3
build(deps): bump embedded-hal from 0.2.3 to 0.2.4
Bumps [embedded-hal](https://github.com/japaric/embedded-hal) from 0.2.3 to 0.2.4.
- [Release notes](https://github.com/japaric/embedded-hal/releases)
- [Changelog](https://github.com/rust-embedded/embedded-hal/blob/master/CHANGELOG.md)
- [Commits](https://github.com/japaric/embedded-hal/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-08-08 08:10:34 +00:00
dependabot[bot]
bc77a09d86
build(deps): bump asm-delay from 0.7.2 to 0.9.0
Bumps [asm-delay](https://github.com/copterust/asm-delay) from 0.7.2 to 0.9.0.
- [Release notes](https://github.com/copterust/asm-delay/releases)
- [Commits](https://github.com/copterust/asm-delay/compare/v0.7.2...v0.9.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-08-08 08:10:34 +00:00
dependabot[bot]
7b4cf863b2
build(deps): bump nb from 0.1.2 to 1.0.0
Bumps [nb](https://github.com/rust-embedded/nb) from 0.1.2 to 1.0.0.
- [Release notes](https://github.com/rust-embedded/nb/releases)
- [Changelog](https://github.com/rust-embedded/nb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-embedded/nb/compare/v0.1.2...v1.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-08 04:02:45 +00:00
5d41fa0aa9 v0.4.1 2020-06-23 15:19:24 +02:00
f70612f1be rtfm: migrate to rtic 2020-06-17 12:20:45 +02:00
dependabot-preview[bot]
c74e7a92e2
build(deps): bump asm-delay from 0.7.1 to 0.7.2
Bumps [asm-delay](https://github.com/copterust/asm-delay) from 0.7.1 to 0.7.2.
- [Release notes](https://github.com/copterust/asm-delay/releases)
- [Commits](https://github.com/copterust/asm-delay/compare/asm-delay-0.7.1...v0.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-17 04:22:36 +00:00
09298bd534 structure: move stabilizer back to top, drop submodules 2020-06-16 16:56:30 +02:00
b7100f2b14 Correcting issues at high optimization levels 2020-06-11 19:00:37 +02:00
519fa86058 Adding work after functional DDS interface 2020-06-10 12:40:44 +02:00
80661a51fb Reimporting pounder-specific code 2020-06-08 18:20:10 +02:00