Skip to content

Dev i2c common code #3324

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 8 commits into from
Dec 9, 2016
Merged

Dev i2c common code #3324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
77364f9
[STM32] HAL L0: I2C / DMA updates
LMESTM Nov 10, 2016
85a2f7a
[STM32] HAL L1: I2C fix btf / rxne cases
LMESTM Nov 18, 2016
a0722b1
[STM32] HAL F2: I2C fix btf / rxne cases
LMESTM Nov 18, 2016
23926a2
[STM32] HAL I2C (V2) sequential transmit / receive
LMESTM Nov 22, 2016
3fad502
[STM32] Make most of the I2C code into a common file
LMESTM Nov 2, 2016
014a48d
Add more supported boards to I2C master slave asynch test
LMESTM Nov 18, 2016
0505a52
[STM32] enable I2C ASYNCH
LMESTM Nov 18, 2016
29b32b8
STM32 I2C - 1MHZ frequency is allowed
LMESTM Dec 1, 2016
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
19 changes: 14 additions & 5 deletions features/unsupported/tests/mbed/i2c_master_slave_asynch/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,22 @@ I2C master(PB_9, PB_8);
I2C master(D14, D15); // I2C_SDA, I2C_SCL
#endif

#if defined (TARGET_NUCLEO_F429ZI) || \
#if defined (TARGET_NUCLEO_F072RB) || \
defined (TARGET_NUCLEO_F030R8) || \
defined (TARGET_NUCLEO_F103RB) || \
defined (TARGET_NUCLEO_F207ZG) || \
defined (TARGET_NUCLEO_F446ZE) || \
defined (TARGET_NUCLEO_F429ZI) || \
defined (TARGET_DISCO_F429ZI) || \
defined (TARGET_NUCLEO_F446ZE)
defined (TARGET_NUCLEO_F767ZI) || \
defined (TARGET_NUCLEO_L053R8) || \
defined (TARGET_NUCLEO_L152RE) || \
defined (TARGET_NUCLEO_L476RG)
I2CSlave slave(PB_11, PB_10);

#elif defined(TARGET_NUCLEO_F303RE)
I2CSlave slave(D2, D8);
#else
I2CSlave slave(D3, D6);

#endif

volatile int why;
Expand Down Expand Up @@ -95,7 +103,8 @@ int main()

while (!master_complete) {
if(slave.receive() == I2CSlave::ReadAddressed) {
slave.write(buf_slave, SIZE);
if(slave.write(buf_slave, SIZE))
notify_completion(false);
}
}
if (why != I2C_EVENT_TRANSFER_COMPLETE) {
Expand Down
4 changes: 0 additions & 4 deletions targets/TARGET_STM/TARGET_STM32F0/TARGET_DISCO_F051R8/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ struct dac_s {
uint32_t channel;
};

struct i2c_s {
I2CName i2c;
};

#include "common_objects.h"
#include "gpio_object.h"

Expand Down
4 changes: 0 additions & 4 deletions targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F030R8/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ struct analogin_s {
uint32_t channel;
};

struct i2c_s {
I2CName i2c;
};

#include "common_objects.h"
#include "gpio_object.h"

Expand Down
4 changes: 0 additions & 4 deletions targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F031K6/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ struct analogin_s {
uint32_t channel;
};

struct i2c_s {
I2CName i2c;
};

#include "common_objects.h"
#include "gpio_object.h"

Expand Down
4 changes: 0 additions & 4 deletions targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F042K6/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ struct analogin_s {
uint32_t channel;
};

struct i2c_s {
I2CName i2c;
};

struct can_s {
CANName can;
int index;
Expand Down
4 changes: 0 additions & 4 deletions targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F070RB/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@ struct analogin_s {
uint32_t channel;
};

struct i2c_s {
I2CName i2c;
};

#include "common_objects.h"
#include "gpio_object.h"

Expand Down
4 changes: 0 additions & 4 deletions targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F072RB/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ struct dac_s {
uint32_t channel;
};

struct i2c_s {
I2CName i2c;
};

struct can_s {
CANName can;
int index;
Expand Down
4 changes: 0 additions & 4 deletions targets/TARGET_STM/TARGET_STM32F0/TARGET_NUCLEO_F091RC/objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ struct dac_s {
uint32_t channel;
};

struct i2c_s {
I2CName i2c;
};

struct can_s {
CANName can;
int index;
Expand Down
28 changes: 28 additions & 0 deletions targets/TARGET_STM/TARGET_STM32F0/common_objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,34 @@ struct serial_s {
#endif
};

struct i2c_s {
/* The 1st 2 members I2CName i2c
* and I2C_HandleTypeDef handle should
* be kept as the first members of this struct
* to ensure i2c_get_obj to work as expected
*/
I2CName i2c;
I2C_HandleTypeDef handle;
uint8_t index;
int hz;
PinName sda;
PinName scl;
IRQn_Type event_i2cIRQ;
IRQn_Type error_i2cIRQ;
uint32_t XferOperation;
volatile uint8_t event;
#if DEVICE_I2CSLAVE
uint8_t slave;
volatile uint8_t pending_slave_tx_master_rx;
volatile uint8_t pending_slave_rx_maxter_tx;
#endif
#if DEVICE_I2C_ASYNCH
uint32_t address;
uint8_t stop;
uint8_t available_events;
#endif
};

#include "gpio_object.h"

#ifdef __cplusplus
Expand Down
19 changes: 2 additions & 17 deletions targets/TARGET_STM/TARGET_STM32F0/device/stm32f0xx_hal_i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2585,7 +2585,7 @@ HAL_StatusTypeDef HAL_I2C_Master_Sequential_Transmit_IT(I2C_HandleTypeDef *hi2c,
/* Prepare transfer parameters */
hi2c->pBuffPtr = pData;
hi2c->XferCount = Size;
hi2c->XferOptions = XferOptions;
hi2c->XferOptions = (XferOptions & (~I2C_RELOAD_MODE));
hi2c->XferISR = I2C_Master_ISR_IT;

/* If size > MAX_NBYTE_SIZE, use reload mode */
Expand All @@ -2598,15 +2598,7 @@ HAL_StatusTypeDef HAL_I2C_Master_Sequential_Transmit_IT(I2C_HandleTypeDef *hi2c,
{
hi2c->XferSize = hi2c->XferCount;
xfermode = hi2c->XferOptions;

/* If transfer direction not change, do not generate Restart Condition */
/* Mean Previous state is same as current state */
if(hi2c->PreviousState == I2C_STATE_SLAVE_BUSY_TX)
{
xferrequest = I2C_NO_STARTSTOP;
}
}


/* Send Slave Address and set NBYTES to write */
I2C_TransferConfig(hi2c, DevAddress, hi2c->XferSize, xfermode, xferrequest);
Expand Down Expand Up @@ -2659,7 +2651,7 @@ HAL_StatusTypeDef HAL_I2C_Master_Sequential_Receive_IT(I2C_HandleTypeDef *hi2c,
/* Prepare transfer parameters */
hi2c->pBuffPtr = pData;
hi2c->XferCount = Size;
hi2c->XferOptions = XferOptions;
hi2c->XferOptions = (XferOptions & (~I2C_RELOAD_MODE));
hi2c->XferISR = I2C_Master_ISR_IT;

/* If hi2c->XferCount > MAX_NBYTE_SIZE, use reload mode */
Expand All @@ -2672,13 +2664,6 @@ HAL_StatusTypeDef HAL_I2C_Master_Sequential_Receive_IT(I2C_HandleTypeDef *hi2c,
{
hi2c->XferSize = hi2c->XferCount;
xfermode = hi2c->XferOptions;

/* If transfer direction not change, do not generate Restart Condition */
/* Mean Previous state is same as current state */
if(hi2c->PreviousState == I2C_STATE_MASTER_BUSY_RX)
{
xferrequest = I2C_NO_STARTSTOP;
}
}

/* Send Slave Address and set NBYTES to read */
Expand Down
Loading