Skip to content

Commit

Permalink
update to embedded-hal 1.0.0-rc.1 (#145)
Browse files Browse the repository at this point in the history
* update embedded hal
with temporary patches

* update to e-h 1.0.0

* cleanup CS pin handling now we have SpiDevice

* update apt action

* bump radio version
  • Loading branch information
ryankurte authored Apr 18, 2024
1 parent 61fa993 commit 8a1f526
Show file tree
Hide file tree
Showing 10 changed files with 349 additions and 406 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ jobs:
if: ${{ matrix.os == 'ubuntu-latest' && matrix.target == 'x86_64-unknown-linux-gnu' }}
run: sudo apt install -y libusb-1.0-0 libusb-1.0-0-dev

- name: Install libusb (armv7)
if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }}
uses: ryankurte/action-apt@v0.3.0
- name: Install libusb and gcc (apt armv7)
if: ${{ matrix.os == 'ubuntu-latest' && matrix.target == 'armv7-unknown-linux-gnueabihf' }}
uses: ryankurte/action-apt@v0.4.1
with:
arch: armhf
packages: libusb-1.0-0-dev:armhf
packages: libusb-1.0-0:armhf libusb-1.0-0-dev:armhf gcc-arm-linux-gnueabihf

- name: Install cross toolchain (armv7)
if: ${{ matrix.target == 'armv7-unknown-linux-gnueabihf' }}
Expand Down
157 changes: 105 additions & 52 deletions Cargo.lock

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

49 changes: 15 additions & 34 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,59 +26,40 @@ std = [ "radio/std", "driver-pal/mock", "failure/std", "hex", "thiserror" ]
poll-irq = []
patch-unknown-state = []
tests = [ "driver-pal/mock" ]
util = [ "std", "structopt", "tracing", "tracing-subscriber", "humantime", "crc16", "driver-pal", "driver-pal/hal", "radio/helpers" ]
util = [ "std", "clap", "tracing", "tracing-subscriber", "humantime", "crc16", "driver-pal", "driver-pal/hal", "radio/helpers" ]

default = [ "std", "util", "serde", "driver-pal/hal-cp2130", "driver-pal/hal-linux", "patch-unknown-state" ]

[dependencies]
radio = { version = "0.11.0", default_features = false }
embedded-hal = "1.0.0-alpha.7"
defmt = {version = "0.3.0", optional = true }
radio = { version = "0.12.1", default_features = false }
embedded-hal = "1.0.0"
embedded-hal-bus = "0.1.0"
driver-pal = { version = "0.9.0", default_features = false, optional=true }

driver-pal = { version = "0.8.0-alpha.6", default_features = false, optional=true }

bitflags = "1.0.4"
defmt = {version = "0.3.5", optional = true }
bitflags = "2.4.0"
libc = "0.2.123"
log = { version = "0.4.17", default_features = false }
strum = { version = "0.24.0", default_features = false, features = [ "derive" ] }

strum = { version = "0.26.2", default_features = false, features = [ "derive" ] }
crc16 = { version = "0.4.0", optional = true }
hex = { version = "0.4.2", optional = true }

humantime = { version = "2.0.1", optional = true }
structopt = { version = "0.3.26", optional = true }
clap = { version = "4.4.7", optional = true, features = [ "derive", "env" ] }
thiserror = { version = "1.0.30", optional = true }
failure = { version = "0.1.7", features = [ "derive" ], default-features = false }
serde = { version = "1.0.144", optional = true , features = ["derive"]}

[dependencies.failure]
version = "0.1.7"
features = [ "derive" ]
default-features = false

[dependencies.serde]
features = ["derive"]
optional = true
version = "1.0.144"

[dependencies.tracing]
optional = true
version = "0.1.34"

[dependencies.tracing-subscriber]
optional = true
version = "0.2.16"
tracing = { version = "0.1.34", optional = true }
tracing-subscriber = { version = "0.3.18", optional = true, features = [ "env-filter" ] }


[dev-dependencies]
color-backtrace = "0.5.0"
toml = "0.5.8"
color-backtrace = "0.6.1"
toml = "0.8.12"
serde = { version = "1.0.144", features = [ "derive" ] }
serde_derive = "1.0.0"

[[bin]]
name = "sx128x-util"
path = "src/util/main.rs"
required-features = ["util"]


[patch.crates-io]
#radio = { git = "https://github.com/rust-iot/radio-hal" }
Loading

0 comments on commit 8a1f526

Please sign in to comment.