Upse top level workspace in sub-crates

Signed-off-by: Arthur Heymans <[email protected]>
9elements · Feb 11, 2025 · 4a8ff80 · 4a8ff80
1 parent 39d7b7e
commit 4a8ff80
Show file tree

Hide file tree

Showing 8 changed files with 130 additions and 111 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,18 +1,11 @@
 [workspace]
 members = [
-    ".",
+    "picoprog",
     "serprog"
 ]
 resolver = "2"
 
-[package]
-name = "picoprog"
-version = "0.1.0"
-edition = "2021"
-license = "Apache-2.0"
-authors = ["Marvin Drees <[email protected]>"]
-
-[dependencies]
+[workspace.dependencies]
 assign-resources = "0.4.1"
 cortex-m = { version = "0.7.7", features = ["inline-asm", "critical-section"] }
 cortex-m-rt = "0.7.5"

diff --git a/picoprog/Cargo.toml b/picoprog/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "picoprog"
+version = "0.1.0"
+edition = "2021"
+license = "Apache-2.0"
+authors = ["Marvin Drees <[email protected]>"]
+
+[dependencies]
+assign-resources = "0.4.1"
+cortex-m = { workspace = true, features = ["inline-asm", "critical-section"] }
+cortex-m-rt = { workspace = true }
+embassy-executor = { workspace = true, features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "nightly"] }
+embassy-futures = "0.1.1"
+embedded-hal = { workspace = true }
+embedded-hal-async = { workspace = true }
+serprog = { path = "../serprog" }
+embassy-rp = { workspace = true, features = ["unstable-pac", "time-driver", "critical-section-impl", "rom-func-cache", "rom-v2-intrinsics", "rp2040"] }
+embassy-sync = { workspace = true }
+embassy-time = { workspace = true }
+embassy-usb = { workspace = true, features = ["max-handler-count-6", "max-interface-count-6"] }
+embassy-usb-logger = { workspace = true }
+futures = { version = "0.3.30", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] }
+heapless = { workspace = true, features = ["portable-atomic-critical-section", "ufmt"] }
+log = { workspace = true }
+portable-atomic = { workspace = true, features = ["critical-section"] }
+static_cell = { workspace = true }
+ufmt = "0.2.0"
+zerocopy = { workspace = true, features = ["derive"] }
+tock-registers = { workspace = true }
+num_enum = { workspace = true, default-features = false }
diff --git a/build.rs → picoprog/build.rs b/build.rs → picoprog/build.rs
diff --git a/memory.x → picoprog/memory.x b/memory.x → picoprog/memory.x
diff --git a/src/main.rs → picoprog/src/main.rs b/src/main.rs → picoprog/src/main.rs
diff --git a/src/uart.rs → picoprog/src/uart.rs b/src/uart.rs → picoprog/src/uart.rs
diff --git a/serprog/Cargo.toml b/serprog/Cargo.toml
@@ -5,13 +5,10 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
-embassy-usb = { version = "0.4.0", features = ["max-handler-count-6", "max-interface-count-6"] }
-embedded-hal = "1.0.0"
-embedded-hal-async = "1.0.0"
-log = "0.4.22"
-num_enum = { version = "0.7.3", default-features = false }
-tock-registers = "0.9.0"
-zerocopy = { version = "0.8", features = ["derive"] }
-
-[patch.crates-io]
-embassy-usb = { git = "https://github.com/embassy-rs/embassy", rev = "556cc57c1fdc9eba0703ccc2281d39462d2d2c38" }
+embassy-usb.workspace = true
+embedded-hal.workspace = true
+embedded-hal-async.workspace = true
+log.workspace = true
+num_enum.workspace = true
+tock-registers.workspace = true
+zerocopy.workspace = true