tweak

m5stack · May 30, 2021 · 6d9c361 · 6d9c361
1 parent 6ac5c4b
commit 6d9c361
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/src/lgfx/v1/LGFXBase.cpp b/src/lgfx/v1/LGFXBase.cpp
@@ -2850,7 +2850,7 @@ namespace lgfx
     static Panel_NULL nullobj;
     _panel = (nullptr == panel)
            ? &nullobj
-           : reinterpret_cast<IPanel*>(panel); 
+           : panel;
   }
 
   bool LGFX_Device::init_impl(bool use_reset, bool use_clear)

diff --git a/src/lgfx/v1/platforms/esp32/Bus_Parallel8.cpp b/src/lgfx/v1/platforms/esp32/Bus_Parallel8.cpp
@@ -33,6 +33,8 @@ namespace lgfx
   #define SAFE_I2S_FIFO_WR_REG(i) (0x3FF4F000 + ((i)*0x1E000))
   #define SAFE_I2S_FIFO_RD_REG(i) (0x3FF4F004 + ((i)*0x1E000))
 
+  static constexpr std::size_t CACHE_THRESH = 256;
+
   static constexpr std::uint32_t _conf_reg_default = I2S_TX_MSB_RIGHT | I2S_TX_RIGHT_FIRST | I2S_RX_RIGHT_FIRST;
   static constexpr std::uint32_t _conf_reg_start   = _conf_reg_default | I2S_TX_START;
   static constexpr std::uint32_t _conf_reg_reset   = _conf_reg_default | I2S_TX_RESET;

diff --git a/src/lgfx/v1/platforms/esp32/Bus_Parallel8.hpp b/src/lgfx/v1/platforms/esp32/Bus_Parallel8.hpp
@@ -98,7 +98,6 @@ namespace lgfx
   private:
 
     static constexpr std::size_t CACHE_SIZE = 260;
-    static constexpr std::size_t CACHE_THRESH = 256;
     // static constexpr std::size_t CACHE_SIZE = 68;
     // static constexpr std::size_t CACHE_THRESH = 64;
 

diff --git a/src/lgfx/v1/touch/Touch_FT5x06.cpp b/src/lgfx/v1/touch/Touch_FT5x06.cpp
@@ -53,6 +53,7 @@ namespace lgfx
     std::uint8_t tmp[2] = { 0 };
     _inited = _write_reg(0x00, 0x00)
           && _read_reg(FT5x06_VENDID_REG, tmp, 1)
+          && _write_reg(FT5x06_INTMODE_REG, 0x00) // INT Polling mode
           && tmp[0]
           ;
 
@@ -70,12 +71,7 @@ namespace lgfx
       lgfx::pinMode(_cfg.pin_int, pin_mode_t::input_pullup);
     }
 
-    if (_check_init())
-    {
-      _write_reg(FT5x06_INTMODE_REG, 0x00); // INT Polling mode
-      return true;
-    }
-    return false;
+    return _check_init();
   }
 
   void Touch_FT5x06::wakeup(void)