Skip to content

[I2C] Add general call mode settings #541

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
Jun 15, 2019
Merged

[I2C] Add general call mode settings #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
479ff81
[I2C] Reorder i2c_t field to avoid padding
fpistm Jun 14, 2019
b545595
[I2C] Remove redundant boolean master member
fpistm Jun 14, 2019
f7e9716
[I2C] Add general call mode API
fpistm Jun 14, 2019
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
8 changes: 3 additions & 5 deletions cores/arduino/stm32/twi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ static I2C_HandleTypeDef *i2c_handles[I2C_NUM];
*/
void i2c_init(i2c_t *obj)
{
i2c_custom_init(obj, I2C_100KHz, I2C_ADDRESSINGMODE_7BIT, 0x33, 1);
i2c_custom_init(obj, I2C_100KHz, I2C_ADDRESSINGMODE_7BIT, 0x33);
}

/**
Expand All @@ -88,10 +88,9 @@ void i2c_init(i2c_t *obj)
* @param timing : one of the i2c_timing_e
* @param addressingMode : I2C_ADDRESSINGMODE_7BIT or I2C_ADDRESSINGMODE_10BIT
* @param ownAddress : device address
* @param master : set to 1 to choose the master mode
* @retval none
*/
void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, uint32_t ownAddress, uint8_t master)
void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, uint32_t ownAddress)
{
if (obj == NULL) {
return;
Expand Down Expand Up @@ -193,7 +192,7 @@ void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, u
handle->Init.OwnAddress2 = 0xFF;
handle->Init.AddressingMode = addressingMode;
handle->Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
handle->Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
handle->Init.GeneralCallMode = (obj->generalCall == 0) ? I2C_GENERALCALL_DISABLE : I2C_GENERALCALL_ENABLE;
handle->Init.NoStretchMode = I2C_NOSTRETCH_DISABLE;

handle->State = HAL_I2C_STATE_RESET;
Expand All @@ -211,7 +210,6 @@ void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode, u
Error_Handler();
}

obj->isMaster = master;
/* Initialize default values */
obj->slaveRxNbData = 0;
obj->slaveMode = SLAVE_MODE_LISTEN;
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 @@ -100,13 +100,14 @@ struct i2c_s {
#if !defined(STM32F0xx) && !defined(STM32L0xx)
IRQn_Type irqER;
#endif //!defined(STM32F0xx) && !defined(STM32L0xx)
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);
volatile uint8_t i2cTxRxBuffer[I2C_TXRX_BUFFER_SIZE];
volatile uint8_t i2cTxRxBufferSize;
volatile uint8_t slaveMode;
uint8_t isMaster;
uint8_t generalCall;
};

///@brief I2C state
Expand Down Expand Up @@ -153,7 +154,7 @@ typedef enum {
/* Exported functions ------------------------------------------------------- */
void i2c_init(i2c_t *obj);
void i2c_custom_init(i2c_t *obj, i2c_timing_e timing, uint32_t addressingMode,
uint32_t ownAddress, uint8_t master);
uint32_t ownAddress);
void i2c_deinit(i2c_t *obj);
void i2c_setTiming(i2c_t *obj, uint32_t frequency);
i2c_status_e i2c_master_write(i2c_t *obj, uint8_t dev_address, uint8_t *data, uint16_t size);
Expand Down
26 changes: 12 additions & 14 deletions libraries/Wire/src/Wire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ TwoWire::TwoWire(uint8_t sda, uint8_t scl)

// Public Methods //////////////////////////////////////////////////////////////

void TwoWire::begin(void)
void TwoWire::begin(bool generalCall)
{
begin(MASTER_ADDRESS);
begin(MASTER_ADDRESS, generalCall);
}

void TwoWire::begin(uint8_t address)
void TwoWire::begin(uint8_t address, bool generalCall)
{
rxBufferIndex = 0;
rxBufferLength = 0;
Expand All @@ -78,15 +78,13 @@ void TwoWire::begin(uint8_t address)

ownAddress = address << 1;

if (address == MASTER_ADDRESS) {
master = true;
} else {
master = false;
}
_i2c.isMaster = (address == MASTER_ADDRESS) ? 1 : 0;

_i2c.generalCall = (generalCall == true) ? 1 : 0;

i2c_custom_init(&_i2c, I2C_100KHz, I2C_ADDRESSINGMODE_7BIT, ownAddress, master);
i2c_custom_init(&_i2c, I2C_100KHz, I2C_ADDRESSINGMODE_7BIT, ownAddress);

if (master == false) {
if (_i2c.isMaster == 0) {
// i2c_attachSlaveTxEvent(&_i2c, reinterpret_cast<void(*)(i2c_t*)>(&TwoWire::onRequestService));
// i2c_attachSlaveRxEvent(&_i2c, reinterpret_cast<void(*)(i2c_t*, uint8_t*, int)>(&TwoWire::onReceiveService));

Expand All @@ -95,9 +93,9 @@ void TwoWire::begin(uint8_t address)
}
}

void TwoWire::begin(int address)
void TwoWire::begin(int address, bool generalCall)
{
begin((uint8_t)address);
begin((uint8_t)address, generalCall);
}

void TwoWire::end(void)
Expand All @@ -119,7 +117,7 @@ void TwoWire::setClock(uint32_t frequency)
uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint32_t iaddress, uint8_t isize, uint8_t sendStop)
{
UNUSED(sendStop);
if (master == true) {
if (_i2c.isMaster == 1) {
allocateRxBuffer(quantity);
// error if no memory block available to allocate the buffer
if (rxBuffer == nullptr) {
Expand Down Expand Up @@ -216,7 +214,7 @@ uint8_t TwoWire::endTransmission(uint8_t sendStop)
UNUSED(sendStop);
int8_t ret = 4;

if (master == true) {
if (_i2c.isMaster == 1) {
// transmit buffer (blocking)
switch (i2c_master_write(&_i2c, txAddress, txBuffer, txBufferLength)) {
case I2C_OK :
Expand Down
7 changes: 3 additions & 4 deletions libraries/Wire/src/Wire.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ class TwoWire : public Stream {
static uint8_t transmitting;

uint8_t ownAddress;
bool master;
i2c_t _i2c;

static void (*user_onRequest)(void);
Expand Down Expand Up @@ -83,9 +82,9 @@ class TwoWire : public Stream {
{
_i2c.sda = sda;
};
void begin();
void begin(uint8_t);
void begin(int);
void begin(bool generalCall = false);
void begin(uint8_t, bool generalCall = false);
void begin(int, bool generalCall = false);
void end();
void setClock(uint32_t);
void beginTransmission(uint8_t);
Expand Down