diff --git a/Cargo.toml b/Cargo.toml index eaa72d3..0124142 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,9 +7,12 @@ version = "0.1.0" license = "MIT OR Apache-2.0" [dependencies] -# web server +# web server - note local copy used as needed to change Cargo.toml to use embassy git sources picoserve = { version = "0.15.0", path = "../picoserve/picoserve/", features = ["embassy"] } + +# library for talking to the SCD40 module libscd = { version = "0.5.0", git = "https://github.com/SvetlinZarev/libscd.git", features = ["async", "sync", "scd4x", "defmt"] } + embassy-embedded-hal = { version = "0.3.0", git = "https://github.com/embassy-rs/embassy.git", features = ["defmt"] } embassy-sync = { version = "0.6.2", git = "https://github.com/embassy-rs/embassy.git", features = ["defmt"] } embassy-executor = { version = "0.7.0", git = "https://github.com/embassy-rs/embassy.git", features = ["task-arena-size-98304", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt"] } diff --git a/README.md b/README.md index 457118a..4ab06b1 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,29 @@ with an I2C SCD40 module. ***This is a work in progress.*** +## Compiling - picoserve mod + +I struggled to get `embassy` + `picoserve` to compile together using crates.io +sources. Despite the version number of `embassy` being the same it seems that +using the git sources fixes the problem (the issue is with +`embassy-time-driver`). But to achieve this I had to also edit the +`picoserve/Cargo.toml` in the `picoserve` project, which I have checked out and +sat alongside this project tree and referenced directly in this project's +`Cargo.toml`. Hopefully in time the issue with the crates.io compatibility will +be resolved. + +```diff +diff --git a/picoserve/Cargo.toml b/picoserve/Cargo.toml +index 5bb0084..c9ad350 100644 +--- a/picoserve/Cargo.toml ++++ b/picoserve/Cargo.toml +@@ -20,2 +20,2 @@ defmt = { version = "0.3.6", optional = true } +-embassy-net = { version = ">=0.6.0", optional = true, features = ["tcp", "proto-ipv4", "medium-ethernet"] } +-embassy-time = { version = ">=0.4.0", optional = true } ++embassy-net = { version = "0.7.0", git = "https://github.com/embassy-rs/embassy.git", optional = true, features = ["tcp", "proto-ipv4", "medium-ethernet"] } ++embassy-time = { version = "0.4.0", git = "https://github.com/embassy-rs/embassy.git", optional = true } +``` + ## License `scd40-rusty-pi` is licensed under either of