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

Jump to bottom

[stm32] Fix stm32-extended I2C driver NACK handling #947

Merged
merged 1 commit into from
Jan 25, 2023
Merged

[stm32] Fix stm32-extended I2C driver NACK handling #947

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
49 changes: 21 additions & 28 deletions src/modm/platform/i2c/stm32-extended/i2c_master.cpp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,6 @@ namespace

I2C{{ id }}->CR1 &= ~(I2C_CR1_STOPIE | I2C_CR1_TCIE | I2C_CR1_RXIE | I2C_CR1_TXIE);

// Always enable the NACK interrupt in case we're trying to write to a slave that's not responding
I2C{{ id }}->CR1 |= I2C_CR1_NACKIE;

if (autoend and (writing.length == 0))
{
// Transfer is ended by hardware, so wait for Stop condition generated by hardware.
Expand Down Expand Up @@ -174,9 +171,6 @@ namespace

I2C{{ id }}->CR1 &= ~(I2C_CR1_STOPIE | I2C_CR1_TCIE | I2C_CR1_RXIE | I2C_CR1_TXIE);

// Always enable the NACK interrupt in case we're trying to read from a slave that's not responding
I2C{{ id }}->CR1 |= I2C_CR1_NACKIE;

if (autoend and (reading.length == 0))
{
// Transfer is ended by hardware, so wait for Stop condition generated by hardware.
Expand Down Expand Up @@ -277,29 +271,29 @@ namespace
if (sr1 & I2C_ISR_BERR)
{
DEBUG_STREAM("BUS ERROR");
I2C{{ id }}->ICR |= I2C_ICR_BERRCF;
I2C{{ id }}->ICR = I2C_ICR_BERRCF;
error = modm::I2cMaster::Error::BusCondition;
}
else if (sr1 & I2C_ISR_ARLO)
{ // arbitration lost
I2C{{ id }}->ICR |= I2C_ICR_ARLOCF;
I2C{{ id }}->ICR = I2C_ICR_ARLOCF;
DEBUG_STREAM("ARBITRATION LOST");
error = modm::I2cMaster::Error::ArbitrationLost;
}
else if ((sr1 & I2C_ISR_TIMEOUT) || (sr1 & I2C_ISR_ALERT) || (sr1 & I2C_ISR_PECERR))
{
// should only occur in unsupported SMBus mode
DEBUG_STREAM("UNKNOWN, SMBUS");
I2C{{ id }}->ICR |= I2C_ICR_ALERTCF;
I2C{{ id }}->ICR |= I2C_ICR_TIMOUTCF;
I2C{{ id }}->ICR |= I2C_ICR_PECCF;
I2C{{ id }}->ICR = I2C_ICR_ALERTCF;
I2C{{ id }}->ICR = I2C_ICR_TIMOUTCF;
I2C{{ id }}->ICR = I2C_ICR_PECCF;
error = modm::I2cMaster::Error::Unknown;
}
else if (sr1 & I2C_ISR_OVR)
{
// should not occur in master mode
DEBUG_STREAM("UNKNOWN");
I2C{{ id }}->ICR |= I2C_ICR_OVRCF;
I2C{{ id }}->ICR = I2C_ICR_OVRCF;
error = modm::I2cMaster::Error::Unknown;
}
else
Expand Down Expand Up @@ -345,7 +339,7 @@ MODM_ISR(I2C{{ id }}_EV)

I2C{{ id }}->CR1 &= ~(I2C_CR1_STOPIE | I2C_CR1_TCIE | I2C_CR1_RXIE | I2C_CR1_TXIE);

I2C{{ id }}->ICR |= I2C_ICR_STOPCF;
I2C{{ id }}->ICR = I2C_ICR_STOPCF;

#if SERIAL_DEBUGGING
if (isr & I2C_ISR_BUSY) { DEBUG_STREAM_N("BUSY " ); } else { DEBUG_STREAM_N("busy " ); }
Expand Down Expand Up @@ -388,23 +382,22 @@ MODM_ISR(I2C{{ id }}_EV)
}
}

if (isr & I2C_ISR_NACKF)
{
// acknowledge fail
I2C{{ id }}->ICR |= I2C_ICR_NACKCF;
DEBUG_STREAM("ACK FAIL");
// may also be ADDRESS_NACK
error = starting.address ? modm::I2cMaster::Error::AddressNack : modm::I2cMaster::Error::DataNack;
if (transaction) {
transaction->detaching(modm::I2c::DetachCause::ErrorCondition);
transaction = nullptr;
}
}

// Stop condition was generated
if (isr & I2C_ISR_STOPF)
{
// Stop condition was generated
if (nextOperation == modm::I2c::Operation::Stop)
if (isr & I2C_ISR_NACKF)
{
// acknowledge fail
I2C1->ICR = I2C_ICR_NACKCF;
DEBUG_STREAM("ACK FAIL");
// may also be ADDRESS_NACK
error = starting.address ? modm::I2cMaster::Error::AddressNack : modm::I2cMaster::Error::DataNack;
if (transaction) {
transaction->detaching(modm::I2c::DetachCause::ErrorCondition);
transaction = nullptr;
}
}
else if (nextOperation == modm::I2c::Operation::Stop)
{
if (transaction) {
transaction->detaching(modm::I2c::DetachCause::NormalStop);
Expand Down