Skip to content

Commit 1cec35e

Browse files
committed
chore(wire): remove useless i2c init
Signed-off-by: Frederic Pillon <[email protected]>
1 parent 33c65c5 commit 1cec35e

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

Diff for: libraries/Wire/src/Wire.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void TwoWire::begin(uint8_t address, bool generalCall, bool NoStretchMode)
104104

105105
recoverBus(); // in case I2C bus (device) is stuck after a reset for example
106106

107-
i2c_custom_init(&_i2c, 100000, I2C_ADDRESSINGMODE_7BIT, ownAddress);
107+
i2c_init(&_i2c, 100000, I2C_ADDRESSINGMODE_7BIT, ownAddress);
108108

109109
if (_i2c.isMaster == 0) {
110110
// i2c_attachSlaveTxEvent(&_i2c, reinterpret_cast<void(*)(i2c_t*)>(&TwoWire::onRequestService));

Diff for: libraries/Wire/src/utility/twi.c

+1-11
Original file line numberDiff line numberDiff line change
@@ -637,16 +637,6 @@ static uint32_t i2c_getTiming(i2c_t *obj, uint32_t frequency)
637637
return ret;
638638
}
639639

640-
/**
641-
* @brief Default init and setup GPIO and I2C peripheral
642-
* @param obj : pointer to i2c_t structure
643-
* @retval none
644-
*/
645-
void i2c_init(i2c_t *obj)
646-
{
647-
i2c_custom_init(obj, 100000, I2C_ADDRESSINGMODE_7BIT, 0x33);
648-
}
649-
650640
/**
651641
* @brief Initialize and setup GPIO and I2C peripheral
652642
* @param obj : pointer to i2c_t structure
@@ -655,7 +645,7 @@ void i2c_init(i2c_t *obj)
655645
* @param ownAddress : device address
656646
* @retval none
657647
*/
658-
void i2c_custom_init(i2c_t *obj, uint32_t timing, uint32_t addressingMode, uint32_t ownAddress)
648+
void i2c_init(i2c_t *obj, uint32_t timing, uint32_t addressingMode, uint32_t ownAddress)
659649
{
660650
if (obj != NULL) {
661651

Diff for: libraries/Wire/src/utility/twi.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,7 @@ typedef enum {
137137
} i2c_status_e;
138138

139139
/* Exported functions ------------------------------------------------------- */
140-
void i2c_init(i2c_t *obj);
141-
void i2c_custom_init(i2c_t *obj, uint32_t timing, uint32_t addressingMode,
140+
void i2c_init(i2c_t *obj, uint32_t timing, uint32_t addressingMode,
142141
uint32_t ownAddress);
143142
void i2c_deinit(i2c_t *obj);
144143
void i2c_setTiming(i2c_t *obj, uint32_t frequency);

0 commit comments

Comments
 (0)