From ab856cbf9711d40ea5ba4953de48a548a1eb11fb Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 23 Mar 2024 12:58:58 +0100 Subject: [PATCH] update dependencies --- satrs-example-stm32f3-disco/Cargo.lock | 56 ++++++++++++++++++++++++-- satrs-example-stm32f3-disco/Cargo.toml | 2 +- 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/satrs-example-stm32f3-disco/Cargo.lock b/satrs-example-stm32f3-disco/Cargo.lock index 838f17d..b9f9644 100644 --- a/satrs-example-stm32f3-disco/Cargo.lock +++ b/satrs-example-stm32f3-disco/Cargo.lock @@ -64,6 +64,18 @@ dependencies = [ "vcell", ] +[[package]] +name = "bxcan" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ac3d0c0a542d0ab5521211f873f62706a7136df415676f676d347e5a41dd80" +dependencies = [ + "bitflags", + "embedded-hal", + "nb 1.1.0", + "vcell", +] + [[package]] name = "byteorder" version = "1.5.0" @@ -665,7 +677,7 @@ dependencies = [ "panic-itm", "satrs", "stm32f3-discovery", - "stm32f3xx-hal", + "stm32f3xx-hal 0.11.0-alpha.0", "systick-monotonic", ] @@ -769,6 +781,18 @@ dependencies = [ "vcell", ] +[[package]] +name = "stm32f3" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b28b37228ef3fa47956af38c6abd756e912f244c1657f14e66d42fc8d74ea96f" +dependencies = [ + "bare-metal 1.0.0", + "cortex-m", + "cortex-m-rt", + "vcell", +] + [[package]] name = "stm32f3-discovery" version = "0.8.0-alpha.0" @@ -778,7 +802,7 @@ dependencies = [ "cortex-m", "cortex-m-rt", "lsm303dlhc", - "stm32f3xx-hal", + "stm32f3xx-hal 0.10.0-alpha.0", "switch-hal", ] @@ -788,7 +812,7 @@ version = "0.10.0-alpha.0" source = "git+https://github.com/robamu/stm32f3xx-hal?branch=all_features#c9b3a4fcaaf48f8264475de2b34387597211478e" dependencies = [ "bare-metal 1.0.0", - "bxcan", + "bxcan 0.6.2", "cfg-if", "cortex-m", "cortex-m-rt", @@ -801,7 +825,31 @@ dependencies = [ "rtcc", "slice-group-by", "stm32-usbd", - "stm32f3", + "stm32f3 0.14.0", + "void", +] + +[[package]] +name = "stm32f3xx-hal" +version = "0.11.0-alpha.0" +source = "git+https://github.com/robamu/stm32f3xx-hal?branch=update-test#ffe912dddebb9c50c1871de35b993bb5b8cacccf" +dependencies = [ + "bxcan 0.7.0", + "cfg-if", + "cortex-m", + "cortex-m-rt", + "critical-section", + "embedded-dma", + "embedded-hal", + "embedded-time", + "enumset", + "nb 1.1.0", + "num-traits", + "paste", + "rtcc", + "slice-group-by", + "stm32-usbd", + "stm32f3 0.15.1", "void", ] diff --git a/satrs-example-stm32f3-disco/Cargo.toml b/satrs-example-stm32f3-disco/Cargo.toml index b74efac..63c4c3e 100644 --- a/satrs-example-stm32f3-disco/Cargo.toml +++ b/satrs-example-stm32f3-disco/Cargo.toml @@ -29,7 +29,7 @@ version = "0.1.3-alpha.0" [dependencies.stm32f3xx-hal] git = "https://github.com/robamu/stm32f3xx-hal" -version = "0.10.0-alpha.0" +version = "0.11.0-alpha.0" features = ["stm32f303xc", "rt", "enumset"] branch = "all_features" # Can be used in workspace to develop and update HAL