Skip to content

I2C Slave : rework slave receive data sequence #306

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

Merged
merged 3 commits into from
Sep 4, 2018
Merged

I2C Slave : rework slave receive data sequence #306

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b043838
I2C Slave : rework slave receive data sequence
LMESTM Aug 13, 2018
66f851a
Configure I2C Fast Mode when I2C freq is more than 100kHz
LMESTM Aug 13, 2018
c431305
I2C slave: Fix typos
LMESTM Sep 4, 2018
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
62 changes: 53 additions & 9 deletions cores/arduino/stm32/twi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@

#define SLAVE_MODE_TRANSMIT 0
#define SLAVE_MODE_RECEIVE 1
#define SLAVE_MODE_LISTEN 2


/**
* @}
Expand Down Expand Up @@ -283,6 +285,9 @@ void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, u
HAL_I2C_Init(handle);

obj->isMaster = master;
/* Initialize default values */
obj->slaveRxNbData = 0;
obj->slaveMode = SLAVE_MODE_LISTEN;
}

/**
Expand Down Expand Up @@ -395,9 +400,10 @@ i2c_status_e i2c_slave_write_IT(i2c_t *obj, uint8_t *data, uint16_t size)
// Check the communication status
for(i = 0; i < size; i++) {
obj->i2cTxRxBuffer[i] = *(data+i);
obj->i2cTxRxBufferSize++;
}

obj->i2cTxRxBufferSize = size;

return I2C_OK;
}

Expand Down Expand Up @@ -509,8 +515,6 @@ void HAL_I2C_AddrCallback(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, ui

if(AddrMatchCode == hi2c->Init.OwnAddress1) {
if(TransferDirection == I2C_DIRECTION_RECEIVE) {

obj->i2cTxRxBufferSize = 0;
obj->slaveMode = SLAVE_MODE_TRANSMIT;

if(obj->i2c_onSlaveTransmit != NULL) {
Expand All @@ -519,9 +523,12 @@ void HAL_I2C_AddrCallback(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, ui
HAL_I2C_Slave_Sequential_Transmit_IT(hi2c, obj->i2cTxRxBuffer,
obj->i2cTxRxBufferSize, I2C_LAST_FRAME);
} else {
obj->slaveRxNbData = 0;
obj->slaveMode = SLAVE_MODE_RECEIVE;
HAL_I2C_Slave_Sequential_Receive_IT(hi2c, obj->i2cTxRxBuffer,
I2C_TXRX_BUFFER_SIZE, I2C_LAST_FRAME);
/* We don't know in advance how many bytes will be sent by master so
* we'll fetch one by one until master ends the sequence */
HAL_I2C_Slave_Sequential_Receive_IT(hi2c, &(obj->i2cTxRxBuffer[obj->slaveRxNbData]),
1, I2C_NEXT_FRAME);
}
}
}
Expand All @@ -534,19 +541,56 @@ void HAL_I2C_AddrCallback(I2C_HandleTypeDef *hi2c, uint8_t TransferDirection, ui
*/
void HAL_I2C_ListenCpltCallback(I2C_HandleTypeDef *hi2c)
{
uint8_t nbData = 0;
i2c_t *obj = get_i2c_obj(hi2c);

/* Previous master transaction now ended, so inform upper layer if needed
* then prepare for listeing to next request */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

listening

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

if((obj->i2c_onSlaveReceive != NULL) &&
(obj->slaveMode == SLAVE_MODE_RECEIVE)) {
nbData = I2C_TXRX_BUFFER_SIZE - obj->handle.XferSize;
if(nbData != 0) {
obj->i2c_onSlaveReceive(obj->i2cTxRxBuffer, nbData);
if(obj->slaveRxNbData != 0) {
obj->i2c_onSlaveReceive(obj->i2cTxRxBuffer, obj->slaveRxNbData);
}
}
obj->slaveMode = SLAVE_MODE_LISTEN;
obj->slaveRxNbData = 0;
HAL_I2C_EnableListen_IT(hi2c);
}

/**
* @brief Slave RX complete callback
* @param hi2c Pointer to a I2C_HandleTypeDef structure that contains
* the configuration information for the specified I2C.
* @retval None
*/
void HAL_I2C_SlaveRxCpltCallback(I2C_HandleTypeDef *hi2c)
{
i2c_t *obj = get_i2c_obj(hi2c);
/* One more byte was received, store it then prepare next */
if(obj->slaveRxNbData < I2C_TXRX_BUFFER_SIZE) {
obj->slaveRxNbData++;
} else {
printf("ERROR: I2C Slave RX overflow\n");
}
/* Restart interrupt mode for next Byte */
if(obj->slaveMode == SLAVE_MODE_RECEIVE) {
HAL_I2C_Slave_Sequential_Receive_IT(hi2c, &(obj->i2cTxRxBuffer[obj->slaveRxNbData]),
1, I2C_NEXT_FRAME);
}
}

/**
* @brief Slave TX complete callback
* @param hi2c Pointer to a I2C_HandleTypeDef structure that contains
* the configuration information for the specified I2C.
* @retval None
*/
void HAL_I2C_SlaveTxCpltCallback(I2C_HandleTypeDef *hi2c)
{
i2c_t *obj = get_i2c_obj(hi2c);
/* reset transmit buffer size */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, remove one space and use capital letter for first letter.
/* Reset

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

obj->i2cTxRxBufferSize = 0;
}

/**
* @brief I2C error callback.
* @note In master mode, the callback is not used because the error is reported
Expand Down
7 changes: 4 additions & 3 deletions cores/arduino/stm32/twi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,13 @@ struct i2c_s {
#if !defined(STM32F0xx) && !defined(STM32L0xx)
IRQn_Type irqER;
#endif //!defined(STM32F0xx) && !defined(STM32L0xx)
uint8_t slaveMode;
volatile uint8_t slaveMode;
uint8_t isMaster;
volatile int slaveRxNbData; // Number of accumulated bytes received in Slave mode
void (*i2c_onSlaveReceive)(uint8_t *, int);
void (*i2c_onSlaveTransmit)(void);
uint8_t i2cTxRxBuffer[I2C_TXRX_BUFFER_SIZE];
uint8_t i2cTxRxBufferSize;
volatile uint8_t i2cTxRxBuffer[I2C_TXRX_BUFFER_SIZE];
volatile uint8_t i2cTxRxBufferSize;
};

///@brief I2C state
Expand Down