diff --git a/src/lgfx/v1/platforms/esp32/Bus_QSPI.cpp b/src/lgfx/v1/platforms/esp32/Bus_QSPI.cpp index 8cb71164..ccdd126c 100644 --- a/src/lgfx/v1/platforms/esp32/Bus_QSPI.cpp +++ b/src/lgfx/v1/platforms/esp32/Bus_QSPI.cpp @@ -20,6 +20,9 @@ #include "Bus_QSPI.hpp" +#if defined LGFX_USE_QSPI + + /// ESP32-S3をターゲットにした際にREG_SPI_BASEが定義されていなかったので応急処置 ; #if defined ( CONFIG_IDF_TARGET_ESP32S3 ) #if !defined( REG_SPI_BASE ) @@ -1101,3 +1104,4 @@ namespace lgfx } #endif +#endif diff --git a/src/lgfx/v1/platforms/esp32/Bus_QSPI.hpp b/src/lgfx/v1/platforms/esp32/Bus_QSPI.hpp index e9f91605..1c261dc5 100644 --- a/src/lgfx/v1/platforms/esp32/Bus_QSPI.hpp +++ b/src/lgfx/v1/platforms/esp32/Bus_QSPI.hpp @@ -56,6 +56,10 @@ #include "../../Bus.hpp" #include "../common.hpp" + +#if defined LGFX_USE_QSPI + + namespace lgfx { inline namespace v1 @@ -212,3 +216,5 @@ namespace lgfx //---------------------------------------------------------------------------- } } + +#endif diff --git a/src/lgfx/v1/platforms/esp32/common.cpp b/src/lgfx/v1/platforms/esp32/common.cpp index b019a1a9..62d19c80 100644 --- a/src/lgfx/v1/platforms/esp32/common.cpp +++ b/src/lgfx/v1/platforms/esp32/common.cpp @@ -534,6 +534,7 @@ namespace lgfx +#if defined LGFX_USE_QSPI cpp::result initQuad(int spi_host, int spi_sclk, int spi_io0, int spi_io1, int spi_io2, int spi_io3) { @@ -620,8 +621,7 @@ namespace lgfx } - - +#endif diff --git a/src/lgfx/v1/platforms/esp32/common.hpp b/src/lgfx/v1/platforms/esp32/common.hpp index 37550496..7151b1dc 100644 --- a/src/lgfx/v1/platforms/esp32/common.hpp +++ b/src/lgfx/v1/platforms/esp32/common.hpp @@ -48,6 +48,7 @@ Original Source: #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0) #define LGFX_IDF_V5 #endif + #define LGFX_USE_QSPI #endif namespace lgfx @@ -258,7 +259,9 @@ namespace lgfx namespace spi { cpp::result init(int spi_host, int spi_sclk, int spi_miso, int spi_mosi, int dma_channel); +#if defined LGFX_USE_QSPI cpp::result initQuad(int spi_host, int spi_sclk, int spi_io0, int spi_io1, int spi_io2, int spi_io3, int dma_channel); +#endif void beginTransaction(int spi_host); } diff --git a/src/lgfx/v1_init.hpp b/src/lgfx/v1_init.hpp index d04f922e..a7fd0fc7 100644 --- a/src/lgfx/v1_init.hpp +++ b/src/lgfx/v1_init.hpp @@ -48,7 +48,6 @@ Original Source: #include "v1/panel/Panel_ST7735.hpp" #include "v1/panel/Panel_ST7789.hpp" #include "v1/panel/Panel_ST7796.hpp" -#include "v1/panel/Panel_SH8601Z.hpp" // EPD #include "v1/panel/Panel_GDEW0154M09.hpp" diff --git a/src/lgfx_user/LGFX_Monica.hpp b/src/lgfx_user/LGFX_Monica.hpp index 128ae577..681ab115 100644 --- a/src/lgfx_user/LGFX_Monica.hpp +++ b/src/lgfx_user/LGFX_Monica.hpp @@ -10,6 +10,7 @@ */ #pragma once #include +#include /// 独自の設定を行うクラスを、LGFX_Deviceから派生して作成します。