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

Fixed a master/slave mode mixup. 

Turns out that (sr2&I2C_SR2_MSL)!=I2C_SR2_MSL indicates slave mode after master has requested, and received, data.

"MSL - Cleared by hardware after detecting a Stop condition on the bus or a loss of arbitration
(ARLO=1), or by hardware when PE=0." -RM0008
This commit is contained in:
lacklustrlabs 2017-12-19 23:46:32 +01:00 committed by Lacklustrlabs
parent 987102c8d2
commit 78f8a90a2d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
STM32F1/libraries/WireSlave/src/i2c_slave.c
View File

@ -70,6 +70,12 @@ static inline void i2c_send_slave_addr(i2c_dev *dev, uint32 addr, uint32 rw) {
#ifdef I2C_DEBUG #ifdef I2C_DEBUG
#define NR_CRUMBS 128 #define NR_CRUMBS 128
struct crumb {
uint32 event;
uint32 arg0;
uint32 arg1;
uint32 arg2; // filler to make the data fit GDB memory dump screen
};
static struct crumb crumbs[NR_CRUMBS]; static struct crumb crumbs[NR_CRUMBS];
static uint32 cur_crumb = 0; static uint32 cur_crumb = 0;
@ -79,6 +85,7 @@ static inline void i2c_drop_crumb(uint32 event, uint32 arg0, uint32 arg1) {
crumb->event = event; crumb->event = event;
crumb->arg0 = arg0; crumb->arg0 = arg0;
crumb->arg1 = arg1; crumb->arg1 = arg1;
crumb->arg2 = cur_crumb-1;
} }
} }
#define I2C_CRUMB(event, arg0, arg1) i2c_drop_crumb(event, arg0, arg1) #define I2C_CRUMB(event, arg0, arg1) i2c_drop_crumb(event, arg0, arg1)
@ -87,12 +94,6 @@ static inline void i2c_drop_crumb(uint32 event, uint32 arg0, uint32 arg1) {
#define I2C_CRUMB(event, arg0, arg1) #define I2C_CRUMB(event, arg0, arg1)
#endif #endif
struct crumb {
uint32 event;
uint32 arg0;
uint32 arg1;
};
enum { enum {
IRQ_ENTRY = 1, IRQ_ENTRY = 1,
TXE_ONLY = 2, TXE_ONLY = 2,
@ -351,8 +352,8 @@ void _i2c_irq_handler(i2c_dev *dev) {
* Add Slave support * Add Slave support
*/ */
/* Check to see if MSL master slave bit is set */ /* Check to see if in slave mode */
if ((sr2 & I2C_SR2_MSL) != I2C_SR2_MSL) { /* 0 = slave mode 1 = master */ if (dev->config_flags&(I2C_SLAVE_DUAL_ADDRESS|I2C_SLAVE_GENERAL_CALL)) {
/* Check for address match */ /* Check for address match */
if (sr1 & I2C_SR1_ADDR) { if (sr1 & I2C_SR1_ADDR) {