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.

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

Improve documentation of the i2c peripheral driver & improve i2c example #692

Merged
merged 1 commit into from
Oct 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
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
13 changes: 8 additions & 5 deletions rp2040-hal/examples/i2c.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,11 @@ use fugit::RateExtU32;
use rp2040_hal as hal;

// A shorter alias for the Peripheral Access Crate, which provides low-level
// register access
use hal::pac;
// register access and a gpio related types.
use hal::{
gpio::{FunctionI2C, Pin, PullUp},
pac,
};

/// The linker will place this boot block at the start of our program image. We
/// need this to help the ROM bootloader get our code up and running.
Expand Down Expand Up @@ -75,9 +78,9 @@ fn main() -> ! {
);

// Configure two pins as being I²C, not GPIO
let sda_pin = pins.gpio18.into_function::<hal::gpio::FunctionI2C>();
let scl_pin = pins.gpio19.into_function::<hal::gpio::FunctionI2C>();
// let not_an_scl_pin = pins.gpio20.into_function::<hal::gpio::FunctionI2C>();
let sda_pin: Pin<_, FunctionI2C, PullUp> = pins.gpio18.reconfigure();
let scl_pin: Pin<_, FunctionI2C, PullUp> = pins.gpio19.reconfigure();
// let not_an_scl_pin: Pin<_, FunctionI2C, PullUp> = pins.gpio20.reconfigure();

// Create the I²C drive, using the two pre-configured pins. This will fail
// at compile time if the pins are in the wrong mode, or if this I²C
Expand Down
4 changes: 1 addition & 3 deletions rp2040-hal/src/i2c.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@ use crate::{
typelevel::Sealed,
};

/// Controller implementaion
pub mod controller;
/// Peripheral implementation
mod controller;
pub mod peripheral;

/// Pac I2C device
Expand Down
23 changes: 23 additions & 0 deletions rp2040-hal/src/i2c/peripheral.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
//! # I2C Peripheral (slave) implementation
//!
//! The RP2040 I2C block can behave as a peripheral node on an I2C bus.
//!
//! In order to handle peripheral transactions this driver exposes an iterator streaming I2C event
//! that the usercode must handle to properly handle the I2C communitation. See [`I2CEvent`] for a
//! list of events to handle.
//!
//! Although [`Start`](I2CEvent::Start), [`Restart`](I2CEvent::Restart) and [`Stop`](I2CEvent::Stop)
//! events may not require any action on the device, [`TransferRead`](I2CEvent::TransferRead) and
//! [`TransferWrite`](I2CEvent::TransferWrite) require some action:
//!
//! - [`TransferRead`](I2CEvent::TransferRead): A controller is attempting to read from this peripheral.
//! The I2C block holds the SCL line low (clock stretching) until data is pushed to the transmission
//! FIFO by the user application using [`write`](I2CPeripheralEventIterator::write).
//! Data remaining in the FIFO when the bus constroller stops the transfer are ignored & the fifo
//! is flushed.
//! - [`TransferWrite`](I2CEvent::TransferWrite): A controller is sending data to this peripheral.
//! The I2C block holds the SCL line (clock stretching) until there is room for more data in the
//! Rx FIFO using [`read`](I2CPeripheralEventIterator::read).
//! Data are automatically acknowledged by the I2C block and it is not possible to NACK incoming
//! data comming to the rp2040.

use core::{marker::PhantomData, ops::Deref};

use super::{Peripheral, ValidPinScl, ValidPinSda, I2C};
Expand Down
Loading