ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5113 from LMESTM/i2c_OpenDrainNoPull 

STM: I2C: Configure pins in OpenDrainNoPull by default (no pullup)
pull/5283/merge
Jimmy Brisson 2017-10-09 11:12:04 -05:00 committed by GitHub
parent 8beedcef83 076b096efe
commit d60f1452d5
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
targets/TARGET_STM/i2c_api.c
View File

@ -274,10 +274,6 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) {
obj_s->index = 0; obj_s->index = 0;
__HAL_RCC_I2C1_CLK_ENABLE(); __HAL_RCC_I2C1_CLK_ENABLE();
// Configure I2C pins // Configure I2C pins
pinmap_pinout(sda, PinMap_I2C_SDA);
pinmap_pinout(scl, PinMap_I2C_SCL);
pin_mode(sda, OpenDrainPullUp);
pin_mode(scl, OpenDrainPullUp);
obj_s->event_i2cIRQ = I2C1_EV_IRQn; obj_s->event_i2cIRQ = I2C1_EV_IRQn;
obj_s->error_i2cIRQ = I2C1_ER_IRQn; obj_s->error_i2cIRQ = I2C1_ER_IRQn;
} }
@ -287,11 +283,6 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) {
if (obj_s->i2c == I2C_2) { if (obj_s->i2c == I2C_2) {
obj_s->index = 1; obj_s->index = 1;
__HAL_RCC_I2C2_CLK_ENABLE(); __HAL_RCC_I2C2_CLK_ENABLE();
// Configure I2C pins
pinmap_pinout(sda, PinMap_I2C_SDA);
pinmap_pinout(scl, PinMap_I2C_SCL);
pin_mode(sda, OpenDrainPullUp);
pin_mode(scl, OpenDrainPullUp);
obj_s->event_i2cIRQ = I2C2_EV_IRQn; obj_s->event_i2cIRQ = I2C2_EV_IRQn;
obj_s->error_i2cIRQ = I2C2_ER_IRQn; obj_s->error_i2cIRQ = I2C2_ER_IRQn;
} }
@ -301,11 +292,6 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) {
if (obj_s->i2c == I2C_3) { if (obj_s->i2c == I2C_3) {
obj_s->index = 2; obj_s->index = 2;
__HAL_RCC_I2C3_CLK_ENABLE(); __HAL_RCC_I2C3_CLK_ENABLE();
// Configure I2C pins
pinmap_pinout(sda, PinMap_I2C_SDA);
pinmap_pinout(scl, PinMap_I2C_SCL);
pin_mode(sda, OpenDrainPullUp);
pin_mode(scl, OpenDrainPullUp);
obj_s->event_i2cIRQ = I2C3_EV_IRQn; obj_s->event_i2cIRQ = I2C3_EV_IRQn;
obj_s->error_i2cIRQ = I2C3_ER_IRQn; obj_s->error_i2cIRQ = I2C3_ER_IRQn;
} }
@ -315,11 +301,6 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) {
if (obj_s->i2c == I2C_4) { if (obj_s->i2c == I2C_4) {
obj_s->index = 3; obj_s->index = 3;
__HAL_RCC_I2C4_CLK_ENABLE(); __HAL_RCC_I2C4_CLK_ENABLE();
// Configure I2C pins
pinmap_pinout(sda, PinMap_I2C_SDA);
pinmap_pinout(scl, PinMap_I2C_SCL);
pin_mode(sda, OpenDrainPullUp);
pin_mode(scl, OpenDrainPullUp);
obj_s->event_i2cIRQ = I2C4_EV_IRQn; obj_s->event_i2cIRQ = I2C4_EV_IRQn;
obj_s->error_i2cIRQ = I2C4_ER_IRQn; obj_s->error_i2cIRQ = I2C4_ER_IRQn;
} }
@ -329,16 +310,17 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) {
if (obj_s->i2c == FMPI2C_1) { if (obj_s->i2c == FMPI2C_1) {
obj_s->index = 4; obj_s->index = 4;
__HAL_RCC_FMPI2C1_CLK_ENABLE(); __HAL_RCC_FMPI2C1_CLK_ENABLE();
// Configure I2C pins
pinmap_pinout(sda, PinMap_I2C_SDA);
pinmap_pinout(scl, PinMap_I2C_SCL);
pin_mode(sda, OpenDrainPullUp);
pin_mode(scl, OpenDrainPullUp);
obj_s->event_i2cIRQ = FMPI2C1_EV_IRQn; obj_s->event_i2cIRQ = FMPI2C1_EV_IRQn;
obj_s->error_i2cIRQ = FMPI2C1_ER_IRQn; obj_s->error_i2cIRQ = FMPI2C1_ER_IRQn;
} }
#endif #endif
// Configure I2C pins
pinmap_pinout(sda, PinMap_I2C_SDA);
pinmap_pinout(scl, PinMap_I2C_SCL);
pin_mode(sda, OpenDrainNoPull);
pin_mode(scl, OpenDrainNoPull);
// I2C configuration // I2C configuration
// Default hz value used for timeout computation // Default hz value used for timeout computation
if(!obj_s->hz) if(!obj_s->hz)