noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed formatting to match existing style + Hardwire comments

This commit is contained in:
Fergus 2015-08-01 19:09:43 +01:00
parent 61b212d42b
commit 572b311c3a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
STM32F1/cores/maple/libmaple/i2c.c
View File

@ -349,7 +349,7 @@ void _i2c_irq_handler(i2c_dev *dev) {
*/
if (msg->length > 1) {
i2c_write(dev, msg->data[msg->xferred++]);
} else if (msg->length == 0){ /* We're just sending an address */
} else if (msg->length == 0) { /* We're just sending an address */
i2c_stop_condition(dev);
/*
* Turn off event interrupts to keep BTF from firing until

11
STM32F1/libraries/Wire/HardWire.cpp
View File

@ -41,11 +41,14 @@
uint8 HardWire::process() {
int8 res = i2c_master_xfer(sel_hard, &itc_msg, 1, 0);
if (res == I2C_ERROR_PROTOCOL) {
if (sel_hard->error_flags & I2C_SR1_AF)
if (sel_hard->error_flags & I2C_SR1_AF) { /* NACK */
res = (sel_hard->error_flags & I2C_SR1_ADDR ? ENACKADDR :
ENACKTRNS);
else if (sel_hard->error_flags & I2C_SR1_OVR) res = EDATA;
else res = EOTHER;
ENACKTRNS);
} else if (sel_hard->error_flags & I2C_SR1_OVR) { /* Over/Underrun */
res = EDATA;
} else { /* Bus or Arbitration error */
res = EOTHER;
}
i2c_disable(sel_hard);
i2c_master_enable(sel_hard, (I2C_BUS_RESET | dev_flags));
}