diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/stm32f4/src/bin/i2c_async.rs | 10 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/i2c_comparison.rs | 30 | ||||
| -rw-r--r-- | examples/stm32g0/src/bin/i2c_async.rs | 10 | ||||
| -rw-r--r-- | examples/stm32g4/src/bin/i2c_slave.rs | 4 | ||||
| -rw-r--r-- | examples/stm32h7/src/bin/camera.rs | 10 | ||||
| -rw-r--r-- | examples/stm32h7/src/bin/i2c.rs | 10 | ||||
| -rw-r--r-- | examples/stm32h7/src/bin/i2c_shared.rs | 10 | ||||
| -rw-r--r-- | examples/stm32l4/src/bin/i2c_dma.rs | 10 |
8 files changed, 11 insertions, 83 deletions
diff --git a/examples/stm32f4/src/bin/i2c_async.rs b/examples/stm32f4/src/bin/i2c_async.rs index e065910d8..0065e92f3 100644 --- a/examples/stm32f4/src/bin/i2c_async.rs +++ b/examples/stm32f4/src/bin/i2c_async.rs | |||
| @@ -22,15 +22,7 @@ async fn main(_spawner: Spawner) { | |||
| 22 | info!("Hello world!"); | 22 | info!("Hello world!"); |
| 23 | let p = embassy_stm32::init(Default::default()); | 23 | let p = embassy_stm32::init(Default::default()); |
| 24 | 24 | ||
| 25 | let mut i2c = I2c::new( | 25 | let mut i2c = I2c::new(p.I2C1, p.PB8, p.PB7, Irqs, p.DMA1_CH6, p.DMA1_CH0, Default::default()); |
| 26 | p.I2C1, | ||
| 27 | p.PB8, | ||
| 28 | p.PB7, | ||
| 29 | Irqs, | ||
| 30 | p.DMA1_CH6, | ||
| 31 | p.DMA1_CH0, | ||
| 32 | Default::default(), | ||
| 33 | ); | ||
| 34 | 26 | ||
| 35 | loop { | 27 | loop { |
| 36 | let a1454_read_sensor_command = [0x1F]; | 28 | let a1454_read_sensor_command = [0x1F]; |
diff --git a/examples/stm32f4/src/bin/i2c_comparison.rs b/examples/stm32f4/src/bin/i2c_comparison.rs index 3713601b1..59bdb8b67 100644 --- a/examples/stm32f4/src/bin/i2c_comparison.rs +++ b/examples/stm32f4/src/bin/i2c_comparison.rs | |||
| @@ -47,35 +47,11 @@ async fn main(_spawner: Spawner) { | |||
| 47 | info!("Setting up peripherals."); | 47 | info!("Setting up peripherals."); |
| 48 | let p = embassy_stm32::init(Default::default()); | 48 | let p = embassy_stm32::init(Default::default()); |
| 49 | 49 | ||
| 50 | let mut i2c1 = I2c::new( | 50 | let mut i2c1 = I2c::new(p.I2C1, p.PB8, p.PB7, Irqs, p.DMA1_CH6, p.DMA1_CH0, Default::default()); |
| 51 | p.I2C1, | ||
| 52 | p.PB8, | ||
| 53 | p.PB7, | ||
| 54 | Irqs, | ||
| 55 | p.DMA1_CH6, | ||
| 56 | p.DMA1_CH0, | ||
| 57 | Default::default(), | ||
| 58 | ); | ||
| 59 | 51 | ||
| 60 | let mut i2c2 = I2c::new( | 52 | let mut i2c2 = I2c::new(p.I2C2, p.PB10, p.PB11, Irqs, p.DMA1_CH7, p.DMA1_CH3, Default::default()); |
| 61 | p.I2C2, | ||
| 62 | p.PB10, | ||
| 63 | p.PB11, | ||
| 64 | Irqs, | ||
| 65 | p.DMA1_CH7, | ||
| 66 | p.DMA1_CH3, | ||
| 67 | Default::default(), | ||
| 68 | ); | ||
| 69 | 53 | ||
| 70 | let mut i2c3 = I2c::new( | 54 | let mut i2c3 = I2c::new(p.I2C3, p.PA8, p.PC9, Irqs, p.DMA1_CH4, p.DMA1_CH2, Default::default()); |
| 71 | p.I2C3, | ||
| 72 | p.PA8, | ||
| 73 | p.PC9, | ||
| 74 | Irqs, | ||
| 75 | p.DMA1_CH4, | ||
| 76 | p.DMA1_CH2, | ||
| 77 | Default::default(), | ||
| 78 | ); | ||
| 79 | 55 | ||
| 80 | let a1454_read_sensor_command = [0x1F]; | 56 | let a1454_read_sensor_command = [0x1F]; |
| 81 | let mut i2c1_buffer: [u8; 4] = [0, 0, 0, 0]; | 57 | let mut i2c1_buffer: [u8; 4] = [0, 0, 0, 0]; |
diff --git a/examples/stm32g0/src/bin/i2c_async.rs b/examples/stm32g0/src/bin/i2c_async.rs index 19c52c21d..e62d9266b 100644 --- a/examples/stm32g0/src/bin/i2c_async.rs +++ b/examples/stm32g0/src/bin/i2c_async.rs | |||
| @@ -22,15 +22,7 @@ async fn main(_spawner: Spawner) { | |||
| 22 | let p = embassy_stm32::init(Default::default()); | 22 | let p = embassy_stm32::init(Default::default()); |
| 23 | 23 | ||
| 24 | let mut data = [0u8; 2]; | 24 | let mut data = [0u8; 2]; |
| 25 | let mut i2c = I2c::new( | 25 | let mut i2c = I2c::new(p.I2C1, p.PB8, p.PB9, Irqs, p.DMA1_CH1, p.DMA1_CH2, Default::default()); |
| 26 | p.I2C1, | ||
| 27 | p.PB8, | ||
| 28 | p.PB9, | ||
| 29 | Irqs, | ||
| 30 | p.DMA1_CH1, | ||
| 31 | p.DMA1_CH2, | ||
| 32 | Default::default(), | ||
| 33 | ); | ||
| 34 | 26 | ||
| 35 | loop { | 27 | loop { |
| 36 | match i2c.write_read(TMP117_ADDR, &[TMP117_TEMP_RESULT], &mut data).await { | 28 | match i2c.write_read(TMP117_ADDR, &[TMP117_TEMP_RESULT], &mut data).await { |
diff --git a/examples/stm32g4/src/bin/i2c_slave.rs b/examples/stm32g4/src/bin/i2c_slave.rs index adf1f74fa..9eac612b6 100644 --- a/examples/stm32g4/src/bin/i2c_slave.rs +++ b/examples/stm32g4/src/bin/i2c_slave.rs | |||
| @@ -135,8 +135,8 @@ async fn main(spawner: Spawner) { | |||
| 135 | }; | 135 | }; |
| 136 | let d_sda = p.PA8; | 136 | let d_sda = p.PA8; |
| 137 | let d_scl = p.PA9; | 137 | let d_scl = p.PA9; |
| 138 | let device = i2c::I2c::new(p.I2C2, d_scl, d_sda, Irqs, p.DMA1_CH1, p.DMA1_CH2, config) | 138 | let device = |
| 139 | .into_slave_multimaster(d_addr_config); | 139 | i2c::I2c::new(p.I2C2, d_scl, d_sda, Irqs, p.DMA1_CH1, p.DMA1_CH2, config).into_slave_multimaster(d_addr_config); |
| 140 | 140 | ||
| 141 | unwrap!(spawner.spawn(device_task(device))); | 141 | unwrap!(spawner.spawn(device_task(device))); |
| 142 | 142 | ||
diff --git a/examples/stm32h7/src/bin/camera.rs b/examples/stm32h7/src/bin/camera.rs index 799291f76..8f2e265d6 100644 --- a/examples/stm32h7/src/bin/camera.rs +++ b/examples/stm32h7/src/bin/camera.rs | |||
| @@ -51,15 +51,7 @@ async fn main(_spawner: Spawner) { | |||
| 51 | let mco = Mco::new(p.MCO1, p.PA8, Mco1Source::HSI, McoPrescaler::DIV3); | 51 | let mco = Mco::new(p.MCO1, p.PA8, Mco1Source::HSI, McoPrescaler::DIV3); |
| 52 | 52 | ||
| 53 | let mut led = Output::new(p.PE3, Level::High, Speed::Low); | 53 | let mut led = Output::new(p.PE3, Level::High, Speed::Low); |
| 54 | let cam_i2c = I2c::new( | 54 | let cam_i2c = I2c::new(p.I2C1, p.PB8, p.PB9, Irqs, p.DMA1_CH1, p.DMA1_CH2, Default::default()); |
| 55 | p.I2C1, | ||
| 56 | p.PB8, | ||
| 57 | p.PB9, | ||
| 58 | Irqs, | ||
| 59 | p.DMA1_CH1, | ||
| 60 | p.DMA1_CH2, | ||
| 61 | Default::default(), | ||
| 62 | ); | ||
| 63 | 55 | ||
| 64 | let mut camera = Ov7725::new(cam_i2c, mco); | 56 | let mut camera = Ov7725::new(cam_i2c, mco); |
| 65 | 57 | ||
diff --git a/examples/stm32h7/src/bin/i2c.rs b/examples/stm32h7/src/bin/i2c.rs index 90c1c8d80..c40af4935 100644 --- a/examples/stm32h7/src/bin/i2c.rs +++ b/examples/stm32h7/src/bin/i2c.rs | |||
| @@ -20,15 +20,7 @@ async fn main(_spawner: Spawner) { | |||
| 20 | info!("Hello world!"); | 20 | info!("Hello world!"); |
| 21 | let p = embassy_stm32::init(Default::default()); | 21 | let p = embassy_stm32::init(Default::default()); |
| 22 | 22 | ||
| 23 | let mut i2c = I2c::new( | 23 | let mut i2c = I2c::new(p.I2C2, p.PB10, p.PB11, Irqs, p.DMA1_CH4, p.DMA1_CH5, Default::default()); |
| 24 | p.I2C2, | ||
| 25 | p.PB10, | ||
| 26 | p.PB11, | ||
| 27 | Irqs, | ||
| 28 | p.DMA1_CH4, | ||
| 29 | p.DMA1_CH5, | ||
| 30 | Default::default(), | ||
| 31 | ); | ||
| 32 | 24 | ||
| 33 | let mut data = [0u8; 1]; | 25 | let mut data = [0u8; 1]; |
| 34 | 26 | ||
diff --git a/examples/stm32h7/src/bin/i2c_shared.rs b/examples/stm32h7/src/bin/i2c_shared.rs index 3135636ee..560f97aa3 100644 --- a/examples/stm32h7/src/bin/i2c_shared.rs +++ b/examples/stm32h7/src/bin/i2c_shared.rs | |||
| @@ -89,15 +89,7 @@ async fn humidity(mut i2c: I2cDevice<'static, NoopRawMutex, I2c<'static, Async, | |||
| 89 | async fn main(spawner: Spawner) { | 89 | async fn main(spawner: Spawner) { |
| 90 | let p = embassy_stm32::init(Default::default()); | 90 | let p = embassy_stm32::init(Default::default()); |
| 91 | 91 | ||
| 92 | let i2c = I2c::new( | 92 | let i2c = I2c::new(p.I2C1, p.PB8, p.PB9, Irqs, p.DMA1_CH4, p.DMA1_CH5, Default::default()); |
| 93 | p.I2C1, | ||
| 94 | p.PB8, | ||
| 95 | p.PB9, | ||
| 96 | Irqs, | ||
| 97 | p.DMA1_CH4, | ||
| 98 | p.DMA1_CH5, | ||
| 99 | Default::default(), | ||
| 100 | ); | ||
| 101 | let i2c_bus = NoopMutex::new(RefCell::new(i2c)); | 93 | let i2c_bus = NoopMutex::new(RefCell::new(i2c)); |
| 102 | let i2c_bus = I2C_BUS.init(i2c_bus); | 94 | let i2c_bus = I2C_BUS.init(i2c_bus); |
| 103 | 95 | ||
diff --git a/examples/stm32l4/src/bin/i2c_dma.rs b/examples/stm32l4/src/bin/i2c_dma.rs index f34a484c5..0f5690e37 100644 --- a/examples/stm32l4/src/bin/i2c_dma.rs +++ b/examples/stm32l4/src/bin/i2c_dma.rs | |||
| @@ -18,15 +18,7 @@ bind_interrupts!(struct Irqs { | |||
| 18 | #[embassy_executor::main] | 18 | #[embassy_executor::main] |
| 19 | async fn main(_spawner: Spawner) { | 19 | async fn main(_spawner: Spawner) { |
| 20 | let p = embassy_stm32::init(Default::default()); | 20 | let p = embassy_stm32::init(Default::default()); |
| 21 | let mut i2c = I2c::new( | 21 | let mut i2c = I2c::new(p.I2C2, p.PB10, p.PB11, Irqs, p.DMA1_CH4, p.DMA1_CH5, Default::default()); |
| 22 | p.I2C2, | ||
| 23 | p.PB10, | ||
| 24 | p.PB11, | ||
| 25 | Irqs, | ||
| 26 | p.DMA1_CH4, | ||
| 27 | p.DMA1_CH5, | ||
| 28 | Default::default(), | ||
| 29 | ); | ||
| 30 | 22 | ||
| 31 | let mut data = [0u8; 1]; | 23 | let mut data = [0u8; 1]; |
| 32 | unwrap!(i2c.write_read(ADDRESS, &[WHOAMI], &mut data).await); | 24 | unwrap!(i2c.write_read(ADDRESS, &[WHOAMI], &mut data).await); |
