Merge pull request #23 from m5stack/develop

0.0.14

Author: lovyan03

library.json

@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/m5stack/M5GFX.git"
   },
-  "version": "0.0.13",
+  "version": "0.0.14",
   "framework": "arduino",
   "platforms": "espressif32",
   "headers": "M5GFX.h"

library.properties

@@ -1,5 +1,5 @@
 name=M5GFX
-version=0.0.13
+version=0.0.14
 author=M5Stack
 maintainer=M5Stack
 sentence=Library for M5Stack All Display

src/M5AtomDisplay.h

@@ -60,7 +60,7 @@ class M5AtomDisplay : public lgfx::LGFX_Device
     static constexpr int spi_mosi = 19;
     static constexpr int spi_miso = 22;
 
-    int spi_sclk = (esp_efuse_get_pkg_ver() == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4)
+    int spi_sclk = (m5gfx::get_pkg_ver() == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4)
                  ? 23  // for ATOM Lite / Matrix
                  : 5   // for ATOM PSRAM
                  ;
@@ -98,10 +98,12 @@ class M5AtomDisplay : public lgfx::LGFX_Device
 
     {
       auto cfg = _panel_instance.config();
+      cfg.offset_rotation = 3;
       cfg.pin_cs     = spi_cs;
       cfg.readable   = false;
       cfg.bus_shared = false;
       _panel_instance.config(cfg);
+      _panel_instance.setRotation(1);
     }
 #endif
     lgfx::Panel_M5HDMI::config_resolution_t cfg_reso;
@@ -127,7 +129,7 @@ class M5AtomDisplay : public lgfx::LGFX_Device
                     , uint_fast8_t scale_h    = M5ATOMDISPLAY_SCALE_H
                     )
   {
-    return _panel_instance.setResolution
+    bool res = _panel_instance.setResolution
       ( logical_width
       , logical_height
       , refresh_rate
@@ -136,6 +138,8 @@ class M5AtomDisplay : public lgfx::LGFX_Device
       , scale_w
       , scale_h
       );
+    setRotation(getRotation());
+    return res;
   }
 };
 

src/M5GFX.cpp

@@ -447,7 +447,7 @@ namespace m5gfx
 
     std::uint32_t id;
 
-    std::uint32_t pkg_ver = esp_efuse_get_pkg_ver();
+    std::uint32_t pkg_ver = m5gfx::get_pkg_ver();
 
     if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4)  /// check PICO-D4 (M5StickC,CPlus,T,T2 / CoreInk / ATOM )
     {

src/M5GFX.h

@@ -27,11 +27,6 @@
 
 #include <vector>
 
-namespace m5
-{
-  class M5Unified;
-}
-
 namespace m5gfx
 {
   using namespace lgfx;
@@ -134,8 +129,6 @@ namespace m5gfx
 
   class M5GFX : public lgfx::LGFX_Device
   {
-  friend m5::M5Unified;
-
     static M5GFX* _instance;
 
     struct DisplayState
@@ -156,12 +149,6 @@ namespace m5gfx
     board_t autodetect(bool use_reset = false, board_t board = board_t::board_unknown);
     void _set_backlight(lgfx::ILight* bl);
     void _set_pwm_backlight(std::int16_t pin, std::uint8_t ch, std::uint32_t freq = 12000, bool invert = false);
-    void _set_board(board_t board) { _board = board; }
-    bool _init_with_panel(lgfx::Panel_Device* panel)
-    {
-      setPanel(panel);
-      return LGFX_Device::init_impl(true, true);
-    }
 
   public:
     M5GFX(void);
@@ -197,7 +184,7 @@ namespace m5gfx
 #ifdef __M5GFX_M5ATOMDISPLAY__
       if (getBoard() == board_t::board_M5AtomDisplay)
       {
-        return ((Panel_M5HDMI*)panel())->setResolution
+        bool res = ((Panel_M5HDMI*)panel())->setResolution
           ( logical_width
           , logical_height
           , refresh_rate
@@ -206,6 +193,8 @@ namespace m5gfx
           , scale_w
           , scale_h
           );
+        setRotation(getRotation());
+        return res;
       }
 #endif
       return false;

src/lgfx/v1/gitTagVersion.h

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

src/lgfx/v1/panel/Panel_M5HDMI.cpp

@@ -418,6 +418,7 @@ namespace lgfx
     while (_bus->readData(8) == 0xFF) {}
     _bus->readData(8); // skip 0xFF
     uint32_t data = _bus->readData(32);
+    (void)data; // suppress compiler warning.
     ESP_LOGI(TAG, "FPGA ID:%02x %02x %02x %02x", data & 0xFF, (data >> 8) & 0xFF, (data >> 16) & 0xFF, data >> 24);
     cs_control(true);
     _bus->endRead();
@@ -527,7 +528,31 @@ namespace lgfx
   bool Panel_M5HDMI::setResolution( const config_resolution_t& cfg_reso )
   {
     config_resolution(cfg_reso);
-    return _init_resolution();
+    bool res = _init_resolution();
+
+    union cmd_t
+    {
+      uint8_t raw[10];
+      struct __attribute__((packed))
+      {
+        uint8_t cmd;
+        uint32_t xy1;
+        uint32_t xy2;
+        uint8_t color;
+      };
+    };
+    cmd_t cmd;
+    cmd.cmd = CMD_FILLRECT_8;
+    cmd.xy1 = 0;
+    cmd.color = 0;
+    static constexpr uint32_t mask = 0xFF00FF;
+    uint32_t xy = (_cfg.memory_width - 1) + ((_cfg.memory_height - 1) << 16);
+    cmd.xy2 = ((xy >> 8) & mask) + ((xy & mask) << 8);
+    startWrite();
+    _bus->writeBytes(cmd.raw, sizeof(cmd_t), false, false);
+    endWrite();
+
+    return res;
   }
 
   void Panel_M5HDMI::config_resolution( const config_resolution_t& cfg_reso )

src/lgfx/v1/platforms/esp32/common.cpp

@@ -29,12 +29,33 @@ Original Source:
 #include <driver/spi_master.h>
 #include <driver/rtc_io.h>
 #include <driver/periph_ctrl.h>
-#include <soc/soc.h>
 #include <soc/rtc.h>
+#include <soc/soc.h>
 #include <soc/i2c_reg.h>
 #include <soc/i2c_struct.h>
 #include <esp_log.h>
 
+#include <soc/apb_ctrl_reg.h>
+#include <soc/efuse_reg.h>
+
+#if defined (ESP_IDF_VERSION_VAL)
+ #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(3, 4, 0)
+
+// include <esp_efuse.h> でエラーが出るバージョンが存在するため、エラー回避用の記述を行ってからincludeする。; 
+  #define _ROM_SECURE_BOOT_H_
+  #define MAX_KEY_DIGESTS 3
+  struct ets_secure_boot_key_digests
+  {
+    const void *key_digests[MAX_KEY_DIGESTS];
+    bool allow_key_revoke;
+  };
+  typedef struct ets_secure_boot_key_digests ets_secure_boot_key_digests_t;
+
+  #include <esp_efuse.h>
+  #define USE_ESP_EFUSE_GET_PKG_VER
+ #endif
+#endif
+
 #if __has_include(<soc/i2c_periph.h>)
  #include <soc/i2c_periph.h>
 #endif
@@ -69,6 +90,23 @@ namespace lgfx
     return div_num << 12 | ((div_num-1)>>1) << 6 | div_num | pre << 18;
   }
 
+  uint32_t get_pkg_ver(void)
+  {
+#if defined ( USE_ESP_EFUSE_GET_PKG_VER )
+    return esp_efuse_get_pkg_ver();
+#else
+    uint32_t pkg_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_VER_PKG);
+    if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4)
+    {
+      if (REG_READ(APB_CTRL_DATE_REG) & 0x80000000)
+      { // ESP32PICOV302
+        return 6;
+      }
+    }
+    return pkg_ver;
+#endif
+  }
+
 //----------------------------------------------------------------------------
 
   void pinMode(int_fast16_t pin, pin_mode_t mode)

src/lgfx/v1/platforms/esp32/common.hpp

@@ -94,6 +94,9 @@ namespace lgfx
   uint32_t getApbFrequency(void);
   uint32_t FreqToClockDiv(uint32_t fapb, uint32_t hz);
 
+  // esp_efuse_get_pkg_ver
+  uint32_t get_pkg_ver(void);
+
 //----------------------------------------------------------------------------
 
 #if defined (ARDUINO)