Moving LovyanGFX from submodule to Arduino/Plaformio library dependency

.travis.yml

@@ -52,6 +52,7 @@ before_install:
 
   # Install the library from the repository
   - install_library
+  - install_library "LovyanGFX"
   - install_package "esp32:esp32" "https://dl.espressif.com/dl/package_esp32_index.json" #  # esp32:esp32:m5stack-core-esp32
   - pip install pyserial
 
@@ -71,7 +72,7 @@ script:
   - build_sketch "${TRAVIS_BUILD_DIR}/examples/Advanced/Display/TFT_FillArcSpiral/TFT_FillArcSpiral.ino" "esp32:esp32:m5stack-core-esp32:FlashFreq=80,UploadSpeed=921600" "false" "oldest" "newest"
   - build_sketch "${TRAVIS_BUILD_DIR}/examples/Advanced/Display/TFT_Mandlebrot/TFT_Mandlebrot.ino" "esp32:esp32:m5stack-core-esp32:FlashFreq=80,UploadSpeed=921600" "false" "oldest" "newest"
   - build_sketch "${TRAVIS_BUILD_DIR}/examples/Advanced/Display/TFT_Spiro/TFT_Spiro.ino" "esp32:esp32:m5stack-core-esp32:FlashFreq=80,UploadSpeed=921600" "false" "oldest" "newest"
-  
+
   #- if [ "$TRAVIS_BRANCH" != "master" ]; then echo "This commit was made against the $TRAVIS_BRANCH, skipping examples compilation"; exit 0; fi
   #- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then echo "This is a pull request, skipping examples compilation"; exit 0; fi
   # compile all examples (will result in timeout if too many sketches are found)

README.md

@@ -78,8 +78,8 @@ Sketch compilation can eventually be tuned-up to a specific device by using macr
         #warning ODROID DETECTED !!
       #elif defined( ARDUINO_TTGO_T1 )
         #warning Lilygo TTGO-TS DETECTED !!
-      #elif defined ( ARDUINO_ESP32_DEV )
-        #warning WROVER DETECTED !!
+      #elif defined ( ARDUINO_ESP32_WROVER_KIT )
+        #warning ESP32 WROVER Kit DETECTED !!
       #else
         #warning NOTHING DETECTED !!
       #endif

boards/esp32-wrover-kit/boards.local.txt

@@ -0,0 +1,119 @@
+
+
+esp32wroverkit.name=ESP32-Wrover-Kit
+esp32wroverkit.upload.tool=esptool_py
+esp32wroverkit.upload.maximum_size=1310720
+esp32wroverkit.upload.maximum_data_size=327680
+esp32wroverkit.upload.wait_for_upload_port=true
+esp32wroverkit.serial.disableDTR=true
+esp32wroverkit.serial.disableRTS=true
+esp32wroverkit.build.mcu=esp32
+esp32wroverkit.build.core=esp32
+esp32wroverkit.build.variant=esp32
+esp32wroverkit.build.board=ESP32_WROVER_KIT
+esp32wroverkit.build.f_cpu=240000000L
+esp32wroverkit.menu.CPUFreq.240=240MHz (WiFi/BT)
+esp32wroverkit.menu.CPUFreq.240.build.f_cpu=240000000L
+esp32wroverkit.menu.CPUFreq.160=160MHz (WiFi/BT)
+esp32wroverkit.menu.CPUFreq.160.build.f_cpu=160000000L
+esp32wroverkit.menu.CPUFreq.80=80MHz (WiFi/BT)
+esp32wroverkit.menu.CPUFreq.80.build.f_cpu=80000000L
+esp32wroverkit.menu.CPUFreq.40=40MHz (40MHz XTAL)
+esp32wroverkit.menu.CPUFreq.40.build.f_cpu=40000000L
+esp32wroverkit.menu.CPUFreq.26=26MHz (26MHz XTAL)
+esp32wroverkit.menu.CPUFreq.26.build.f_cpu=26000000L
+esp32wroverkit.menu.CPUFreq.20=20MHz (40MHz XTAL)
+esp32wroverkit.menu.CPUFreq.20.build.f_cpu=20000000L
+esp32wroverkit.menu.CPUFreq.13=13MHz (26MHz XTAL)
+esp32wroverkit.menu.CPUFreq.13.build.f_cpu=13000000L
+esp32wroverkit.menu.CPUFreq.10=10MHz (40MHz XTAL)
+esp32wroverkit.menu.CPUFreq.10.build.f_cpu=10000000L
+esp32wroverkit.build.flash_size=4MB
+esp32wroverkit.build.flash_freq=40m
+esp32wroverkit.menu.FlashSize.4M=4MB (32Mb)
+esp32wroverkit.menu.FlashSize.4M.build.flash_size=4MB
+esp32wroverkit.menu.FlashSize.8M=8MB (64Mb)
+esp32wroverkit.menu.FlashSize.8M.build.flash_size=8MB
+esp32wroverkit.menu.FlashSize.8M.build.partitions=default_8MB
+esp32wroverkit.menu.FlashSize.2M=2MB (16Mb)
+esp32wroverkit.menu.FlashSize.2M.build.flash_size=2MB
+esp32wroverkit.menu.FlashSize.2M.build.partitions=minimal
+esp32wroverkit.menu.FlashSize.16M=16MB (128Mb)
+esp32wroverkit.menu.FlashSize.16M.build.flash_size=16MB
+esp32wroverkit.build.flash_mode=dio
+esp32wroverkit.build.boot=dio
+esp32wroverkit.build.partitions=default
+esp32wroverkit.menu.PSRAM.enabled=Enabled
+esp32wroverkit.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue
+esp32wroverkit.menu.PSRAM.disabled=Disabled
+esp32wroverkit.menu.PSRAM.disabled.build.defines=
+esp32wroverkit.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+esp32wroverkit.menu.PartitionScheme.default.build.partitions=default
+esp32wroverkit.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+esp32wroverkit.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+esp32wroverkit.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
+esp32wroverkit.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+esp32wroverkit.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+esp32wroverkit.menu.PartitionScheme.minimal.build.partitions=minimal
+esp32wroverkit.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+esp32wroverkit.menu.PartitionScheme.no_ota.build.partitions=no_ota
+esp32wroverkit.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+esp32wroverkit.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+esp32wroverkit.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+esp32wroverkit.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+esp32wroverkit.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+esp32wroverkit.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+esp32wroverkit.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+esp32wroverkit.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+esp32wroverkit.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+esp32wroverkit.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+esp32wroverkit.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+esp32wroverkit.menu.PartitionScheme.huge_app.build.partitions=huge_app
+esp32wroverkit.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+esp32wroverkit.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+esp32wroverkit.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+esp32wroverkit.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+esp32wroverkit.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
+esp32wroverkit.menu.PartitionScheme.fatflash.build.partitions=ffat
+esp32wroverkit.menu.FlashMode.qio=QIO
+esp32wroverkit.menu.FlashMode.qio.build.flash_mode=dio
+esp32wroverkit.menu.FlashMode.qio.build.boot=qio
+esp32wroverkit.menu.FlashMode.dio=DIO
+esp32wroverkit.menu.FlashMode.dio.build.flash_mode=dio
+esp32wroverkit.menu.FlashMode.dio.build.boot=dio
+esp32wroverkit.menu.FlashMode.qout=QOUT
+esp32wroverkit.menu.FlashMode.qout.build.flash_mode=dout
+esp32wroverkit.menu.FlashMode.qout.build.boot=qout
+esp32wroverkit.menu.FlashMode.dout=DOUT
+esp32wroverkit.menu.FlashMode.dout.build.flash_mode=dout
+esp32wroverkit.menu.FlashMode.dout.build.boot=dout
+esp32wroverkit.menu.FlashFreq.80=80MHz
+esp32wroverkit.menu.FlashFreq.80.build.flash_freq=80m
+esp32wroverkit.menu.FlashFreq.40=40MHz
+esp32wroverkit.menu.FlashFreq.40.build.flash_freq=40m
+esp32wroverkit.menu.UploadSpeed.921600=921600
+esp32wroverkit.menu.UploadSpeed.921600.upload.speed=921600
+esp32wroverkit.menu.UploadSpeed.115200=115200
+esp32wroverkit.menu.UploadSpeed.115200.upload.speed=115200
+esp32wroverkit.menu.UploadSpeed.256000.windows=256000
+esp32wroverkit.menu.UploadSpeed.256000.upload.speed=256000
+esp32wroverkit.menu.UploadSpeed.230400.windows.upload.speed=256000
+esp32wroverkit.menu.UploadSpeed.230400=230400
+esp32wroverkit.menu.UploadSpeed.230400.upload.speed=230400
+esp32wroverkit.menu.UploadSpeed.460800.linux=460800
+esp32wroverkit.menu.UploadSpeed.460800.macosx=460800
+esp32wroverkit.menu.UploadSpeed.460800.upload.speed=460800
+esp32wroverkit.menu.UploadSpeed.512000.windows=512000
+esp32wroverkit.menu.UploadSpeed.512000.upload.speed=512000
+esp32wroverkit.menu.DebugLevel.none=None
+esp32wroverkit.menu.DebugLevel.none.build.code_debug=0
+esp32wroverkit.menu.DebugLevel.error=Error
+esp32wroverkit.menu.DebugLevel.error.build.code_debug=1
+esp32wroverkit.menu.DebugLevel.warn=Warn
+esp32wroverkit.menu.DebugLevel.warn.build.code_debug=2
+esp32wroverkit.menu.DebugLevel.info=Info
+esp32wroverkit.menu.DebugLevel.info.build.code_debug=3
+esp32wroverkit.menu.DebugLevel.debug=Debug
+esp32wroverkit.menu.DebugLevel.debug.build.code_debug=4
+esp32wroverkit.menu.DebugLevel.verbose=Verbose
+esp32wroverkit.menu.DebugLevel.verbose.build.code_debug=5

library.json

@@ -10,7 +10,12 @@
     "type": "git",
     "url": "https://github.com/tobozo/ESP32-Chimera-Core.git"
   },
-  "version": "1.0.2",
+  "dependencies": [
+    {
+      "name": "LovyanGFX"
+    }
+  ],
+  "version": "1.0.3",
   "framework": "arduino",
   "platforms": "espressif32"
 }

library.properties

@@ -1,5 +1,5 @@
 name=ESP32-Chimera-Core
-version=1.0.2
+version=1.0.3
 author=Lovyan03 & Tobozo
 maintainer=tobozo@noreply.github.com
 sentence=Alternate library M5Stack/Odroid-Go/D-Duino and possiblly other ESP32/TFT/SD bundles
@@ -8,3 +8,4 @@ category=Device Control
 url=https://github.com/tobozo/ESP32-Chimera-Core
 architectures=esp32
 includes=M5Stack.h
+depends=LovyanGFX

src/M5Display.h

@@ -6,7 +6,9 @@
 #include <SPIFFS.h>
 #include <SD.h>
 
-#include "LovyanGFX/src/LGFX_TFT_eSPI.hpp"
+//#include "LovyanGFX/src/LGFX_TFT_eSPI.hpp"
+#include <LGFX_TFT_eSPI.hpp>
+
 
 #ifdef TOUCH_CS
   #include "utility/TouchButton.h"
@@ -37,7 +39,7 @@ namespace colors  // Color definitions for backwards compatibility with old sket
 
 using namespace colors;
 
-class M5Display : public LGFX {
+class M5Display : public TFT_eSPI {
   public:
     template<typename T> 
     void clearDisplay(T color=0) { fillScreen(color); }

src/M5Stack.h

@@ -110,7 +110,7 @@
     #include <SPI.h>
     #include <FS.h>
 
-    #if defined ( ARDUINO_ESP32_DEV ) || defined( ARDUINO_DDUINO32_XS )
+    #if defined ( ARDUINO_ESP32_DEV ) || defined( ARDUINO_DDUINO32_XS ) || defined( ARDUINO_ESP32_WROVER_KIT )
       #include "SD_MMC.h"
       #define M5STACK_SD SD_MMC
     #else

src/utility/Config.h

@@ -11,7 +11,7 @@
   #define BUTTON_C_PIN  -1  // BUTTON_MENU
 
 
-#elif defined(ARDUINO_ESP32_DEV)
+#elif defined(ARDUINO_ESP32_DEV) || defined( ARDUINO_ESP32_WROVER_KIT )
 
   #define TFT_LED_PIN   14
   #define TFT_DC_PIN    21

src/utility/TFT_Drivers/ILI9341_Defines.h

@@ -3,7 +3,7 @@
 #if defined( ARDUINO_LOLIN_D32_PRO )
   #define TFT_WIDTH 240
   #define TFT_HEIGHT 320
-#elif defined ( ARDUINO_ESP32_DEV )
+#elif defined ( ARDUINO_ESP32_DEV ) || defined( ARDUINO_ESP32_WROVER_KIT )
   #define TFT_WIDTH 240
   #define TFT_HEIGHT 320
 #elif defined(ARDUINO_ODROID_ESP32)