Skip to content

Dev i2c stm32f4hal #3238

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 14 commits into from
Nov 16, 2016
Merged

Dev i2c stm32f4hal #3238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2b53dfc
STM32: I2C: configure slave address with HAL API
LMESTM Oct 20, 2016
0bee690
STM32: I2C: Don't use global init variables
LMESTM Oct 20, 2016
490437a
STM32: I2C: Move up get_i2c_obj
LMESTM Oct 20, 2016
c2060e3
STM32: I2C: Add-up irq handlers
LMESTM Oct 20, 2016
d71537b
STM32: I2C: use irq helper function
LMESTM Oct 20, 2016
79504a6
STM32: I2C: Change the slave API implementation to use ITs
LMESTM Oct 20, 2016
42d89b0
STM32: I2C: Update Timeout computation
LMESTM Oct 20, 2016
ec95aa5
STM32: I2C: Reset I2C in case of errors to recover
LMESTM Oct 27, 2016
a50dc77
STM32: I2C: Change the master sync implementation to use ITs
LMESTM Oct 20, 2016
a65bacc
[STM32F4] Master receive sequential - fix for HAL I2C
LMESTM Oct 27, 2016
b491165
[STM32F4] Add few prints for I2C debug
LMESTM Oct 20, 2016
3897d93
test i2c asynch: Remove printf usage from interrupt context
LMESTM Nov 8, 2016
4c36b9c
test i2c asynch : test transfer return value
LMESTM Nov 8, 2016
e293e07
stm32f4 make comment more explicit
LMESTM Nov 10, 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
11 changes: 7 additions & 4 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 @@ -45,7 +45,6 @@ I2CSlave slave(D3, D6);
volatile int why;
volatile bool master_complete = false;
void cbmaster_done(int event) {
printf("cbmaster_done\n");
master_complete = true;
why = event;
}
Expand All @@ -70,7 +69,8 @@ int main()

// First transfer: master to slave
printf("\nFirst transfer: Master Tx, Repeated Start\n");
master.transfer(ADDR, buf_master, SIZE, 0, 0, callback, I2C_EVENT_ALL, true);
if(master.transfer(ADDR, buf_master, SIZE, 0, 0, callback, I2C_EVENT_ALL, true) != 0)
notify_completion(false);

while (!master_complete) {
if(slave.receive() == I2CSlave::WriteAddressed) {
Expand All @@ -90,7 +90,8 @@ int main()

// Second transfer: slave to master
printf("\nSecond transfer: Master Rx\n");
master.transfer(ADDR, 0, 0, res_master, SIZE, callback, I2C_EVENT_ALL, true);
if(master.transfer(ADDR, 0, 0, res_master, SIZE, callback, I2C_EVENT_ALL, true) != 0)
notify_completion(false);

while (!master_complete) {
if(slave.receive() == I2CSlave::ReadAddressed) {
Expand Down Expand Up @@ -118,7 +119,8 @@ int main()

// Third transfer: Tx/Rx
printf("\nThird transfer: Master Tx/Rx\n");
master.transfer(ADDR, buf_master_tx, SIZE, buf_master_rx, SIZE, callback, I2C_EVENT_ALL, false);
if(master.transfer(ADDR, buf_master_tx, SIZE, buf_master_rx, SIZE, callback, I2C_EVENT_ALL, false) != 0)
notify_completion(false);

while (!master_complete) {

Expand All @@ -130,6 +132,7 @@ int main()
buf_slave_txrx[i]++;
}
}

if((i == I2CSlave::ReadAddressed) ) {
slave.write(buf_slave_txrx, SIZE);
}
Expand Down
16 changes: 14 additions & 2 deletions targets/TARGET_STM/TARGET_STM32F4/common_objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,29 @@ struct spi_s {
};

struct i2c_s {
/* The 1st 2 members I2CName i2c
Copy link
Contributor

Choose a reason for hiding this comment

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

curiousity: what's the reasoning for this comment, should it be mentioned ??

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is a requirement for get_i2c_obj function to work - if anyone changes this order, this would break the mechanism to get a pointer to the i2c_s object when having a pointer to the contained handle.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for the explanation, it was not clear from the comment why there's that requirement

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok - I'll update the comment to be more precise

Copy link
Contributor

Choose a reason for hiding this comment

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

OK let me know once done . I'll go through the files once again, trigger CI afterwards

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done - I updated the comment

* and I2C_HandleTypeDef handle should
* be kept as the first members of this struct
* to have get_i2c_obj() function work as expected
*/
I2CName i2c;
I2C_HandleTypeDef handle;
uint8_t index;
PinName sda;
PinName scl;
IRQn_Type event_i2cIRQ;
IRQn_Type error_i2cIRQ;
uint8_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 event;
uint8_t stop;
uint8_t available_events;
uint8_t XferOperation;
#endif
};

Expand Down
3 changes: 2 additions & 1 deletion targets/TARGET_STM/TARGET_STM32F4/device/stm32f4xx_hal_i2c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3960,7 +3960,8 @@ static HAL_StatusTypeDef I2C_MasterReceive_BTF(I2C_HandleTypeDef *hi2c)
__HAL_I2C_DISABLE_IT(hi2c, I2C_IT_EVT | I2C_IT_ERR);

hi2c->State = HAL_I2C_STATE_READY;

hi2c->PreviousState = I2C_STATE_NONE;

if(hi2c->Mode == HAL_I2C_MODE_MEM)
{
hi2c->Mode = HAL_I2C_MODE_NONE;
Expand Down
Loading