MCP23XXX Refactor (#1560)

* Refactor MCP23XXX classes to consolidate shared code

* Update test mcp23xxx pin schemas

esphome/components/mcp23x08_base/__init__.py

@@ -0,0 +1,8 @@
+import esphome.codegen as cg
+from esphome.components import mcp23xxx_base
+
+AUTO_LOAD = ["mcp23xxx_base"]
+CODEOWNERS = ["@jesserockz"]
+
+mcp23x08_base_ns = cg.esphome_ns.namespace("mcp23x08_base")
+MCP23X08Base = mcp23x08_base_ns.class_("MCP23X08Base", mcp23xxx_base.MCP23XXXBase)

esphome/components/mcp23x08_base/mcp23x08_base.cpp

@@ -0,0 +1,89 @@
+#include "mcp23x08_base.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace mcp23x08_base {
+
+static const char *TAG = "mcp23x08_base";
+
+bool MCP23X08Base::digital_read(uint8_t pin) {
+  uint8_t bit = pin % 8;
+  uint8_t reg_addr = mcp23x08_base::MCP23X08_GPIO;
+  uint8_t value = 0;
+  this->read_reg(reg_addr, &value);
+  return value & (1 << bit);
+}
+
+void MCP23X08Base::digital_write(uint8_t pin, bool value) {
+  uint8_t reg_addr = mcp23x08_base::MCP23X08_OLAT;
+  this->update_reg(pin, value, reg_addr);
+}
+
+void MCP23X08Base::pin_mode(uint8_t pin, uint8_t mode) {
+  uint8_t iodir = mcp23x08_base::MCP23X08_IODIR;
+  uint8_t gppu = mcp23x08_base::MCP23X08_GPPU;
+  switch (mode) {
+    case mcp23xxx_base::MCP23XXX_INPUT:
+      this->update_reg(pin, true, iodir);
+      break;
+    case mcp23xxx_base::MCP23XXX_INPUT_PULLUP:
+      this->update_reg(pin, true, iodir);
+      this->update_reg(pin, true, gppu);
+      break;
+    case mcp23xxx_base::MCP23XXX_OUTPUT:
+      this->update_reg(pin, false, iodir);
+      break;
+    default:
+      break;
+  }
+}
+
+void MCP23X08Base::pin_interrupt_mode(uint8_t pin, mcp23xxx_base::MCP23XXXInterruptMode interrupt_mode) {
+  uint8_t gpinten = mcp23x08_base::MCP23X08_GPINTEN;
+  uint8_t intcon = mcp23x08_base::MCP23X08_INTCON;
+  uint8_t defval = mcp23x08_base::MCP23X08_DEFVAL;
+
+  switch (interrupt_mode) {
+    case mcp23xxx_base::MCP23XXX_CHANGE:
+      this->update_reg(pin, true, gpinten);
+      this->update_reg(pin, false, intcon);
+      break;
+    case mcp23xxx_base::MCP23XXX_RISING:
+      this->update_reg(pin, true, gpinten);
+      this->update_reg(pin, true, intcon);
+      this->update_reg(pin, true, defval);
+      break;
+    case mcp23xxx_base::MCP23XXX_FALLING:
+      this->update_reg(pin, true, gpinten);
+      this->update_reg(pin, true, intcon);
+      this->update_reg(pin, false, defval);
+      break;
+    case mcp23xxx_base::MCP23XXX_NO_INTERRUPT:
+      this->update_reg(pin, false, gpinten);
+      break;
+  }
+}
+
+void MCP23X08Base::update_reg(uint8_t pin, bool pin_value, uint8_t reg_addr) {
+  uint8_t bit = pin % 8;
+  uint8_t reg_value = 0;
+  if (reg_addr == mcp23x08_base::MCP23X08_OLAT) {
+    reg_value = this->olat_;
+  } else {
+    this->read_reg(reg_addr, &reg_value);
+  }
+
+  if (pin_value)
+    reg_value |= 1 << bit;
+  else
+    reg_value &= ~(1 << bit);
+
+  this->write_reg(reg_addr, reg_value);
+
+  if (reg_addr == mcp23x08_base::MCP23X08_OLAT) {
+    this->olat_ = reg_value;
+  }
+}
+
+}  // namespace mcp23x08_base
+}  // namespace esphome

esphome/components/mcp23x08_base/mcp23x08_base.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/mcp23xxx_base/mcp23xxx_base.h"
+#include "esphome/core/esphal.h"
+
+namespace esphome {
+namespace mcp23x08_base {
+
+enum MCP23S08GPIORegisters {
+  // A side
+  MCP23X08_IODIR = 0x00,
+  MCP23X08_IPOL = 0x01,
+  MCP23X08_GPINTEN = 0x02,
+  MCP23X08_DEFVAL = 0x03,
+  MCP23X08_INTCON = 0x04,
+  MCP23X08_IOCON = 0x05,
+  MCP23X08_GPPU = 0x06,
+  MCP23X08_INTF = 0x07,
+  MCP23X08_INTCAP = 0x08,
+  MCP23X08_GPIO = 0x09,
+  MCP23X08_OLAT = 0x0A,
+};
+
+class MCP23X08Base : public mcp23xxx_base::MCP23XXXBase {
+ public:
+  bool digital_read(uint8_t pin) override;
+  void digital_write(uint8_t pin, bool value) override;
+  void pin_mode(uint8_t pin, uint8_t mode) override;
+  void pin_interrupt_mode(uint8_t pin, mcp23xxx_base::MCP23XXXInterruptMode interrupt_mode) override;
+
+ protected:
+  void update_reg(uint8_t pin, bool pin_value, uint8_t reg_a) override;
+
+  uint8_t olat_{0x00};
+};
+
+}  // namespace mcp23x08_base
+}  // namespace esphome