Skip to content
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.

Sign up for GitHub

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

- Update dependcies for embedded-hal-bus to 0.3.0 #222

Closed
wants to merge 1 commit into from
Closed

- Update dependcies for embedded-hal-bus to 0.3.0 #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,14 @@
[`ssd1306`](https://crates.io/crates/ssd1306) is a no-std driver written in Rust for the popular
SSD1306 monochrome OLED display.

<!-- next-header -->
## [Unreleased] - ReleaseDate
- Update dependcies for `embedded-hal-bus` to 0.3.0
- Switch iterator in `write_str` in mode/terminal.rs from last() to next_back (see https://rust-lang.github.io/rust-clippy/master/index.html#double_ended_iterator_last)
- parenthese for expression in in mode/terminal.rs (see https://rust-lang.github.io/rust-clippy/master/index.html#precedence) in mode/terminal.rs
- If feature `async`is enabled, the embedded_hal_async::i2c::I2 is used instead of embedded_hal::i2c::I2c so I2c can shared
- Update examples



## [Unreleased] - ReleaseDate
- Update dependencies for `embassy-executor` to 0.7.0
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ embassy-stm32 = { version = "0.2.0", features = [
] }
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.3.0", features = ["async"] }

[features]
default = ["graphics"]
Expand Down
25 changes: 23 additions & 2 deletions examples/bmp_i2c.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ use cortex_m::asm::nop;
use cortex_m_rt::entry;
use defmt_rtt as _;
use embassy_stm32::time::Hertz;
#[cfg(feature = "async")]
use embassy_stm32::{bind_interrupts, i2c, peripherals};
use embedded_graphics::{image::Image, pixelcolor::Rgb565, prelude::*};
use panic_probe as _;
use ssd1306::{prelude::*, I2CDisplayInterface, Ssd1306};
Expand All @@ -33,16 +35,35 @@ use tinybmp::Bmp;

#[entry]
fn main() -> ! {
let p = embassy_stm32::init(Default::default());
let i2c = embassy_stm32::i2c::I2c::new_blocking(
let p: embassy_stm32::Peripherals = embassy_stm32::init(Default::default());
#[cfg(feature = "async")]
bind_interrupts!(struct Irqs {
I2C1_EV => i2c::EventInterruptHandler<peripherals::I2C1>;
I2C1_ER => i2c::ErrorInterruptHandler<peripherals::I2C1>;
});

#[cfg(feature = "async")]
let i2c = embassy_stm32::i2c::I2c::new(
p.I2C1,
p.PB6,
p.PB7,
Irqs,
p.DMA1_CH6,
p.DMA1_CH7,
Hertz::khz(400),
Default::default(),
);

#[cfg(not(feature = "async"))]
let i2c = embassy_stm32::i2c::I2c::new_blocking(
p.I2C1,
p.PB6,
p.PB7,
Hertz::khz(400),
Default::default(),
);
let interface = I2CDisplayInterface::new(i2c);

let mut display = Ssd1306::new(interface, DisplaySize128x64, DisplayRotation::Rotate0)
.into_buffered_graphics_mode();
display.init().unwrap();
Expand Down
21 changes: 21 additions & 0 deletions examples/graphics_i2c.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ use cortex_m::asm::nop;
use cortex_m_rt::entry;
use defmt_rtt as _;
use embassy_stm32::time::Hertz;
#[cfg(feature = "async")]
use embassy_stm32::{bind_interrupts, i2c, peripherals};
use embedded_graphics::{
pixelcolor::BinaryColor,
prelude::*,
Expand All @@ -32,6 +34,25 @@ use ssd1306::{prelude::*, I2CDisplayInterface, Ssd1306};
#[entry]
fn main() -> ! {
let p = embassy_stm32::init(Default::default());
#[cfg(feature = "async")]
bind_interrupts!(struct Irqs {
I2C1_EV => i2c::EventInterruptHandler<peripherals::I2C1>;
I2C1_ER => i2c::ErrorInterruptHandler<peripherals::I2C1>;
});

#[cfg(feature = "async")]
let i2c = embassy_stm32::i2c::I2c::new(
p.I2C1,
p.PB6,
p.PB7,
Irqs,
p.DMA1_CH6,
p.DMA1_CH7,
Hertz::khz(400),
Default::default(),
);

#[cfg(not(feature = "async"))]
let i2c = embassy_stm32::i2c::I2c::new_blocking(
p.I2C1,
p.PB6,
Expand Down
21 changes: 21 additions & 0 deletions examples/graphics_i2c_128x32.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ use cortex_m::asm::nop;
use cortex_m_rt::entry;
use defmt_rtt as _;
use embassy_stm32::time::Hertz;
#[cfg(feature = "async")]
use embassy_stm32::{bind_interrupts, i2c, peripherals};
use embedded_graphics::{
pixelcolor::BinaryColor,
prelude::*,
Expand All @@ -32,6 +34,25 @@ use ssd1306::{prelude::*, I2CDisplayInterface, Ssd1306};
#[entry]
fn main() -> ! {
let p = embassy_stm32::init(Default::default());
#[cfg(feature = "async")]
bind_interrupts!(struct Irqs {
I2C1_EV => i2c::EventInterruptHandler<peripherals::I2C1>;
I2C1_ER => i2c::ErrorInterruptHandler<peripherals::I2C1>;
});

#[cfg(feature = "async")]
let i2c = embassy_stm32::i2c::I2c::new(
p.I2C1,
p.PB6,
p.PB7,
Irqs,
p.DMA1_CH6,
p.DMA1_CH7,
Hertz::khz(400),
Default::default(),
);

#[cfg(not(feature = "async"))]
let i2c = embassy_stm32::i2c::I2c::new_blocking(
p.I2C1,
p.PB6,
Expand Down
21 changes: 21 additions & 0 deletions examples/graphics_i2c_72x40.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ use cortex_m::asm::nop;
use cortex_m_rt::entry;
use defmt_rtt as _;
use embassy_stm32::time::Hertz;
#[cfg(feature = "async")]
use embassy_stm32::{bind_interrupts, i2c, peripherals};
use embedded_graphics::{
pixelcolor::BinaryColor,
prelude::*,
Expand All @@ -32,6 +34,25 @@ use ssd1306::{prelude::*, I2CDisplayInterface, Ssd1306};
#[entry]
fn main() -> ! {
let p = embassy_stm32::init(Default::default());
#[cfg(feature = "async")]
bind_interrupts!(struct Irqs {
I2C1_EV => i2c::EventInterruptHandler<peripherals::I2C1>;
I2C1_ER => i2c::ErrorInterruptHandler<peripherals::I2C1>;
});

#[cfg(feature = "async")]
let i2c = embassy_stm32::i2c::I2c::new(
p.I2C1,
p.PB6,
p.PB7,
Irqs,
p.DMA1_CH6,
p.DMA1_CH7,
Hertz::khz(400),
Default::default(),
);

#[cfg(not(feature = "async"))]
let i2c = embassy_stm32::i2c::I2c::new_blocking(
p.I2C1,
p.PB6,
Expand Down
22 changes: 22 additions & 0 deletions examples/image_i2c.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
use cortex_m::asm::nop;
use cortex_m_rt::entry;
use defmt_rtt as _;
#[cfg(feature = "async")]
use embassy_stm32::{bind_interrupts, i2c, peripherals};

use embassy_stm32::time::Hertz;
use embedded_graphics::{
image::{Image, ImageRaw},
Expand All @@ -38,6 +41,25 @@ use ssd1306::{prelude::*, I2CDisplayInterface, Ssd1306};
#[entry]
fn main() -> ! {
let p = embassy_stm32::init(Default::default());
#[cfg(feature = "async")]
bind_interrupts!(struct Irqs {
I2C1_EV => i2c::EventInterruptHandler<peripherals::I2C1>;
I2C1_ER => i2c::ErrorInterruptHandler<peripherals::I2C1>;
});

#[cfg(feature = "async")]
let i2c = embassy_stm32::i2c::I2c::new(
p.I2C1,
p.PB6,
p.PB7,
Irqs,
p.DMA1_CH6,
p.DMA1_CH7,
Hertz::khz(400),
Default::default(),
);

#[cfg(not(feature = "async"))]
let i2c = embassy_stm32::i2c::I2c::new_blocking(
p.I2C1,
p.PB6,
Expand Down
22 changes: 22 additions & 0 deletions examples/noise_i2c.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@

use cortex_m_rt::entry;
use defmt_rtt as _;
#[cfg(feature = "async")]
use embassy_stm32::{bind_interrupts, i2c, peripherals};

use embassy_stm32::time::Hertz;
use panic_probe as _;
use rand::prelude::*;
Expand All @@ -29,6 +32,25 @@ use ssd1306::{prelude::*, I2CDisplayInterface, Ssd1306};
#[entry]
fn main() -> ! {
let p = embassy_stm32::init(Default::default());
#[cfg(feature = "async")]
bind_interrupts!(struct Irqs {
I2C1_EV => i2c::EventInterruptHandler<peripherals::I2C1>;
I2C1_ER => i2c::ErrorInterruptHandler<peripherals::I2C1>;
});

#[cfg(feature = "async")]
let i2c = embassy_stm32::i2c::I2c::new(
p.I2C1,
p.PB6,
p.PB7,
Irqs,
p.DMA1_CH6,
p.DMA1_CH7,
Hertz::khz(400),
Default::default(),
);

#[cfg(not(feature = "async"))]
let i2c = embassy_stm32::i2c::I2c::new_blocking(
p.I2C1,
p.PB6,
Expand Down
21 changes: 21 additions & 0 deletions examples/rotation_i2c.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ use cortex_m::asm::nop;
use cortex_m_rt::entry;
use defmt_rtt as _;
use embassy_stm32::time::Hertz;
#[cfg(feature = "async")]
use embassy_stm32::{bind_interrupts, i2c, peripherals};
use embedded_graphics::{
image::{Image, ImageRaw},
pixelcolor::BinaryColor,
Expand All @@ -38,6 +40,25 @@ use ssd1306::{prelude::*, I2CDisplayInterface, Ssd1306};
#[entry]
fn main() -> ! {
let p = embassy_stm32::init(Default::default());
#[cfg(feature = "async")]
bind_interrupts!(struct Irqs {
I2C1_EV => i2c::EventInterruptHandler<peripherals::I2C1>;
I2C1_ER => i2c::ErrorInterruptHandler<peripherals::I2C1>;
});

#[cfg(feature = "async")]
let i2c = embassy_stm32::i2c::I2c::new(
p.I2C1,
p.PB6,
p.PB7,
Irqs,
p.DMA1_CH6,
p.DMA1_CH7,
Hertz::khz(400),
Default::default(),
);

#[cfg(not(feature = "async"))]
let i2c = embassy_stm32::i2c::I2c::new_blocking(
p.I2C1,
p.PB6,
Expand Down
21 changes: 21 additions & 0 deletions examples/terminal_i2c.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,33 @@ use core::fmt::Write;
use cortex_m_rt::entry;
use defmt_rtt as _;
use embassy_stm32::time::Hertz;
#[cfg(feature = "async")]
use embassy_stm32::{bind_interrupts, i2c, peripherals};
use panic_probe as _;
use ssd1306::{prelude::*, I2CDisplayInterface, Ssd1306};

#[entry]
fn main() -> ! {
let p = embassy_stm32::init(Default::default());
#[cfg(feature = "async")]
bind_interrupts!(struct Irqs {
I2C1_EV => i2c::EventInterruptHandler<peripherals::I2C1>;
I2C1_ER => i2c::ErrorInterruptHandler<peripherals::I2C1>;
});

#[cfg(feature = "async")]
let i2c = embassy_stm32::i2c::I2c::new(
p.I2C1,
p.PB6,
p.PB7,
Irqs,
p.DMA1_CH6,
p.DMA1_CH7,
Hertz::khz(400),
Default::default(),
);

#[cfg(not(feature = "async"))]
let i2c = embassy_stm32::i2c::I2c::new_blocking(
p.I2C1,
p.PB6,
Expand Down
21 changes: 21 additions & 0 deletions examples/text_i2c.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ use cortex_m::asm::nop;
use cortex_m_rt::entry;
use defmt_rtt as _;
use embassy_stm32::time::Hertz;
#[cfg(feature = "async")]
use embassy_stm32::{bind_interrupts, i2c, peripherals};
use embedded_graphics::{
mono_font::{ascii::FONT_6X10, MonoTextStyleBuilder},
pixelcolor::BinaryColor,
Expand All @@ -34,6 +36,25 @@ use ssd1306::{prelude::*, I2CDisplayInterface, Ssd1306};
#[entry]
fn main() -> ! {
let p = embassy_stm32::init(Default::default());
#[cfg(feature = "async")]
bind_interrupts!(struct Irqs {
I2C1_EV => i2c::EventInterruptHandler<peripherals::I2C1>;
I2C1_ER => i2c::ErrorInterruptHandler<peripherals::I2C1>;
});

#[cfg(feature = "async")]
let i2c = embassy_stm32::i2c::I2c::new(
p.I2C1,
p.PB6,
p.PB7,
Irqs,
p.DMA1_CH6,
p.DMA1_CH7,
Hertz::khz(400),
Default::default(),
);

#[cfg(not(feature = "async"))]
let i2c = embassy_stm32::i2c::I2c::new_blocking(
p.I2C1,
p.PB6,
Expand Down
Loading
Loading