[add] SPICREATE esp32 s3 support

SPICREATE 2.0.0/src/SPICREATE.cpp

@@ -1,52 +1,52 @@
 // version: 2.0.0
 #include "SPICREATE.h" // 2.0.0
+/** @deprecated csセット用だったが、spi_device_interface_config_tのspics_numで代用することにした */
 void csSet(spi_transaction_t *t)
 {
-    digitalWrite((int)t->user, HIGH);
     return;
 }
+/** @deprecated csセット用だったが、spi_device_interface_config_tのspics_numで代用することにした */
 void csReset(spi_transaction_t *t)
 {
-    digitalWrite((int)t->user, LOW);
     return;
 }
 SPICREATE_BEGIN
 
-bool SPICreate::begin(uint8_t spi_bus, int8_t sck, int8_t miso, int8_t mosi, uint32_t f)
+#if !(IS_S3)
+/**
+ *  @brief SPICreateを利用するときに最初に実行する関数
+ *  ESP32 無印のみ対応の関数としている
+ */
+bool SPICreate::begin(uint8_t spi_bus, int8_t sck, int8_t miso, int8_t mosi, uint32_t unused)
 {
+    spi_host_device_t host_in;
+    host_in = (spi_bus == HSPI) ? HSPI_HOST : VSPI_HOST;
+    return begin(host_in, sck, miso, mosi);
+}
+#endif
 
-    frequency = f;
+bool SPICreate::begin(spi_host_device_t host_in, int8_t sck, int8_t miso, int8_t mosi)
+{
     if ((sck == -1) && (miso == -1) && (mosi == -1))
     {
-        bus_cfg.sclk_io_num = (spi_bus == VSPI) ? SCK : 14;
-        bus_cfg.miso_io_num = (spi_bus == VSPI) ? MISO : 12;
-        bus_cfg.mosi_io_num = (spi_bus == VSPI) ? MOSI : 13;
-    }
-    else
-    {
-        bus_cfg.sclk_io_num = sck;
-        bus_cfg.miso_io_num = miso;
-        bus_cfg.mosi_io_num = mosi;
+#if (IS_S3)
+        sck = 12;
+        miso = 13;
+        mosi = 11;
+#else
+        sck = (host_in == VSPI_HOST) ? VSPI_IOMUX_PIN_NUM_CLK : HSPI_IOMUX_PIN_NUM_CLK;
+        miso = (host_in == VSPI_HOST) ? VSPI_IOMUX_PIN_NUM_MISO : HSPI_IOMUX_PIN_NUM_MISO;
+        mosi = (host_in == VSPI_HOST) ? VSPI_IOMUX_PIN_NUM_MOSI : HSPI_IOMUX_PIN_NUM_MOSI;
+#endif
     }
-
+    bus_cfg.sclk_io_num = sck;
+    bus_cfg.miso_io_num = miso;
+    bus_cfg.mosi_io_num = mosi;
+    bus_cfg.quadwp_io_num = -1; // unused
+    bus_cfg.quadhd_io_num = -1; // unused
     bus_cfg.max_transfer_sz = max_size;
 
-    if ((mode != SPI_MODE1) && (mode != SPI_MODE3))
-    {
-        mode = SPI_MODE3;
-    }
-
-    host = (spi_bus == HSPI) ? HSPI_HOST : VSPI_HOST;
-    dma_chan = 1;
-    if (spi_bus == VSPI)
-    {
-        dma_chan = 1;
-    }
-    if (spi_bus == HSPI)
-    {
-        dma_chan = 2;
-    }
-    esp_err_t e = spi_bus_initialize(host, &bus_cfg, dma_chan);
+    esp_err_t e = spi_bus_initialize(host, &bus_cfg, SPI_DMA_CH_AUTO);
     if (e != ESP_OK)
     {
         // printf("[ERROR] SPI bus initialize failed : %d\n", e);
@@ -69,13 +69,11 @@ bool SPICreate::end()
 int SPICreate::addDevice(spi_device_interface_config_t *if_cfg, int cs)
 {
     deviceNum++;
-    CSs[deviceNum] = cs;
-    pinMode(cs, OUTPUT);
-    digitalWrite(cs, HIGH);
-    if (deviceNum > 9)
+    if (deviceNum > 3)
     {
         return 0;
     }
+    if_cfg->spics_io_num = cs;
     esp_err_t e = spi_bus_add_device(host, if_cfg, &handle[deviceNum]);
     if (e != ESP_OK)
     {
@@ -100,7 +98,6 @@ void SPICreate::sendCmd(uint8_t cmd, int deviceHandle)
     comm.flags = SPI_TRANS_USE_TXDATA;
     comm.length = 8;
     comm.tx_data[0] = cmd;
-    comm.user = (void *)CSs[deviceHandle];
     pollTransmit(&comm, deviceHandle);
 }
 uint8_t SPICreate::readByte(uint8_t addr, int deviceHandle)
@@ -109,7 +106,6 @@ uint8_t SPICreate::readByte(uint8_t addr, int deviceHandle)
     comm.flags = SPI_TRANS_USE_RXDATA | SPI_TRANS_USE_TXDATA;
     comm.tx_data[0] = addr;
     comm.length = 16;
-    comm.user = (void *)CSs[deviceHandle];
     pollTransmit(&comm, deviceHandle);
     return comm.rx_data[1];
 }
@@ -138,9 +134,7 @@ void SPICreate::transmit(uint8_t *tx, uint8_t *rx, int size, int deviceHandle)
 
 void SPICreate::transmit(spi_transaction_t *transaction, int deviceHandle)
 {
-    digitalWrite(CSs[deviceHandle], LOW);
-    esp_err_t e = spi_device_transmit(handle[deviceHandle], transaction);
-    digitalWrite(CSs[deviceHandle], HIGH);
+    spi_device_transmit(handle[deviceHandle], transaction);
     return;
 }
 void SPICreate::pollTransmit(spi_transaction_t *transaction, int deviceHandle)

SPICREATE 2.0.0/src/SPICREATE.h

@@ -4,10 +4,16 @@
 #ifndef SPICREATE_Master
 #define SPICREATE_Master
 
-#include <Arduino.h>
-#include <SPI.h>
 #include <driver/spi_master.h>
-#include <deque>
+#include <esp32-hal-spi.h>
+
+#ifdef CONFIG_IDF_TARGET_ESP32S3
+#define IS_S3 1
+#elif CONFIG_IDF_TARGET_ESP32
+#define IS_S3 0
+#else
+#error "No supported board specified!!!"
+#endif
 
 void csSet(spi_transaction_t *t);
 void csReset(spi_transaction_t *t);
@@ -23,20 +29,31 @@ namespace arduino
                 class SPICreate
                 {
                     spi_bus_config_t bus_cfg = {};
-                    spi_device_handle_t handle[10];
-                    int CSs[10];
+                    spi_device_handle_t handle[3];
                     int deviceNum{0};
+#if IS_S3
+                    spi_host_device_t host{SPI2_HOST};
+#else
                     spi_host_device_t host{HSPI_HOST};
-                    uint8_t mode{SPI_MODE3}; // must be 1 or 3
-                    int dma_chan{1};         // must be 1 or 2
-                    int max_size{4094};      // default size
-                    uint32_t frequency{SPI_MASTER_FREQ_8M};
-
-                    std::deque<spi_transaction_t> transactions;
-                    int queue_size{1};
+#endif
+                    uint8_t mode{SPI_MODE3};       // must be 1 or 3
+                    int max_size{SPI_MAX_DMA_LEN}; // default size
 
                 public:
-                    bool begin(uint8_t spi_bus = HSPI, int8_t sck = -1, int8_t miso = -1, int8_t mosi = -1, uint32_t f = 8000000);
+#if !(IS_S3)
+                    bool begin(
+                        uint8_t spi_bus = HSPI,
+                        int8_t sck = -1,
+                        int8_t miso = -1,
+                        int8_t mosi = -1,
+                        uint32_t unused = SPI_MASTER_FREQ_8M);
+#endif
+                    bool begin(
+                        spi_host_device_t host_in = SPI2_HOST,
+                        int8_t sck = -1,
+                        int8_t miso = -1,
+                        int8_t mosi = -1);
+
                     bool end();
 
                     int addDevice(spi_device_interface_config_t *if_cfg, int cs);
@@ -53,8 +70,8 @@ namespace arduino
                     void pollTransmit(spi_transaction_t *transaction, int deviceHandle);
                 };
             } // dma
-        }     // spi
-    }         // esp32
+        } // spi
+    } // esp32
 } // arduino
 
 #ifndef SPICREATE_BEGIN