Merge pull request #122 from lovyan03/develop

0.3.12

Author: lovyan03

README.md

@@ -469,7 +469,7 @@ Pngle : [MIT](https://github.com/kikuchan/pngle/blob/master/LICENSE) kikuchan
 QRCode : [MIT](https://github.com/ricmoo/QRCode/blob/master/LICENSE.txt) Richard Moore and Nayuki  
 GFX font and GLCD font : [2-clause BSD](https://github.com/adafruit/Adafruit-GFX-Library/blob/master/license.txt) Adafruit Industries  
 Font 2,4,6,7,8 :  [FreeBSD](https://github.com/Bodmer/TFT_eSPI/blob/master/license.txt) Bodmer  
-converted IPA font : [IPA Font License](src/Fonts/IPA/IPA_Font_License_Agreement_v1.0.txt)  
-efont : [3-Clause BSD License](src/Fonts/efont/COPYRIGHT.txt)  
+converted IPA font : [IPA Font License](src/lgfx/Fonts/IPA/IPA_Font_License_Agreement_v1.0.txt) IPA  
+efont : [3-Clause BSD](src/lgfx/Fonts/efont/COPYRIGHT.txt) The Electronic Font Open Laboratory  
 
 

library.json

@@ -11,7 +11,7 @@
     "type": "git",
     "url": "https://github.com/lovyan03/LovyanGFX.git"
   },
-  "version": "0.3.11",
+  "version": "0.3.12",
   "frameworks": ["arduino", "espidf"],
   "platforms": ["espressif32", "atmelsam"],
   "build": {

library.properties

@@ -1,5 +1,5 @@
 name=LovyanGFX
-version=0.3.11
+version=0.3.12
 author=lovyan03
 maintainer=Lovyan <[email protected]>
 sentence=TFT LCD Graphics driver with touch for ESP32 and SAMD51

src/lgfx/v0/config/LGFX_Config_AutoDetectESP32.hpp

@@ -1108,6 +1108,60 @@ namespace lgfx
       }
   #endif
 
+  #if defined ( LGFX_WT32_SC01 )
+      if (nvs_board == 0 || nvs_board == lgfx::board_t::board_WT32_SC01) {
+        releaseBus();
+        _spi_mosi = 13;
+        _spi_miso = -1;
+        _spi_sclk = 14;
+        initBus();
+
+        p_tmp.spi_cs   = 15;
+        p_tmp.spi_dc   = 21;
+        p_tmp.gpio_rst = -1;
+        setPanel(&p_tmp);
+
+        /* if ( determination here ) */ {
+          ESP_LOGW("LovyanGFX", "[Autodetect] WT32-SC01");
+          board = lgfx::board_t::board_WT32_SC01;
+          auto p = new lgfx::Panel_ST7796();
+          releaseBus();
+          _spi_host = HSPI_HOST;
+          initBus();
+          p->spi_3wire = true;
+          p->spi_read  = false;
+          p->spi_cs    = 15;
+          p->spi_dc    = 21;
+          p->gpio_rst  = 22;
+          p->gpio_bl   = 23;
+          p->pwm_ch_bl = 7;
+          p->rotation  = 1;
+          setPanel(p);
+
+          auto t = new lgfx::Touch_FT5x06();
+          t->gpio_int = 39;   // INT pin number
+          t->i2c_sda  = 18;   // I2C SDA pin number
+          t->i2c_scl  = 19;   // I2C SCL pin number
+          t->i2c_addr = 0x38; // I2C device addr
+          t->i2c_port = I2C_NUM_1;// I2C port number
+          t->freq = 400000;   // I2C freq
+          t->x_min = 0;
+          t->x_max = 319;
+          t->y_min = 0;
+          t->y_max = 479;
+          touch(t);
+          _touch_affine[0] =  1;
+          _touch_affine[1] =  0;
+          _touch_affine[2] =  0;
+          _touch_affine[3] =  0;
+          _touch_affine[4] =  1;
+          _touch_affine[5] =  0;
+
+          goto init_clear;
+        }
+      }
+  #endif
+
   // DSTIKE D-Duino32XS については読出しが出来ないため無条件設定となる。
   // そのためLGFX_AUTO_DETECTでは機能しないようにしておく。
   #if defined ( LGFX_DDUINO32_XS )

src/lgfx/v0/gitTagVersion.h

@@ -1 +1 @@
-#define LOVYANGFX_VERSION F("0.3.11")
+#define LOVYANGFX_VERSION F("0.3.12")

src/lgfx/v0/lgfx_common.hpp

@@ -55,6 +55,7 @@ namespace lgfx
     , board_M5Stack_CoreInk
     , board_M5Paper
     , board_ESP32_S2_Kaluga_1
+    , board_WT32_SC01
     };
   }
   using namespace boards;

src/lgfx/v0/panel/Panel_GDEW0154M09.hpp

@@ -44,6 +44,12 @@ namespace lgfx
       fp_pushBlock   = pushBlock;
       fp_writePixels = writePixels;
       fp_readRect    = readRect;
+
+      _range_old.top = INT_MAX;
+      _range_old.left = INT_MAX;
+      _range_old.right = 0;
+      _range_old.bottom = 0;
+      _range_new = _range_old;
     }
 
     bool isEPD(void) const override { return true; }

src/lgfx/v0/platforms/esp32_common.cpp

@@ -174,6 +174,7 @@ namespace lgfx
       if (spi_host == VSPI_HOST) {
         SPI.end();
         SPI.begin(spi_sclk, spi_miso, spi_mosi);
+        _spi_handle[spi_host] = SPI.bus();
       }
 
       if (_spi_handle[spi_host] == nullptr) {
@@ -263,7 +264,10 @@ namespace lgfx
         if (spi_host == VSPI_HOST) {
           SPI.end();
         }
-        spiStopBus(_spi_handle[spi_host]);
+        else
+        {
+          spiStopBus(_spi_handle[spi_host]);
+        }
 #else // ESP-IDF
         spi_bus_remove_device(_spi_handle[spi_host]);
         spi_bus_free(static_cast<spi_host_device_t>(spi_host));

src/lgfx/v0/touch/Touch_FT5x06.cpp

@@ -53,23 +53,27 @@ namespace lgfx
     if (!_inited || number > 4) return 0;
     if (gpio_int >= 0 && gpio_in(gpio_int)) return 0;
 
-    std::uint_fast16_t tx, ty;
-    std::int32_t retry = 3;
-    std::uint32_t base = number * 6;
-    std::uint8_t tmp[base + 5];
+    std::size_t base = number * 6;
+    std::size_t len = base + 5;
+
+    std::uint8_t tmp[2][len];
+    lgfx::i2c::readRegister(i2c_port, i2c_addr, 2, tmp[0], len);
+    std::int32_t retry = 5;
     do {
-      lgfx::i2c::readRegister(i2c_port, i2c_addr, 2, tmp, 5 + base);
-      if (number >= tmp[0]) return 0;
-      tx = (tmp[base + 1] & 0x0F) << 8 | tmp[base + 2];
-      ty = (tmp[base + 3] & 0x0F) << 8 | tmp[base + 4];
-    } while ((tx > x_max || ty > y_max) && --retry);
+      lgfx::i2c::readRegister(i2c_port, i2c_addr, 2, tmp[retry & 1], len);
+    } while (memcmp(tmp[0], tmp[1], len) && --retry);
+
+    if ((std::uint8_t)number >= tmp[0][0]) return 0;
+
     if (tp)
     {
-      tp->x = tx;
-      tp->y = ty;
-      tp->id = tmp[base + 3] >> 4;
+      auto data = &tmp[0][base];
+      tp->size = 1;
+      tp->x = (data[1] & 0x0F) << 8 | data[2];
+      tp->y = (data[3] & 0x0F) << 8 | data[4];
+      tp->id = data[3] >> 4;
     }
-    return tmp[0];
+    return tmp[0][0];
   }
 
 //----------------------------------------------------------------------------