Skip to content

Commit

Permalink
Merge pull request #44 from ahmedcharles/workspace
Browse files Browse the repository at this point in the history
Use workspace depdencies.
  • Loading branch information
jannic authored Oct 13, 2023
2 parents e364891 + 69e2935 commit 49d3079
Show file tree
Hide file tree
Showing 24 changed files with 277 additions and 244 deletions.
33 changes: 33 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,36 @@ members = [
"boards/waveshare-rp2040-zero",
"boards/waveshare-rp2040-lcd-0-96",
]

[workspace.dependencies]
arrayvec = { version = "0.7.4", default-features = false }
cortex-m = "0.7.7"
cortex-m-rt = "0.7.3"
cortex-m-rtic = "1.1.4"
critical-section = "1.1.2"
defmt = "0.3.5"
defmt-rtt = "0.4.0"
display-interface = "0.4.1"
display-interface-spi = "0.4.1"
embedded-graphics = "0.7.1"
embedded-hal ="0.2.7"
embedded-sdmmc = "0.5.0"
fugit = "0.3.7"
hd44780-driver = "0.4.0"
heapless = "0.7.16"
i2c-pio = "0.7.0"
nb = "1.1"
panic-halt= "0.2.0"
panic-probe = "0.3.1"
pio = "0.2.1"
pio-proc = "0.2.2"
rp2040-boot2 = "0.3.0"
rp2040-hal = "0.9.0"
st7789 = "0.6.1"
st7735-lcd = "0.8.1"
smart-leds = "0.3.0"
ssd1306 = "0.7.1"
usb-device = "0.2.9"
usbd-hid = "0.5.2"
usbd-serial = "0.1.1"
ws2812-pio = "0.7.0"
20 changes: 10 additions & 10 deletions boards/adafruit-feather-rp2040/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ repository = "https://github.com/rp-rs/rp-hal-boards.git"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cortex-m-rt = { version = "0.7", optional = true }
rp2040-boot2 = { version = "0.3.0", optional = true }
rp2040-hal = { version = "0.9.0" }
cortex-m-rt = { workspace = true, optional = true }
rp2040-boot2 = { workspace = true, optional = true }
rp2040-hal.workspace = true

[dev-dependencies]
cortex-m = "0.7.7"
panic-halt= "0.2.0"
embedded-hal ="0.2.7"
fugit = "0.3.7"
nb = "1.1.0"
smart-leds = "0.3.0"
ws2812-pio = "0.7.0"
cortex-m.workspace = true
panic-halt.workspace = true
embedded-hal.workspace = true
fugit.workspace = true
nb.workspace = true
smart-leds.workspace = true
ws2812-pio.workspace = true

[features]
# This is the set of features we enable by default
Expand Down
20 changes: 10 additions & 10 deletions boards/adafruit-itsy-bitsy-rp2040/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ repository = "https://github.com/rp-rs/rp-hal-boards.git"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cortex-m-rt = { version = "0.7", optional = true }
rp2040-boot2 = { version = "0.3.0", optional = true }
rp2040-hal = { version = "0.9.0" }
cortex-m-rt = { workspace = true, optional = true }
rp2040-boot2 = { workspace = true, optional = true }
rp2040-hal.workspace = true

[dev-dependencies]
cortex-m = "0.7.7"
panic-halt= "0.2.0"
embedded-hal ="0.2.7"
smart-leds = "0.3"
nb = "1.1.0"
ws2812-pio = "0.7.0"
fugit = "0.3.7"
cortex-m.workspace = true
panic-halt.workspace = true
embedded-hal.workspace = true
smart-leds.workspace = true
nb.workspace = true
ws2812-pio.workspace = true
fugit.workspace = true

[features]
# This is the set of features we enable by default
Expand Down
22 changes: 11 additions & 11 deletions boards/adafruit-kb2040/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ version = "0.7.0"
authors = ["Andrew Christiansen <andrewtaylorchristiansen@gmail.com>", "The rp-rs Developers"]
edition = "2018"
homepage = "https://github.com/rp-rs/rp-hal-boards/tree/main/boards/adafruit-kb2040"
description = "Board Support Package for the Adafruit adafruit-kb2040"
description = "Board Support Package for the Adafruit KB2040"
license = "MIT OR Apache-2.0"
repository = "https://github.com/rp-rs/rp-hal-boards.git"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cortex-m-rt = { version = "0.7.3", optional = true }
embedded-hal = { version = "0.2.7", features = ["unproven"] }
rp2040-boot2 = { version = "0.3.0", optional = true }
rp2040-hal = { version = "0.9.0" }
cortex-m-rt = { workspace = true, optional = true }
embedded-hal = { workspace = true, features = ["unproven"] }
rp2040-boot2 = { workspace = true, optional = true }
rp2040-hal.workspace = true

[dev-dependencies]
panic-halt = "0.2.0"
rp2040-boot2 = "0.3"
smart-leds = "0.3.0"
fugit = "0.3.7"
nb = "1.1.0"
ws2812-pio = "0.7.0"
panic-halt.workspace = true
rp2040-boot2.workspace = true
smart-leds.workspace = true
fugit.workspace = true
nb.workspace = true
ws2812-pio.workspace = true

[features]
# This is the set of features we enable by default
Expand Down
12 changes: 6 additions & 6 deletions boards/adafruit-macropad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ repository = "https://github.com/rp-rs/rp-hal-boards.git"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cortex-m-rt = { version = "0.7", optional = true }
rp2040-boot2 = { version = "0.3.0", optional = true }
rp2040-hal = { version = "0.9.0" }
cortex-m-rt = { workspace = true, optional = true }
rp2040-boot2 = { workspace = true, optional = true }
rp2040-hal.workspace = true

[dev-dependencies]
cortex-m = "0.7.7"
embedded-hal ="0.2.7"
panic-halt= "0.2.0"
cortex-m.workspace = true
embedded-hal.workspace = true
panic-halt.workspace = true

[features]
# This is the set of features we enable by default
Expand Down
18 changes: 9 additions & 9 deletions boards/adafruit-qt-py-rp2040/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ repository = "https://github.com/rp-rs/rp-hal-boards.git"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cortex-m-rt = { version = "0.7", optional = true }
rp2040-boot2 = { version = "0.3.0", optional = true }
rp2040-hal = { version = "0.9.0" }
cortex-m-rt = { workspace = true, optional = true }
rp2040-boot2 = { workspace = true, optional = true }
rp2040-hal.workspace = true

[dev-dependencies]
panic-halt= "0.2.0"
embedded-hal ="0.2.7"
smart-leds = "0.3"
nb = "1.1.0"
ws2812-pio = "0.7.0"
fugit = "0.3.7"
panic-halt.workspace = true
embedded-hal.workspace = true
smart-leds.workspace = true
nb.workspace = true
ws2812-pio.workspace = true
fugit.workspace = true

[features]
# This is the set of features we enable by default
Expand Down
18 changes: 9 additions & 9 deletions boards/adafruit-trinkey-qt2040/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ repository = "https://github.com/rp-rs/rp-hal-boards.git"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cortex-m-rt = { version = "0.7.3", optional = true }
rp2040-boot2 = { version = "0.3.0", optional = true }
rp2040-hal = { version = "0.9.0" }
cortex-m-rt = { workspace = true, optional = true }
rp2040-boot2 = { workspace = true, optional = true }
rp2040-hal.workspace = true

[dev-dependencies]
panic-halt= "0.2.0"
embedded-hal ="0.2.7"
smart-leds = "0.3"
nb = "1.1.0"
ws2812-pio = "0.7.0"
fugit = "0.3.7"
panic-halt.workspace = true
embedded-hal.workspace = true
smart-leds.workspace = true
nb.workspace = true
ws2812-pio.workspace = true
fugit.workspace = true

[features]
# This is the set of features we enable by default
Expand Down
18 changes: 9 additions & 9 deletions boards/arduino_nano_connect/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ repository = "https://github.com/rp-rs/rp-hal-boards.git"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cortex-m-rt = { version = "0.7.3", optional = true }
embedded-hal = { version = "0.2.7", features = ["unproven"] }
rp2040-boot2 = { version = "0.3.0", optional = true }
rp2040-hal = { version = "0.9.0" }
cortex-m-rt = { workspace = true, optional = true }
embedded-hal = { workspace = true, features = ["unproven"] }
rp2040-boot2 = { workspace = true, optional = true }
rp2040-hal.workspace = true

[dev-dependencies]
cortex-m = "0.7.7"
panic-halt= "0.2.0"
embedded-hal ="0.2.7"
nb = "1.1"
fugit = "0.3.7"
cortex-m.workspace = true
panic-halt.workspace = true
embedded-hal.workspace = true
nb.workspace = true
fugit.workspace = true

[features]
# This is the set of features we enable by default
Expand Down
26 changes: 13 additions & 13 deletions boards/boardsource-blok/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ repository = "https://github.com/rp-rs/rp-hal-boards.git"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cortex-m = "0.7.7"
rp2040-boot2 = { version = "0.3.0", optional = true}
rp2040-hal = { version = "0.9.0"}
cortex-m-rt = { version = "0.7.3", optional = true}
fugit = "0.3.5"
cortex-m.workspace = true
rp2040-boot2 = { workspace = true, optional = true}
rp2040-hal.workspace = true
cortex-m-rt = { workspace = true, optional = true}
fugit.workspace = true

[dev-dependencies]
panic-halt = "0.2.0"
embedded-hal = "0.2.7"
nb = "1.0"
smart-leds = "0.3.0"
ws2812-pio = "0.7.0"
usb-device = "0.2.9"
usbd-hid = "0.5.2"
critical-section = "1.1.1"
panic-halt.workspace = true
embedded-hal.workspace = true
nb.workspace = true
smart-leds.workspace = true
ws2812-pio.workspace = true
usb-device.workspace = true
usbd-hid.workspace = true
critical-section.workspace = true

[features]
# This is the set of features we enable by default
Expand Down
26 changes: 13 additions & 13 deletions boards/pimoroni-pico-explorer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ repository = "https://github.com/rp-rs/rp-hal-boards.git"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cortex-m-rt = { version = "0.7", optional = true }
display-interface-spi = "0.4.1"
embedded-graphics = "0.7.1"
embedded-hal = { version = "0.2.7", features = ["unproven"] }
fugit = "0.3.7"
rp2040-boot2 = { version = "0.3.0", optional = true }
rp2040-hal = { version = "0.9.0" }
st7789 = "0.6.1"
cortex-m-rt = { workspace = true, optional = true }
display-interface-spi.workspace = true
embedded-graphics.workspace = true
embedded-hal = { workspace = true, features = ["unproven"] }
fugit.workspace = true
rp2040-boot2 = { workspace = true, optional = true }
rp2040-hal.workspace = true
st7789.workspace = true

[dev-dependencies]
arrayvec = { version = "0.7.4", default-features = false }
cortex-m = "0.7.7"
display-interface = "0.4.1"
nb = "1.1.0"
panic-halt = "0.2.0"
arrayvec.workspace = true
cortex-m.workspace = true
display-interface.workspace = true
nb.workspace = true
panic-halt.workspace = true

[features]
# This is the set of features we enable by default
Expand Down
14 changes: 7 additions & 7 deletions boards/pimoroni-pico-lipo-16mb/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ repository = "https://github.com/rp-rs/rp-hal-boards.git"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cortex-m-rt = { version = "0.7", optional = true }
rp2040-boot2 = { version = "0.3.0", optional = true }
rp2040-hal = { version = "0.9.0" }
cortex-m-rt = { workspace = true, optional = true }
rp2040-boot2 = { workspace = true, optional = true }
rp2040-hal.workspace = true

[dev-dependencies]
cortex-m = "0.7.7"
panic-halt= "0.2.0"
embedded-hal ="0.2.7"
nb = "1.1"
cortex-m.workspace = true
panic-halt.workspace = true
embedded-hal.workspace = true
nb.workspace = true

[features]
# This is the set of features we enable by default
Expand Down
26 changes: 13 additions & 13 deletions boards/pimoroni-plasma-2040/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ repository = "https://github.com/rp-rs/rp-hal-boards.git"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cortex-m-rt = { version = "0.7", optional = true }
rp2040-boot2 = { version = "0.3.0", optional = true }
rp2040-hal = { version = "0.9.0" }
cortex-m-rt = { workspace = true, optional = true }
rp2040-boot2 = { workspace = true, optional = true }
rp2040-hal.workspace = true

[dev-dependencies]
cortex-m = "0.7.7"
embedded-hal ="0.2.7"
fugit = "0.3.7"
panic-halt= "0.2.0"
rp2040-hal = { version = "0.9.0", features = [ "defmt" ] }
smart-leds = "0.3.0"
ws2812-pio = "0.7.0"

defmt = "0.3.5"
defmt-rtt = "0.4.0"
cortex-m.workspace = true
embedded-hal.workspace = true
fugit.workspace = true
panic-halt.workspace = true
rp2040-hal = { workspace = true, features = [ "defmt" ] }
smart-leds.workspace = true
ws2812-pio.workspace = true

defmt.workspace = true
defmt-rtt.workspace = true

[features]
# This is the set of features we enable by default
Expand Down
24 changes: 12 additions & 12 deletions boards/pimoroni-servo2040/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ repository = "https://github.com/rp-rs/rp-hal-boards.git"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cortex-m-rt = { version = "0.7", optional = true }
rp2040-boot2 = { version = "0.3.0", optional = true }
rp2040-hal = { version = "0.9.0" }
cortex-m-rt = { workspace = true, optional = true }
rp2040-boot2 = { workspace = true, optional = true }
rp2040-hal.workspace = true

[dev-dependencies]
defmt = "0.3.5"
defmt-rtt = "0.4.0"
embedded-hal ="0.2.7"
fugit = "0.3.7"
nb = "1.1.0"
panic-halt= "0.2.0"
rp2040-hal = { version = "0.9.0", features = [ "defmt" ] }
smart-leds = "0.3.0"
ws2812-pio = "0.7.0"
defmt.workspace = true
defmt-rtt.workspace = true
embedded-hal.workspace = true
fugit.workspace = true
nb.workspace = true
panic-halt.workspace = true
rp2040-hal = { workspace = true, features = [ "defmt" ] }
smart-leds.workspace = true
ws2812-pio.workspace = true

[features]
# This is the set of features we enable by default
Expand Down
Loading

0 comments on commit 49d3079

Please sign in to comment.