mirror of
https://github.com/Threnklyn/esphome-dev.git
synced 2026-06-06 04:48:27 +02:00
ESP-IDF support and generic target platforms (#2303)
* Socket refactor and SSL * esp-idf temp * Fixes * Echo component and noise * Add noise API transport support * Updates * ESP-IDF * Complete * Fixes * Fixes * Versions update * New i2c APIs * Complete i2c refactor * SPI migration * Revert ESP Preferences migration, too complex for now * OTA support * Remove echo again * Remove ssl again * GPIOFlags updates * Rename esphal and ICACHE_RAM_ATTR * Make ESP32 arduino compilable again * Fix GPIO flags * Complete pin registry refactor and fixes * Fixes to make test1 compile * Remove sdkconfig file * Ignore sdkconfig file * Fixes in reviewing * Make test2 compile * Make test4 compile * Make test5 compile * Run clang-format * Fix lint errors * Use esp-idf APIs instead of btStart * Another round of fixes * Start implementing ESP8266 * Make test3 compile * Guard esp8266 code * Lint * Reformat * Fixes * Fixes v2 * more fixes * ESP-IDF tidy target * Convert ARDUINO_ARCH_ESPxx * Update WiFiSignalSensor * Update time ifdefs * OTA needs millis from hal * RestartSwitch needs delay from hal * ESP-IDF Uart * Fix OTA blank password * Allow setting sdkconfig * Fix idf partitions and allow setting sdkconfig from yaml * Re-add read/write compat APIs and fix esp8266 uart * Fix esp8266 store log strings in flash * Fix ESP32 arduino preferences not initialized * Update ifdefs * Change how sdkconfig change is detected * Add checks to ci-custom and fix them * Run clang-format * Add esp-idf clang-tidy target and fix errors * Fixes from clang-tidy idf round 2 * Fixes from compiling tests with esp-idf * Run clang-format * Switch test5.yaml to esp-idf * Implement ESP8266 Preferences * Lint * Re-do PIO package version selection a bit * Fix arduinoespressif32 package version * Fix unit tests * Lint * Lint fixes * Fix readv/writev not defined * Fix graphing component * Re-add all old options from core/config.py Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
This commit is contained in:
Otto Winter
@@ -1,30 +1,43 @@
|
||||
import esphome.codegen as cg
|
||||
import esphome.config_validation as cv
|
||||
from esphome.components import i2c
|
||||
from esphome.const import CONF_ID, CONF_SCAN
|
||||
from esphome.const import CONF_CHANNEL, CONF_CHANNELS, CONF_ID, CONF_SCAN
|
||||
|
||||
CODEOWNERS = ["@andreashergert1984"]
|
||||
|
||||
DEPENDENCIES = ["i2c"]
|
||||
|
||||
tca9548a_ns = cg.esphome_ns.namespace("tca9548a")
|
||||
TCA9548AComponent = tca9548a_ns.class_(
|
||||
"TCA9548AComponent", cg.PollingComponent, i2c.I2CMultiplexer
|
||||
)
|
||||
TCA9548AComponent = tca9548a_ns.class_("TCA9548AComponent", cg.Component, i2c.I2CDevice)
|
||||
TCA9548AChannel = tca9548a_ns.class_("TCA9548AChannel", i2c.I2CBus)
|
||||
|
||||
MULTI_CONF = True
|
||||
|
||||
CONFIG_SCHEMA = cv.Schema(
|
||||
{
|
||||
cv.GenerateID(): cv.declare_id(TCA9548AComponent),
|
||||
cv.Optional(CONF_SCAN, default=True): cv.boolean,
|
||||
}
|
||||
).extend(i2c.i2c_device_schema(0x70))
|
||||
CONF_BUS_ID = "bus_id"
|
||||
CONFIG_SCHEMA = (
|
||||
cv.Schema(
|
||||
{
|
||||
cv.GenerateID(): cv.declare_id(TCA9548AComponent),
|
||||
cv.Optional(CONF_SCAN): cv.invalid("This option has been removed"),
|
||||
cv.Optional(CONF_CHANNELS, default=[]): cv.ensure_list(
|
||||
{
|
||||
cv.Required(CONF_BUS_ID): cv.declare_id(TCA9548AChannel),
|
||||
cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=7),
|
||||
}
|
||||
),
|
||||
}
|
||||
)
|
||||
.extend(i2c.i2c_device_schema(0x70))
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config):
|
||||
var = cg.new_Pvariable(config[CONF_ID])
|
||||
cg.add_define("USE_I2C_MULTIPLEXER")
|
||||
await cg.register_component(var, config)
|
||||
await i2c.register_i2c_device(var, config)
|
||||
cg.add(var.set_scan(config[CONF_SCAN]))
|
||||
|
||||
for conf in config[CONF_CHANNELS]:
|
||||
chan = cg.new_Pvariable(conf[CONF_BUS_ID])
|
||||
cg.add(chan.set_parent(var))
|
||||
cg.add(chan.set_channel(conf[CONF_CHANNEL]))
|
||||
|
||||
@@ -6,35 +6,46 @@ namespace tca9548a {
|
||||
|
||||
static const char *const TAG = "tca9548a";
|
||||
|
||||
i2c::ErrorCode TCA9548AChannel::readv(uint8_t address, i2c::ReadBuffer *buffers, size_t cnt) {
|
||||
auto err = parent_->switch_to_channel(channel_);
|
||||
if (err != i2c::ERROR_OK)
|
||||
return err;
|
||||
return parent_->bus_->readv(address, buffers, cnt);
|
||||
}
|
||||
i2c::ErrorCode TCA9548AChannel::writev(uint8_t address, i2c::WriteBuffer *buffers, size_t cnt) {
|
||||
auto err = parent_->switch_to_channel(channel_);
|
||||
if (err != i2c::ERROR_OK)
|
||||
return err;
|
||||
return parent_->bus_->writev(address, buffers, cnt);
|
||||
}
|
||||
|
||||
void TCA9548AComponent::setup() {
|
||||
ESP_LOGCONFIG(TAG, "Setting up TCA9548A...");
|
||||
uint8_t status = 0;
|
||||
if (!this->read_byte(0x00, &status)) {
|
||||
if (!this->read_register(0x00, &status, 1)) {
|
||||
ESP_LOGI(TAG, "TCA9548A failed");
|
||||
this->mark_failed();
|
||||
return;
|
||||
}
|
||||
// out of range to make sure on first set_channel a new one will be set
|
||||
this->current_channelno_ = 8;
|
||||
ESP_LOGCONFIG(TAG, "Channels currently open: %d", status);
|
||||
ESP_LOGD(TAG, "Channels currently open: %d", status);
|
||||
}
|
||||
void TCA9548AComponent::dump_config() {
|
||||
ESP_LOGCONFIG(TAG, "TCA9548A:");
|
||||
LOG_I2C_DEVICE(this);
|
||||
if (this->scan_) {
|
||||
for (uint8_t i = 0; i < 8; i++) {
|
||||
ESP_LOGCONFIG(TAG, "Activating channel: %d", i);
|
||||
this->set_channel(i);
|
||||
this->parent_->dump_config();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void TCA9548AComponent::set_channel(uint8_t channelno) {
|
||||
if (this->current_channelno_ != channelno) {
|
||||
this->current_channelno_ = channelno;
|
||||
uint8_t channelbyte = 1 << channelno;
|
||||
this->write_byte(0x70, channelbyte);
|
||||
i2c::ErrorCode TCA9548AComponent::switch_to_channel(uint8_t channel) {
|
||||
if (this->is_failed())
|
||||
return i2c::ERROR_NOT_INITIALIZED;
|
||||
if (current_channel_ == channel)
|
||||
return i2c::ERROR_OK;
|
||||
|
||||
uint8_t channel_val = 1 << channel;
|
||||
auto err = this->write_register(0x70, &channel_val, 1);
|
||||
if (err == i2c::ERROR_OK) {
|
||||
current_channel_ = channel;
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
} // namespace tca9548a
|
||||
|
||||
@@ -6,17 +6,31 @@
|
||||
namespace esphome {
|
||||
namespace tca9548a {
|
||||
|
||||
class TCA9548AComponent : public Component, public i2c::I2CMultiplexer {
|
||||
class TCA9548AComponent;
|
||||
class TCA9548AChannel : public i2c::I2CBus {
|
||||
public:
|
||||
void set_channel(uint8_t channel) { channel_ = channel; }
|
||||
void set_parent(TCA9548AComponent *parent) { parent_ = parent; }
|
||||
|
||||
i2c::ErrorCode readv(uint8_t address, i2c::ReadBuffer *buffers, size_t cnt) override;
|
||||
i2c::ErrorCode writev(uint8_t address, i2c::WriteBuffer *buffers, size_t cnt) override;
|
||||
|
||||
protected:
|
||||
uint8_t channel_;
|
||||
TCA9548AComponent *parent_;
|
||||
};
|
||||
|
||||
class TCA9548AComponent : public Component, public i2c::I2CDevice {
|
||||
public:
|
||||
void set_scan(bool scan) { scan_ = scan; }
|
||||
void setup() override;
|
||||
void dump_config() override;
|
||||
void update();
|
||||
void set_channel(uint8_t channelno) override;
|
||||
|
||||
i2c::ErrorCode switch_to_channel(uint8_t channel);
|
||||
|
||||
protected:
|
||||
bool scan_;
|
||||
uint8_t current_channelno_;
|
||||
friend class TCA9548AChannel;
|
||||
uint8_t current_channel_ = 255;
|
||||
};
|
||||
} // namespace tca9548a
|
||||
} // namespace esphome
|
||||
|
||||
Reference in New Issue
Block a user