Skip to content

Commit

Permalink
Merge branch 'master' into rj/itcm
Browse files Browse the repository at this point in the history
* master: (22 commits)
  build(deps): bump ndarray from 0.14.0 to 0.15.1
  deps: bulk update
  dependencies: update, move hashes to Cargo.toml
  hal 0.9.0
  Update hitl/README.md
  Reverting HITL runner changes
  Updating HITL script to directly call python binaries
  Removing source in favor of dot
  Replacing sh with bash
  Updating runner operational flags
  Apply suggestions from code review
  Removing broker specification
  Updating HITL to run against PRs to master
  Adding requirements file
  Updating hitl runner to use correct broker
  Updating executability
  README: add both plain-CI and HITL badges
  Fixing python venv setup
  Adding initial HITL layout
  update cargosha256
  ...
  • Loading branch information
jordens committed Apr 7, 2021
2 parents fc73744 + c1f256e commit b143215
Show file tree
Hide file tree
Showing 10 changed files with 127 additions and 74 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/hitl.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: HITL

on:
push:
branches: [ hitl ]
workflow_dispatch:
pull_request:
branches: [ master ]

jobs:
hitl:
Expand Down
106 changes: 55 additions & 51 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 10 additions & 15 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,16 @@ enum-iterator = "0.6.0"
paste = "1"
dsp = { path = "dsp" }
ad9959 = { path = "ad9959" }
smoltcp-nal = "0.1.0"
miniconf = "0.1"
generic-array = "0.14"
miniconf = "0.1.0"

[dependencies.mcp23017]
git = "https://github.com/mrd0ll4r/mcp23017.git"
rev = "61933f857a"

[dependencies.stm32h7xx-hal]
features = ["stm32h743v", "rt", "unproven", "ethernet", "quadspi"]
git = "https://github.com/stm32-rs/stm32h7xx-hal"
branch = "master"
version = "0.9.0"

[build-dependencies]
cc = "1.0"
Expand All @@ -66,23 +65,19 @@ path = "../cortex-m-rt"

[patch.crates-io.miniconf]
git = "https://github.com/quartiq/miniconf.git"
branch = "develop"
rev = "314fa5587d"

[dependencies.smoltcp-nal]
git = "https://github.com/quartiq/smoltcp-nal.git"
rev = "56519012d7"

[patch.crates-io.minimq]
git = "https://github.com/quartiq/minimq.git"

[patch.crates-io.smoltcp-nal]
git = "https://github.com/quartiq/smoltcp-nal.git"
branch = "main"
rev = "933687c2e4b"

[patch.crates-io.serde-json-core]
git = "https://github.com/rust-embedded-community/serde-json-core.git"
branch = "master"

[patch.crates-io.smoltcp]
# We manually patch smoltcp so that we can get access to unreleased updates to the DHCP server. When
# a new release of smoltcp is made, we can remove this patch.
git = "https://github.com/smoltcp-rs/smoltcp.git"
rev = "ee06ac91bc"

[features]
semihosting = ["panic-semihosting", "cortex-m-log/semihosting"]
Expand Down
Loading

0 comments on commit b143215

Please sign in to comment.