Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-28 17:54:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Allow ESP8266 to use multiple i2c busses (#6145)

Browse source 
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
This commit is contained in:
LouDou 2024-02-22 01:51:05 +00:00 committed by GitHub
parent fd03d875e8
commit 76a3ffc8a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
esphome/components/i2c/i2c_bus_arduino.cpp
View file

@ -24,7 +24,7 @@ void ArduinoI2CBus::setup() {
} }
next_bus_num++; next_bus_num++;
#elif defined(USE_ESP8266) #elif defined(USE_ESP8266)
wire_ = &Wire; // NOLINT(cppcoreguidelines-prefer-member-initializer) wire_ = new TwoWire(); // NOLINT(cppcoreguidelines-owning-memory)
#elif defined(USE_RP2040) #elif defined(USE_RP2040)
static bool first = true; static bool first = true;
if (first) { if (first) {
@ -35,6 +35,16 @@ void ArduinoI2CBus::setup() {
} }
#endif #endif
this->set_pins_and_clock_();
this->initialized_ = true;
if (this->scan_) {
ESP_LOGV(TAG, "Scanning i2c bus for active devices...");
this->i2c_scan_();
}
}
void ArduinoI2CBus::set_pins_and_clock_() {
#ifdef USE_RP2040 #ifdef USE_RP2040
wire_->setSDA(this->sda_pin_); wire_->setSDA(this->sda_pin_);
wire_->setSCL(this->scl_pin_); wire_->setSCL(this->scl_pin_);
@ -43,12 +53,8 @@ void ArduinoI2CBus::setup() {
wire_->begin(static_cast<int>(sda_pin_), static_cast<int>(scl_pin_)); wire_->begin(static_cast<int>(sda_pin_), static_cast<int>(scl_pin_));
#endif #endif
wire_->setClock(frequency_); wire_->setClock(frequency_);
initialized_ = true;
if (this->scan_) {
ESP_LOGV(TAG, "Scanning i2c bus for active devices...");
this->i2c_scan_();
}
} }
void ArduinoI2CBus::dump_config() { void ArduinoI2CBus::dump_config() {
ESP_LOGCONFIG(TAG, "I2C Bus:"); ESP_LOGCONFIG(TAG, "I2C Bus:");
ESP_LOGCONFIG(TAG, " SDA Pin: GPIO%u", this->sda_pin_); ESP_LOGCONFIG(TAG, " SDA Pin: GPIO%u", this->sda_pin_);
@ -82,6 +88,10 @@ void ArduinoI2CBus::dump_config() {
} }
ErrorCode ArduinoI2CBus::readv(uint8_t address, ReadBuffer *buffers, size_t cnt) { ErrorCode ArduinoI2CBus::readv(uint8_t address, ReadBuffer *buffers, size_t cnt) {
#if defined(USE_ESP8266)
this->set_pins_and_clock_(); // reconfigure Wire global state in case there are multiple instances
#endif
// logging is only enabled with vv level, if warnings are shown the caller // logging is only enabled with vv level, if warnings are shown the caller
// should log them // should log them
if (!initialized_) { if (!initialized_) {
@ -120,6 +130,10 @@ ErrorCode ArduinoI2CBus::readv(uint8_t address, ReadBuffer *buffers, size_t cnt)
return ERROR_OK; return ERROR_OK;
} }
ErrorCode ArduinoI2CBus::writev(uint8_t address, WriteBuffer *buffers, size_t cnt, bool stop) { ErrorCode ArduinoI2CBus::writev(uint8_t address, WriteBuffer *buffers, size_t cnt, bool stop) {
#if defined(USE_ESP8266)
this->set_pins_and_clock_(); // reconfigure Wire global state in case there are multiple instances
#endif
// logging is only enabled with vv level, if warnings are shown the caller // logging is only enabled with vv level, if warnings are shown the caller
// should log them // should log them
if (!initialized_) { if (!initialized_) {
@ -164,7 +178,7 @@ ErrorCode ArduinoI2CBus::writev(uint8_t address, WriteBuffer *buffers, size_t cn
return ERROR_UNKNOWN; return ERROR_UNKNOWN;
case 2: case 2:
case 3: case 3:
ESP_LOGVV(TAG, "TX failed: not acknowledged"); ESP_LOGVV(TAG, "TX failed: not acknowledged: %d", status);
return ERROR_NOT_ACKNOWLEDGED; return ERROR_NOT_ACKNOWLEDGED;
case 5: case 5:
ESP_LOGVV(TAG, "TX failed: timeout"); ESP_LOGVV(TAG, "TX failed: timeout");

1
esphome/components/i2c/i2c_bus_arduino.h
View file

@ -30,6 +30,7 @@ class ArduinoI2CBus : public I2CBus, public Component {
private: private:
void recover_(); void recover_();
void set_pins_and_clock_();
RecoveryCode recovery_result_; RecoveryCode recovery_result_;
protected: protected: