From 641eea5fba6afa16452567b95f851ffcb89ddb81 Mon Sep 17 00:00:00 2001
From: unregist <22579156+unregist@users.noreply.github.com>
Date: Fri, 6 Dec 2024 08:29:36 +1000
Subject: [PATCH] Move pin configuration to YAML

Move pin configuration to YAML
---
 .../components/MhiAcCtrl/MHI-AC-Ctrl-core.cpp | 43 +++++++++++++------
 .../components/MhiAcCtrl/MHI-AC-Ctrl-core.h   | 10 ++---
 esphome/components/MhiAcCtrl/climate.py       | 41 ++++++++++++++++--
 esphome/components/MhiAcCtrl/mhi_ac_ctrl.h    | 11 +++++
 esphome/example.yaml                          |  6 +++
 5 files changed, 91 insertions(+), 20 deletions(-)

diff --git a/esphome/components/MhiAcCtrl/MHI-AC-Ctrl-core.cpp b/esphome/components/MhiAcCtrl/MHI-AC-Ctrl-core.cpp
index 22bcc89..8776a65 100644
--- a/esphome/components/MhiAcCtrl/MHI-AC-Ctrl-core.cpp
+++ b/esphome/components/MhiAcCtrl/MHI-AC-Ctrl-core.cpp
@@ -8,6 +8,7 @@
 #include <math.h>
 #include <string.h>
 
+#include "esphome/core/gpio.h"
 #include "driver/timer.h"
 #include "driver/spi_slave.h"
 #include "driver/gpio.h"
@@ -43,6 +44,12 @@ static uint8_t mosi_frame_snapshot[DB14];
 static uint8_t mosi_frame_snapshot_prev[DB14];
 static uint32_t frame_errors = 0;
 
+extern int gpio_mosi_pin;
+extern int gpio_miso_pin;
+extern int gpio_sclk_pin;
+extern int gpio_cs_in_pin;
+extern int gpio_cs_out_pin;
+
 namespace mhi_ac {
 MHIEnergy mhi_energy(230);
 
@@ -58,12 +65,14 @@ static bool IRAM_ATTR timer_group_isr_callback(void *args)
     esp_err_t err;
     BaseType_t xHigherPriorityTaskWoken;
     // Trigger Chip Select
-    gpio_set_level(GPIO_CS_OUT, 1);
+     gpio_set_level((gpio_num_t)gpio_cs_out_pin, 1);
+    // gpio_set_level(GPIO_CS_OUT, 1);
     if(ready) {
         spi_slave_transaction_t *t = (spi_slave_transaction_t *) args;
         err = spi_slave_queue_trans(RCV_HOST, t, 0);
     }
-    gpio_set_level(GPIO_CS_OUT, 0);
+    gpio_set_level((gpio_num_t)gpio_cs_out_pin, 0);
+    // gpio_set_level(GPIO_CS_OUT, 0);
     return false;
 }
 
@@ -322,9 +331,12 @@ static void mhi_poll_task(void *arg)
 
     // configuration for the SPI bus
     spi_bus_config_t buscfg={
-        .mosi_io_num = GPIO_MOSI,
-        .miso_io_num = GPIO_MISO,
-        .sclk_io_num = GPIO_SCLK,
+        .mosi_io_num = (gpio_num_t)gpio_mosi_pin,
+        .miso_io_num = (gpio_num_t)gpio_miso_pin,
+        .sclk_io_num = (gpio_num_t)gpio_sclk_pin,
+        // .mosi_io_num = GPIO_MOSI,
+        // .miso_io_num = GPIO_MISO,
+        // .sclk_io_num = GPIO_SCLK,
         .quadwp_io_num = -1,
         .quadhd_io_num = -1,
         .flags = SPICOMMON_BUSFLAG_GPIO_PINS | SPICOMMON_BUSFLAG_SLAVE,
@@ -332,7 +344,8 @@ static void mhi_poll_task(void *arg)
 
     // configuration for the SPI slave interface
     spi_slave_interface_config_t slvcfg={
-        .spics_io_num = GPIO_CS_IN,
+        .spics_io_num = (gpio_num_t)gpio_cs_in_pin,
+        // .spics_io_num = GPIO_CS_IN,
         .flags = SPI_SLAVE_BIT_LSBFIRST,
         .queue_size = 1,
         .mode = 3,                    //CPOL=1, CPHA=1
@@ -366,7 +379,8 @@ static void mhi_poll_task(void *arg)
 
     gpio_config_t io_conf = {};
     io_conf.mode = GPIO_MODE_INPUT;
-    io_conf.pin_bit_mask = (1ULL<<GPIO_SCLK);
+    io_conf.pin_bit_mask = (1ULL<<gpio_sclk_pin);
+    // io_conf.pin_bit_mask = (1ULL<<GPIO_SCLK);
     io_conf.pull_down_en = GPIO_PULLDOWN_DISABLE;
     io_conf.pull_up_en = GPIO_PULLUP_ENABLE;                                     // required to prevent abort() caused by floating pin when daughtboard not connected
     io_conf.intr_type = GPIO_INTR_LOW_LEVEL;                    // when this is set to NEGEDGE, DMA sometimes doesn't read the last 4 bytes
@@ -377,17 +391,22 @@ static void mhi_poll_task(void *arg)
 
 
     gpio_install_isr_service(ESP_INTR_FLAG_DEFAULT);
-    gpio_isr_handler_add(GPIO_SCLK, gpio_isr_handler, NULL);
-    //gpio_intr_disable(GPIO_SCLK);
-    gpio_intr_enable(GPIO_SCLK);
+    gpio_isr_handler_add((gpio_num_t)gpio_sclk_pin, gpio_isr_handler, NULL);
+    //gpio_intr_disable((gpio_num_t)gpio_sclk_pin);
+    gpio_intr_enable((gpio_num_t)gpio_sclk_pin);
+    // gpio_isr_handler_add(GPIO_SCLK, gpio_isr_handler, NULL);
+    // //gpio_intr_disable(GPIO_SCLK);
+    // gpio_intr_enable(GPIO_SCLK);
 
     io_conf.mode = GPIO_MODE_OUTPUT;
-    io_conf.pin_bit_mask = (1ULL<<GPIO_CS_OUT);
+    io_conf.pin_bit_mask = (1ULL<<(gpio_num_t)gpio_cs_out_pin);
+    // io_conf.pin_bit_mask = (1ULL<<GPIO_CS_OUT);
     io_conf.intr_type =GPIO_INTR_DISABLE;
     io_conf.pull_up_en = GPIO_PULLUP_DISABLE;
     gpio_config(&io_conf);
 
-    gpio_set_level(GPIO_CS_OUT, 1);
+    gpio_set_level((gpio_num_t)gpio_cs_out_pin, 1);
+    // gpio_set_level(GPIO_CS_OUT, 1);
 
     //Set up a transaction of MHI_FRAME_LEN bytes to send/receive
     spi_slave_trans.length = MHI_FRAME_LEN*8;
diff --git a/esphome/components/MhiAcCtrl/MHI-AC-Ctrl-core.h b/esphome/components/MhiAcCtrl/MHI-AC-Ctrl-core.h
index 8aa6dd3..79a010d 100644
--- a/esphome/components/MhiAcCtrl/MHI-AC-Ctrl-core.h
+++ b/esphome/components/MhiAcCtrl/MHI-AC-Ctrl-core.h
@@ -5,11 +5,11 @@
 
 // # Config
 // ## pin defintions
-#define GPIO_MOSI                   7
-#define GPIO_MISO                   2
-#define GPIO_SCLK                   GPIO_NUM_6
-#define GPIO_CS_OUT                 GPIO_NUM_9
-#define GPIO_CS_IN                  10
+// #define GPIO_MOSI                   7
+// #define GPIO_MISO                   2
+// #define GPIO_SCLK                   GPIO_NUM_6
+// #define GPIO_CS_OUT                 GPIO_NUM_9
+// #define GPIO_CS_IN                  10
 
 #define RCV_HOST                    SPI2_HOST
 
diff --git a/esphome/components/MhiAcCtrl/climate.py b/esphome/components/MhiAcCtrl/climate.py
index ec28726..7c4ef80 100644
--- a/esphome/components/MhiAcCtrl/climate.py
+++ b/esphome/components/MhiAcCtrl/climate.py
@@ -2,17 +2,52 @@
 import esphome.config_validation as cv
 from esphome.components import climate
 from esphome.core import coroutine
+from esphome import pins
 from . import MhiAcCtrl, CONF_MHI_AC_CTRL_ID
 
+CONF_MOSI_PIN = "mosi_pin"
+CONF_MISO_PIN = "miso_pin"
+CONF_SCLK_PIN = "sclk_pin"
+CONF_CS_IN_PIN = "cs_in_pin"
+CONF_CS_OUT_PIN = "cs_out_pin"
+
+TYPES = [
+    CONF_MOSI_PIN,
+    CONF_MISO_PIN, 
+    CONF_SCLK_PIN, 
+    CONF_CS_IN_PIN, 
+    CONF_CS_OUT_PIN,
+]
+
 CONFIG_SCHEMA = climate.CLIMATE_SCHEMA.extend(
     {
         cv.GenerateID(): cv.declare_id(MhiAcCtrl),
         cv.GenerateID(CONF_MHI_AC_CTRL_ID): cv.use_id(MhiAcCtrl),
+        cv.Optional(CONF_MOSI_PIN, default="GPIO7"): pins.gpio_input_pin_schema,
+        cv.Optional(CONF_MISO_PIN, default="GPIO2"): pins.gpio_output_pin_schema,
+        cv.Optional(CONF_SCLK_PIN, default="GPIO6"): pins.gpio_input_pin_schema,
+        cv.Optional(CONF_CS_IN_PIN, default="GPIO10"): pins.gpio_input_pin_schema,
+        cv.Optional(CONF_CS_OUT_PIN, default="GPIO9"): pins.gpio_output_pin_schema,
     }
 ).extend(cv.COMPONENT_SCHEMA)
 
 
 @coroutine
-def to_code(config):
-    paren = yield cg.get_variable(config[CONF_MHI_AC_CTRL_ID])
-    yield climate.register_climate(paren, config)
+async def to_code(config):
+    paren = await cg.get_variable(config[CONF_MHI_AC_CTRL_ID])
+    await climate.register_climate(paren, config)
+
+    mosi_pin = await cg.gpio_pin_expression(config[CONF_MOSI_PIN])
+    cg.add(paren.set_mosi_pin(mosi_pin))
+
+    miso_pin = await cg.gpio_pin_expression(config[CONF_MISO_PIN])
+    cg.add(paren.set_miso_pin(miso_pin))
+
+    sclk_pin = await cg.gpio_pin_expression(config[CONF_SCLK_PIN])
+    cg.add(paren.set_sclk_pin(sclk_pin))
+
+    cs_in_pin = await cg.gpio_pin_expression(config[CONF_CS_IN_PIN])
+    cg.add(paren.set_cs_in_pin(cs_in_pin))
+
+    cs_out_pin = await cg.gpio_pin_expression(config[CONF_CS_OUT_PIN])
+    cg.add(paren.set_cs_out_pin(cs_out_pin))
diff --git a/esphome/components/MhiAcCtrl/mhi_ac_ctrl.h b/esphome/components/MhiAcCtrl/mhi_ac_ctrl.h
index 78f0d59..9312b8c 100644
--- a/esphome/components/MhiAcCtrl/mhi_ac_ctrl.h
+++ b/esphome/components/MhiAcCtrl/mhi_ac_ctrl.h
@@ -1,5 +1,6 @@
 #include "MHI-AC-Ctrl-core.h"
 
+#include "esphome/core/gpio.h"
 #include "esphome/components/climate/climate.h"
 #include "esphome/components/sensor/sensor.h"
 #ifdef USE_SWITCH
@@ -19,6 +20,11 @@ using namespace esphome::switch_;
 using namespace mhi_ac;
 
 static const char* TAG = "mhi_ac_ctrl";
+int gpio_mosi_pin;
+int gpio_miso_pin;
+int gpio_sclk_pin;
+int gpio_cs_in_pin;
+int gpio_cs_out_pin;
 
 class MhiFrameErrors : public Sensor {
 public:
@@ -159,6 +165,11 @@ class MhiVanesUD : public select::Select {
 class MhiAcCtrl : public climate::Climate,
                   public Component {
 public:
+    void set_mosi_pin(InternalGPIOPin *pin) { gpio_mosi_pin = pin->get_pin(); }
+    void set_miso_pin(InternalGPIOPin *pin) { gpio_miso_pin = pin->get_pin(); }
+    void set_sclk_pin(InternalGPIOPin *pin) { gpio_sclk_pin = pin->get_pin(); }
+    void set_cs_in_pin(InternalGPIOPin *pin) { gpio_cs_in_pin = pin->get_pin(); }
+    void set_cs_out_pin(InternalGPIOPin *pin) { gpio_cs_out_pin = pin->get_pin(); }
     void setup() override
     {
         auto restore = this->restore_state_();
diff --git a/esphome/example.yaml b/esphome/example.yaml
index cab62f3..6aef0a8 100755
--- a/esphome/example.yaml
+++ b/esphome/example.yaml
@@ -30,6 +30,12 @@ climate:
     mhi_ac_ctrl_id: ${mhi_device_id}
     id: ${device_id}
     name: "${device_name}"
+    ## Optional PIN config. Default values:
+    #mosi_pin: GPIO7
+    #miso_pin: GPIO2 
+    #sclk_pin: GPIO6
+    #cs_in_pin: GPIO10
+    #cs_out_pin: GPIO9
 
 select:
   - platform: MhiAcCtrl