diff --git a/Cargo.toml b/Cargo.toml index 10ec0a1..0036694 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,6 +9,6 @@ members = [ ] exclude = [ - "satrs-example-stm32f3-disco", + "embedded-examples/stm32f3-disco-rtic", ] diff --git a/embedded-examples/stm32f3-disco-rtic/Cargo.lock b/embedded-examples/stm32f3-disco-rtic/Cargo.lock index fffb020..9622218 100644 --- a/embedded-examples/stm32f3-disco-rtic/Cargo.lock +++ b/embedded-examples/stm32f3-disco-rtic/Cargo.lock @@ -95,6 +95,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" + [[package]] name = "cobs" version = "0.2.3" @@ -273,6 +279,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive-new" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + [[package]] name = "embedded-dma" version = "0.2.0" @@ -722,11 +739,15 @@ dependencies = [ [[package]] name = "satrs" -version = "0.2.0-rc.0" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "866fcae3b683ccc37b5ad77982483a0ee01d5dc408dea5aad2117ad404b60fe1" dependencies = [ - "cobs", + "cobs 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "crc", + "defmt", "delegate", + "derive-new", "num-traits", "num_enum", "paste", @@ -736,10 +757,19 @@ dependencies = [ ] [[package]] -name = "satrs-example-stm32f3-disco" +name = "satrs-shared" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6042477018c2d43fffccaaa5099bc299a58485139b4d31c5b276889311e474f1" +dependencies = [ + "spacepackets", +] + +[[package]] +name = "satrs-stm32f3-disco-rtic" version = "0.1.0" dependencies = [ - "cobs", + "cobs 0.2.3 (git+https://github.com/robamu/cobs.rs.git?branch=all_features)", "cortex-m", "cortex-m-rt", "cortex-m-semihosting", @@ -757,13 +787,6 @@ dependencies = [ "stm32f3xx-hal", ] -[[package]] -name = "satrs-shared" -version = "0.1.3" -dependencies = [ - "spacepackets", -] - [[package]] name = "semver" version = "0.9.0" @@ -799,9 +822,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "spacepackets" -version = "0.11.0-rc.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2cfd5f9a4c7f10714d21f9bc61f2d176cb7ae092cdd687e7ade2d4e6f7d7125" +checksum = "e85574d113a06312010c0ba51aadccd4ba2806231ebe9a49fc6473d0534d8696" dependencies = [ "crc", "defmt", diff --git a/embedded-examples/stm32f3-disco-rtic/Cargo.toml b/embedded-examples/stm32f3-disco-rtic/Cargo.toml index 35553bb..c40ab65 100644 --- a/embedded-examples/stm32f3-disco-rtic/Cargo.toml +++ b/embedded-examples/stm32f3-disco-rtic/Cargo.toml @@ -46,7 +46,8 @@ branch = "complete-dma-update-hal" # path = "../stm32f3-discovery" [dependencies.satrs] -path = "../satrs" +# path = "satrs" +version = "0.2" default-features = false features = ["defmt"] diff --git a/embedded-examples/stm32f3-disco-rtic/src/bin/blinky.rs b/embedded-examples/stm32f3-disco-rtic/src/bin/blinky.rs index 0f96176..ea09455 100644 --- a/embedded-examples/stm32f3-disco-rtic/src/bin/blinky.rs +++ b/embedded-examples/stm32f3-disco-rtic/src/bin/blinky.rs @@ -1,6 +1,6 @@ #![no_std] #![no_main] -use satrs_example_stm32f3_disco as _; +use satrs_stm32f3_disco_rtic as _; use stm32f3_discovery::leds::Leds; use stm32f3_discovery::stm32f3xx_hal::delay::Delay; diff --git a/embedded-examples/stm32f3-disco-rtic/src/main.rs b/embedded-examples/stm32f3-disco-rtic/src/main.rs index 623ef5f..a8a10bc 100644 --- a/embedded-examples/stm32f3-disco-rtic/src/main.rs +++ b/embedded-examples/stm32f3-disco-rtic/src/main.rs @@ -9,7 +9,7 @@ use satrs::spacepackets::ecss::EcssEnumU16; use satrs::spacepackets::CcsdsPacket; use satrs::spacepackets::{ByteConversionError, SpHeader}; // global logger + panicking-behavior + memory layout -use satrs_example_stm32f3_disco as _; +use satrs_stm32f3_disco_rtic as _; use rtic::app;