sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-17 10:42:21 +01:00
Code Issues Releases Wiki Activity

Merge branch 'integration' into memory_api

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-03 17:56:30 -05:00
parent 6c3dba06ba 8f2903dee8
commit 9495a885ed
2 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
esphome/components/esp32/gpio.cpp
View File

@@ -54,13 +54,13 @@ struct ISRPinArg {
ISRInternalGPIOPin ESP32InternalGPIOPin::to_isr() const { ISRInternalGPIOPin ESP32InternalGPIOPin::to_isr() const {
auto *arg = new ISRPinArg{}; // NOLINT(cppcoreguidelines-owning-memory) auto *arg = new ISRPinArg{}; // NOLINT(cppcoreguidelines-owning-memory)
arg->pin = this->pin_; arg->pin = this->get_pin_num();
arg->flags = gpio::FLAG_NONE; arg->flags = gpio::FLAG_NONE;
arg->inverted = inverted_; arg->inverted = pin_flags_.inverted;
#if defined(USE_ESP32_VARIANT_ESP32) #if defined(USE_ESP32_VARIANT_ESP32)
arg->use_rtc = rtc_gpio_is_valid_gpio(this->pin_); arg->use_rtc = rtc_gpio_is_valid_gpio(this->get_pin_num());
if (arg->use_rtc) if (arg->use_rtc)
arg->rtc_pin = rtc_io_number_get(this->pin_); arg->rtc_pin = rtc_io_number_get(this->get_pin_num());
#endif #endif
return ISRInternalGPIOPin((void *) arg); return ISRInternalGPIOPin((void *) arg);
} }
@@ -69,23 +69,23 @@ void ESP32InternalGPIOPin::attach_interrupt(void (*func)(void *), void *arg, gpi
gpio_int_type_t idf_type = GPIO_INTR_ANYEDGE; gpio_int_type_t idf_type = GPIO_INTR_ANYEDGE;
switch (type) { switch (type) {
case gpio::INTERRUPT_RISING_EDGE: case gpio::INTERRUPT_RISING_EDGE:
idf_type = inverted_ ? GPIO_INTR_NEGEDGE : GPIO_INTR_POSEDGE; idf_type = pin_flags_.inverted ? GPIO_INTR_NEGEDGE : GPIO_INTR_POSEDGE;
break; break;
case gpio::INTERRUPT_FALLING_EDGE: case gpio::INTERRUPT_FALLING_EDGE:
idf_type = inverted_ ? GPIO_INTR_POSEDGE : GPIO_INTR_NEGEDGE; idf_type = pin_flags_.inverted ? GPIO_INTR_POSEDGE : GPIO_INTR_NEGEDGE;
break; break;
case gpio::INTERRUPT_ANY_EDGE: case gpio::INTERRUPT_ANY_EDGE:
idf_type = GPIO_INTR_ANYEDGE; idf_type = GPIO_INTR_ANYEDGE;
break; break;
case gpio::INTERRUPT_LOW_LEVEL: case gpio::INTERRUPT_LOW_LEVEL:
idf_type = inverted_ ? GPIO_INTR_HIGH_LEVEL : GPIO_INTR_LOW_LEVEL; idf_type = pin_flags_.inverted ? GPIO_INTR_HIGH_LEVEL : GPIO_INTR_LOW_LEVEL;
break; break;
case gpio::INTERRUPT_HIGH_LEVEL: case gpio::INTERRUPT_HIGH_LEVEL:
idf_type = inverted_ ? GPIO_INTR_LOW_LEVEL : GPIO_INTR_HIGH_LEVEL; idf_type = pin_flags_.inverted ? GPIO_INTR_LOW_LEVEL : GPIO_INTR_HIGH_LEVEL;
break; break;
} }
gpio_set_intr_type(pin_, idf_type); gpio_set_intr_type(get_pin_num(), idf_type);
gpio_intr_enable(pin_); gpio_intr_enable(get_pin_num());
if (!isr_service_installed) { if (!isr_service_installed) {
auto res = gpio_install_isr_service(ESP_INTR_FLAG_LEVEL3); auto res = gpio_install_isr_service(ESP_INTR_FLAG_LEVEL3);
if (res != ESP_OK) { if (res != ESP_OK) {
@@ -94,7 +94,7 @@ void ESP32InternalGPIOPin::attach_interrupt(void (*func)(void *), void *arg, gpi
} }
isr_service_installed = true; isr_service_installed = true;
} }
gpio_isr_handler_add(pin_, func, arg); gpio_isr_handler_add(get_pin_num(), func, arg);
} }
std::string ESP32InternalGPIOPin::dump_summary() const { std::string ESP32InternalGPIOPin::dump_summary() const {
@@ -112,13 +112,13 @@ void ESP32InternalGPIOPin::setup() {
conf.intr_type = GPIO_INTR_DISABLE; conf.intr_type = GPIO_INTR_DISABLE;
gpio_config(&conf); gpio_config(&conf);
if (flags_ & gpio::FLAG_OUTPUT) { if (flags_ & gpio::FLAG_OUTPUT) {
gpio_set_drive_capability(pin_, drive_strength_); gpio_set_drive_capability(get_pin_num(), get_drive_strength());
} }
} }
void ESP32InternalGPIOPin::pin_mode(gpio::Flags flags) { void ESP32InternalGPIOPin::pin_mode(gpio::Flags flags) {
// can't call gpio_config here because that logs in esp-idf which may cause issues // can't call gpio_config here because that logs in esp-idf which may cause issues
gpio_set_direction(pin_, flags_to_mode(flags)); gpio_set_direction(get_pin_num(), flags_to_mode(flags));
gpio_pull_mode_t pull_mode = GPIO_FLOATING; gpio_pull_mode_t pull_mode = GPIO_FLOATING;
if ((flags & gpio::FLAG_PULLUP) && (flags & gpio::FLAG_PULLDOWN)) { if ((flags & gpio::FLAG_PULLUP) && (flags & gpio::FLAG_PULLDOWN)) {
pull_mode = GPIO_PULLUP_PULLDOWN; pull_mode = GPIO_PULLUP_PULLDOWN;
@@ -127,12 +127,14 @@ void ESP32InternalGPIOPin::pin_mode(gpio::Flags flags) {
} else if (flags & gpio::FLAG_PULLDOWN) { } else if (flags & gpio::FLAG_PULLDOWN) {
pull_mode = GPIO_PULLDOWN_ONLY; pull_mode = GPIO_PULLDOWN_ONLY;
} }
gpio_set_pull_mode(pin_, pull_mode); gpio_set_pull_mode(get_pin_num(), pull_mode);
} }
bool ESP32InternalGPIOPin::digital_read() { return bool(gpio_get_level(pin_)) != inverted_; } bool ESP32InternalGPIOPin::digital_read() { return bool(gpio_get_level(get_pin_num())) != pin_flags_.inverted; }
void ESP32InternalGPIOPin::digital_write(bool value) { gpio_set_level(pin_, value != inverted_ ? 1 : 0); } void ESP32InternalGPIOPin::digital_write(bool value) {
void ESP32InternalGPIOPin::detach_interrupt() const { gpio_intr_disable(pin_); } gpio_set_level(get_pin_num(), value != pin_flags_.inverted ? 1 : 0);
}
void ESP32InternalGPIOPin::detach_interrupt() const { gpio_intr_disable(get_pin_num()); }
} // namespace esp32 } // namespace esp32

33
esphome/components/esp32/gpio.h
View File

@@ -7,11 +7,17 @@
namespace esphome { namespace esphome {
namespace esp32 { namespace esp32 {
// Static assertions to ensure our bit-packed fields can hold the enum values
static_assert(GPIO_NUM_MAX <= 256, "gpio_num_t has too many values for uint8_t");
static_assert(GPIO_DRIVE_CAP_MAX <= 4, "gpio_drive_cap_t has too many values for 2-bit field");
class ESP32InternalGPIOPin : public InternalGPIOPin { class ESP32InternalGPIOPin : public InternalGPIOPin {
public: public:
void set_pin(gpio_num_t pin) { pin_ = pin; } void set_pin(gpio_num_t pin) { pin_ = static_cast<uint8_t>(pin); }
void set_inverted(bool inverted) { inverted_ = inverted; } void set_inverted(bool inverted) { pin_flags_.inverted = inverted; }
void set_drive_strength(gpio_drive_cap_t drive_strength) { drive_strength_ = drive_strength; } void set_drive_strength(gpio_drive_cap_t drive_strength) {
pin_flags_.drive_strength = static_cast<uint8_t>(drive_strength);
}
void set_flags(gpio::Flags flags) { flags_ = flags; } void set_flags(gpio::Flags flags) { flags_ = flags; }
void setup() override; void setup() override;
@@ -21,17 +27,26 @@ class ESP32InternalGPIOPin : public InternalGPIOPin {
std::string dump_summary() const override; std::string dump_summary() const override;
void detach_interrupt() const override; void detach_interrupt() const override;
ISRInternalGPIOPin to_isr() const override; ISRInternalGPIOPin to_isr() const override;
uint8_t get_pin() const override { return (uint8_t) pin_; } uint8_t get_pin() const override { return pin_; }
gpio::Flags get_flags() const override { return flags_; } gpio::Flags get_flags() const override { return flags_; }
bool is_inverted() const override { return inverted_; } bool is_inverted() const override { return pin_flags_.inverted; }
gpio_num_t get_pin_num() const { return static_cast<gpio_num_t>(pin_); }
gpio_drive_cap_t get_drive_strength() const { return static_cast<gpio_drive_cap_t>(pin_flags_.drive_strength); }
protected: protected:
void attach_interrupt(void (*func)(void *), void *arg, gpio::InterruptType type) const override; void attach_interrupt(void (*func)(void *), void *arg, gpio::InterruptType type) const override;
gpio_num_t pin_; // Memory layout: 8 bytes total on 32-bit systems
gpio_drive_cap_t drive_strength_; // - 3 bytes for members below
gpio::Flags flags_; // - 1 byte padding for alignment
bool inverted_; // - 4 bytes for vtable pointer
uint8_t pin_; // GPIO pin number (0-255, actual max ~48 on ESP32)
gpio::Flags flags_; // GPIO flags (1 byte)
struct PinFlags {
uint8_t inverted : 1; // Invert pin logic (1 bit)
uint8_t drive_strength : 2; // Drive strength 0-3 (2 bits)
uint8_t reserved : 5; // Reserved for future use (5 bits)
} pin_flags_; // Total: 1 byte
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables) // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
static bool isr_service_installed; static bool isr_service_installed;
}; };