Merge pull request #706 from lovyan03/develop

1.2.7

Author: lovyan03

.github/scripts/esp-idf-versions.php

@@ -36,7 +36,7 @@
 $hardcoded_fqbns = ['[email protected]', '[email protected]'];
 
 // restrict output to these idf targets, other targets will be ignored
-$idf_boards     = ['esp32', 'esp32s2', 'esp32s3', 'esp32c6'/*, 'esp32h2', 'esp32p4', 'esp32c5'*/];
+$idf_boards     = ['esp32', 'esp32s2', 'esp32s3', 'esp32c6', 'esp32p4'/*, 'esp32h2', 'esp32c5'*/];
 
 // get the official support matrix from the espressif website
 // it contains a JavaScript object declaration with all necessary chip/version informations

.github/workflows/ArduinoBuild.yml

@@ -13,6 +13,7 @@ on:
     - '**.c'
     - '**ArduinoBuild.yml'
   pull_request:
+  workflow_dispatch:
 
 jobs:
   build:

library.json

@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/lovyan03/LovyanGFX.git"
   },
-  "version": "1.2.0",
+  "version": "1.2.7",
   "frameworks": ["arduino", "espidf", "*"],
   "platforms": ["espressif32", "espressif8266", "atmelsam", "native", "raspberrypi"],
   "headers": "LovyanGFX.hpp",

library.properties

@@ -1,5 +1,5 @@
 name=LovyanGFX
-version=1.2.0
+version=1.2.7
 author=lovyan03
 maintainer=lovyan03,tobozo
 sentence=TFT LCD Graphics driver with touch for ESP32/ESP8266, SAMD21/SAMD51, RP2040/RP2350

src/lgfx/boards.hpp

@@ -64,6 +64,7 @@ namespace lgfx
     , board_ESP32_S3_BOX_Lite
     , board_LoLinS3Pro
     , board_ESP32_S3_BOX_V3
+    , board_Guition_ESP32_2432W328
     };
   }
   using namespace boards;

src/lgfx/v1/LGFXBase.cpp

@@ -1395,6 +1395,7 @@ namespace lgfx
                : (dst_depth == rgb332_1Byte) ? pixelcopy_t::copy_grayscale_affine<rgb332_t>
                : (dst_depth == rgb888_3Byte) ? pixelcopy_t::copy_grayscale_affine<bgr888_t>
                : (dst_depth == rgb666_3Byte) ? pixelcopy_t::copy_grayscale_affine<bgr666_t>
+               : (dst_depth == grayscale_8bit) ? pixelcopy_t::copy_grayscale_affine<grayscale_t>
                : nullptr;
 
     return pc;
@@ -1876,6 +1877,7 @@ namespace lgfx
     case color_depth_t::rgb666_3Byte: p.fp_copy = pixelcopy_t::compare_rgb_affine<bgr666_t>;  break;
     case color_depth_t::rgb565_2Byte: p.fp_copy = pixelcopy_t::compare_rgb_affine<swap565_t>; break;
     case color_depth_t::rgb332_1Byte: p.fp_copy = pixelcopy_t::compare_rgb_affine<rgb332_t>;  break;
+    case color_depth_t::grayscale_8bit: p.fp_copy = pixelcopy_t::compare_rgb_affine<grayscale_t>;  break;
     default: p.fp_copy = pixelcopy_t::compare_bit_affine;
       p.src_mask = (1 << p.src_bits) - 1;
       p.transp &= p.src_mask;
@@ -2935,7 +2937,7 @@ namespace lgfx
     lgfxJdec jpegdec;
 
     static constexpr uint16_t sz_pool = 3900;
-    uint8_t *pool = (uint8_t*)heap_alloc_dma(sz_pool);
+    uint8_t *pool = (uint8_t*)malloc(sz_pool);
     if (!pool)
     {
       // ESP_LOGW("LGFX", "jpeg memory alloc fail");
@@ -2947,7 +2949,7 @@ namespace lgfx
     if (jres != JDR_OK)
     {
       // ESP_LOGW("LGFX", "jpeg prepare error:%x", jres);
-      heap_free(pool);
+      free(pool);
       return false;
     }
 
@@ -2963,7 +2965,7 @@ namespace lgfx
                        , datum
                        , jpegdec.width, jpegdec.height))
     {
-      heap_free(pool);
+      free(pool);
       return false;
     }
 
@@ -2990,7 +2992,7 @@ namespace lgfx
     this->endWrite();
     drawinfo.data->preRead();
 
-    heap_free(pool);
+    free(pool);
 
     if (jres != JDR_OK) {
       // ESP_LOGW("LGFX", "jpeg decomp error:%x", jres);

src/lgfx/v1/LGFXBase.hpp

@@ -299,10 +299,10 @@ namespace lgfx
     LGFX_INLINE_T void fillScreen  ( const T& color) { setColor(color); fillRect(0, 0, width(), height()); }
     LGFX_INLINE   void fillScreen  ( void )          {                  fillRect(0, 0, width(), height()); }
 
-    LGFX_INLINE_T void clear       ( const T& color) { setBaseColor(color); clear(); }
-    LGFX_INLINE   void clear       ( void )          { setColor(_base_rgb888); fillScreen(); }
-    LGFX_INLINE_T void clearDisplay( const T& color) { setBaseColor(color); clear(); }
-    LGFX_INLINE   void clearDisplay( void )          { setColor(_base_rgb888); fillScreen(); }
+    LGFX_INLINE_T void clear       ( const T& color) { setBaseColor(color); clearDisplay(); }
+    LGFX_INLINE   void clear       ( void )          { clearDisplay(); }
+    LGFX_INLINE_T void clearDisplay( const T& color) { setBaseColor(color); clearDisplay(); }
+    LGFX_INLINE   void clearDisplay( void )          { if (isEPD()) { waitDisplay(); fillScreen(~_base_rgb888); waitDisplay(); } fillScreen(_base_rgb888); }
 
     LGFX_INLINE   void  setPivot(float x, float y) { _xpivot = x; _ypivot = y; }
     LGFX_INLINE   float getPivotX(void) const { return _xpivot; }
@@ -1408,7 +1408,7 @@ namespace lgfx
 
     bool init(void)               { return init_impl(true , true); };
     bool begin(void)              { return init_impl(true , true); };
-    bool init_without_reset(void) { return init_impl(false, false); };
+    bool init_without_reset(bool clear = false) { return init_impl(false, clear); };
     board_t getBoard(void) const { return _board; }
     void initBus(void);
     void releaseBus(void);

src/lgfx/v1/gitTagVersion.h

@@ -1,4 +1,4 @@
 #define LGFX_VERSION_MAJOR 1
 #define LGFX_VERSION_MINOR 2
-#define LGFX_VERSION_PATCH 0
+#define LGFX_VERSION_PATCH 7
 #define LOVYANGFX_VERSION F( LGFX_VERSION_MAJOR "." LGFX_VERSION_MINOR "." LGFX_VERSION_PATCH )

src/lgfx/v1/misc/DataWrapper.hpp

@@ -176,7 +176,7 @@ namespace lgfx
 
 //----------------------------------------------------------------------------
 
-#if defined (SdFat_h)
+#if defined (SdFat_h) || defined (SD_FAT_VERSION)
   // #if SD_FAT_VERSION >= 20102
   //  #define LGFX_SDFAT_TYPE SdBase<FsVolume,FsFormatter>
   // #else

src/lgfx/v1/misc/SpriteBuffer.cpp

@@ -153,6 +153,8 @@ namespace lgfx
     }
   }
 
+  bool SpriteBuffer::use_dma(void) const { return _source == AllocationSource::Dma || heap_capable_dma(_buffer); }
+
 //----------------------------------------------------------------------------
  }
 }