Skip to content

- Update dependencies for embassy-executor to 0.7.0 #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.79
- uses: dtolnay/rust-toolchain@1.84
with:
components: rustfmt
- run: cargo fmt --all -- --check
Expand All @@ -24,7 +24,7 @@ jobs:
runs-on: "ubuntu-latest"
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.79
- uses: dtolnay/rust-toolchain@1.84
- run: cargo test --lib --target x86_64-unknown-linux-gnu
- run: cargo test --doc --target x86_64-unknown-linux-gnu

Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.79
- uses: dtolnay/rust-toolchain@1.84
with:
components: rustfmt
- run: rustup target add ${{matrix.target}}
Expand Down
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,16 @@ SSD1306 monochrome OLED display.

<!-- next-header -->

## [Unreleased] - ReleaseDate
## [Unreleased] - 2025-01-12
- Update dependencies for `embassy-executor` to 0.7.0
- Remove `embassy-executor` feature "integrated-timer". See https://github.com/embassy-rs/embassy/blob/main/embassy-executor/CHANGELOG.md
- Switch `embassy-executor` from git to crates.io
- Update dependencies for `embassy-stm32` to 0.2.0
- Switch `embassy-stm32` from git to crates.io
- Update dependencies for `embassy-time` to 0.4.0
- Switch `embassy-time` from git to crates.io
- Update dependencies for `tinybmp` to 0.5.0
- Update root-toolchain to 1.84 for github workflow in ci.yml

## [0.9.0] - 2024-08-30

Expand Down
39 changes: 25 additions & 14 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ readme = "README.md"
repository = "https://github.com/rust-embedded-community/ssd1306"
version = "0.9.0"
edition = "2021"
exclude = [ "build.rs", "build.sh", "memory.x", "doc", "*.jpg", "*.png", "*.bmp" ]
exclude = ["build.rs", "build.sh", "memory.x", "doc", "*.jpg", "*.png", "*.bmp"]
rust-version = "1.75.0"

[package.metadata.docs.rs]
targets = [ "thumbv7m-none-eabi", "thumbv7em-none-eabihf" ]
targets = ["thumbv7m-none-eabi", "thumbv7em-none-eabihf"]
all-features = true

[dependencies]
Expand All @@ -23,7 +23,7 @@ display-interface = "0.5.0"
display-interface-i2c = "0.5.0"
display-interface-spi = "0.5.0"
embedded-graphics-core = { version = "0.4.0", optional = true }
embedded-hal-async = { version = "1.0.0", optional = true }
embedded-hal-async = { version = "1.0.0", optional = true }
maybe-async-cfg = "=0.2.4"

[dev-dependencies]
Expand All @@ -37,31 +37,42 @@ defmt = "0.3.6"
defmt-rtt = "0.4.0"
panic-probe = { version = "0.3.1", features = ["print-defmt"] }
# Used to load BMP images in various examples
tinybmp = "0.5.0"
tinybmp = "0.6.0"
# Used by the noise_i2c examples
rand = { version = "0.8.4", default-features = false, features = [ "small_rng" ] }
embassy-embedded-hal = { version = "0.2.0", default-features=false }
embassy-executor = { version = "0.6.0", git = "https://github.com/embassy-rs/embassy", features = ["arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] }
embassy-stm32 = { version = "0.1.0", git = "https://github.com/embassy-rs/embassy", features = [ "stm32f103c8", "memory-x", "defmt", "exti", "time-driver-tim3" , "unstable-pac"] }
embassy-time = { version = "0.3.1", git = "https://github.com/embassy-rs/embassy" }
rand = { version = "0.8.4", default-features = false, features = ["small_rng"] }
embassy-embedded-hal = { version = "0.3.0", default-features = false }
embassy-executor = { version = "0.7.0", features = [
"arch-cortex-m",
"executor-thread",
"defmt",
] }
embassy-stm32 = { version = "0.2.0", features = [
"stm32f103c8",
"memory-x",
"defmt",
"exti",
"time-driver-tim3",
"unstable-pac",
] }
embassy-time = { version = "0.4.0" }
embassy-futures = "0.1.1"
embedded-hal-bus = { version = "0.2.0", features = ["async"]}
embedded-hal-bus = { version = "0.2.0", features = ["async"] }

[features]
default = ["graphics"]
graphics = ["embedded-graphics-core"]
async = [ "dep:embedded-hal-async" ]
async = ["dep:embedded-hal-async"]

[[example]]
name = "async_i2c_spi"
required-features = [ "async" ]
required-features = ["async"]

[[example]]
name = "async_terminal_i2c"
required-features = [ "async" ]
required-features = ["async"]

[profile.dev]
opt-level="s"
opt-level = "s"
codegen-units = 1
incremental = false

Expand Down
Loading