Skip to content

Commit

Permalink
Merge branch 'i2c_typos' into supermerge
Browse files Browse the repository at this point in the history
  • Loading branch information
dewagter committed Sep 27, 2014
2 parents 43ff6af + 366154a commit 3a5c119
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions sw/airborne/arch/stm32/mcu_periph/i2c_arch.c
Expand Up @@ -671,7 +671,7 @@ static inline void i2c_irq(struct i2c_periph *periph)
We are always interested in all IT_EV_FEV: all are required.
1) SB // Start Condition Success in Master mode
2) ADDR // Address sent received Acknoledge
2) ADDR // Address sent received Acknowledge
[ADDR10] // -- 10bit address stuff: not used
[STOPF] // -- only for slaves: master has no stop interrupt: not used
3) BTF // I2C has stopped working (it is waiting for new data, all buffers are tx_empty/rx_full)
Expand Down Expand Up @@ -704,15 +704,15 @@ static inline void i2c_irq(struct i2c_periph *periph)
--------------------------------------------------------------------------------------------------
The STM waits indefinately (holding SCL low) for user interaction:
The STM waits indefinitely (holding SCL low) for user interaction:
a) after a master-start (waiting for address)
b) after an address (waiting for data)
not during data sending when using buffered
c) after the last byte is transmitted (waiting for either stop or restart)
not during data receiving when using buffered
not after the last byte is received
- The STM I2C stalls indefinately when a stop condition was attempted that
- The STM I2C stalls indefinitely when a stop condition was attempted that
did not succeed. The BUSY flag remains on.
- There is no STOP interrupt.
Expand Down

0 comments on commit 3a5c119

Please sign in to comment.