0.2.28

CMakeLists.txt

@@ -10,12 +10,22 @@ file(GLOB SRCS
      src/lgfx/v1/misc/*.cpp
      src/lgfx/v1/panel/*.cpp
      src/lgfx/v1/platforms/esp32/*.cpp
-     src/lgfx/v1/platforms/esp32c3/*.cpp
-     src/lgfx/v1/platforms/esp32s2/*.cpp
-     src/lgfx/v1/platforms/esp32s3/*.cpp
-     src/lgfx/v1/platforms/esp32p4/*.cpp
      src/lgfx/v1/touch/*.cpp
      )
+
+# Keep common ESP32 sources, then add only the active chip's implementation.
+# This also prevents PlatformIO's flat object layout from colliding on same-named
+# sources that live in different platform directories.
+if(IDF_TARGET STREQUAL "esp32c3")
+    file(GLOB PLATFORM_SRCS src/lgfx/v1/platforms/esp32c3/*.cpp)
+elseif(IDF_TARGET STREQUAL "esp32s2")
+    file(GLOB PLATFORM_SRCS src/lgfx/v1/platforms/esp32s2/*.cpp)
+elseif(IDF_TARGET STREQUAL "esp32s3")
+    file(GLOB PLATFORM_SRCS src/lgfx/v1/platforms/esp32s3/*.cpp)
+elseif(IDF_TARGET STREQUAL "esp32p4")
+    file(GLOB PLATFORM_SRCS src/lgfx/v1/platforms/esp32p4/*.cpp)
+endif()
+list(APPEND SRCS ${PLATFORM_SRCS})
 set(COMPONENT_SRCS ${SRCS})
 
 if (IDF_VERSION_MAJOR GREATER_EQUAL 6)

idf_component.yml

@@ -2,4 +2,4 @@ description: Graphics library for M5Stack series
 issues: https://github.com/m5stack/M5GFX/issues
 repository: https://github.com/m5stack/M5GFX.git
 url: https://github.com/m5stack/M5GFX.git
-version: 0.2.27
+version: 0.2.28

library.json

@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/m5stack/M5GFX.git"
   },
-  "version": "0.2.27",
+  "version": "0.2.28",
   "frameworks": ["arduino", "espidf", "*"],
   "platforms": ["espressif32", "native"],
   "headers": "M5GFX.h"

library.properties

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

src/M5GFX.cpp

@@ -35,6 +35,7 @@
 
 #include "lgfx/v1/platforms/esp32p4/Bus_DSI.hpp"
 #include "lgfx/v1/platforms/esp32p4/Panel_ILI9881C.hpp"
+#include "lgfx/v1/platforms/esp32p4/Panel_ST7102.hpp"
 #include "lgfx/v1/platforms/esp32p4/Panel_ST7121.hpp"
 #include "lgfx/v1/platforms/esp32p4/Panel_ST7123.hpp"
 #include "lgfx/v1/platforms/esp32p4/Touch_ST7123.hpp"
@@ -209,6 +210,34 @@ namespace m5gfx
     return false;
   }
 
+#if defined (CONFIG_IDF_TARGET_ESP32P4)
+  struct Light_M5CoreP4X : public lgfx::ILight
+  {
+    bool init(uint8_t brightness) override
+    {
+      static constexpr uint16_t pwm_freq = 1000;
+      const uint8_t freq_data[] = {
+        0x25, static_cast<uint8_t>(pwm_freq), static_cast<uint8_t>(pwm_freq >> 8)
+      };
+      lgfx::i2c::transactionWrite(in_i2c_port, m5ioe1_i2c_addr,
+                                  freq_data, sizeof(freq_data), m5ioe1_i2c_freq);
+      lgfx::i2c::bitOn(in_i2c_port, m5ioe1_i2c_addr, 0x06, 1u << 0, m5ioe1_i2c_freq);
+      setBrightness(brightness);
+      return true;
+    }
+
+    void setBrightness(uint8_t brightness) override
+    {
+      uint16_t duty = (brightness << 4) | (brightness >> 4);
+      const uint8_t duty_data[] = {
+        0x1B, static_cast<uint8_t>(duty), static_cast<uint8_t>(0x80 | (duty >> 8))
+      };
+      lgfx::i2c::transactionWrite(in_i2c_port, m5ioe1_i2c_addr,
+                                  duty_data, sizeof(duty_data), m5ioe1_i2c_freq);
+    }
+  };
+#endif
+
 #if !defined (CONFIG_IDF_TARGET) || defined (CONFIG_IDF_TARGET_ESP32)
   static constexpr std::int32_t axp_i2c_freq = 400000;
   static constexpr std::uint_fast8_t axp_i2c_addr = 0x34;
@@ -2921,7 +2950,118 @@ The usage of each pin is as follows.
 
     if (pkg_ver == 0) // pkg_ver == EFUSE_RD_CHIP_VER_PKG_
     {
-      if (board == 0 || board == board_t::board_M5Tab5)
+      if (board == 0 || board == board_t::board_M5CoreP4X)
+      {
+        static constexpr uint8_t corep4x_i2c_addr_list[] = {
+          0x4Fu, // M5IOE1
+          0x6Eu, // M5PM1
+          0u
+        };
+        uint32_t i2c_result = _detect_i2c_device(GPIO_NUM_11, GPIO_NUM_9, corep4x_i2c_addr_list);
+        if (i2c_result == ~0u) {
+          lgfx::i2c::init(in_i2c_port, GPIO_NUM_11, GPIO_NUM_9);
+          board = board_t::board_M5CoreP4X;
+          ESP_LOGI(LIBRARY_NAME, "[Autodetect] board_M5CoreP4X");
+
+          lgfx::i2c::writeRegister8(in_i2c_port, m5pm1_i2c_addr, 0x09, 0x00, 0, m5pm1_i2c_freq);
+          lgfx::i2c::writeRegister8(in_i2c_port, m5pm1_i2c_addr, 0x0A, 0x00, 0, m5pm1_i2c_freq);
+          lgfx::i2c::bitOn(in_i2c_port, m5pm1_i2c_addr, 0x06, 1u << 3, m5pm1_i2c_freq);
+
+          // M5IOE1 G8/G9/G10/G11 control touch reset, backlight, LCD power,
+          // and LCD reset. G12 supplies the shared 3V3 rail for MBUS, TF card, IMU,
+          // infrared and Ethernet.
+          static constexpr uint8_t touch_reset_bit = 1u << 7;
+          static constexpr uint8_t display_bits_h = 0b00000111;
+          static constexpr uint8_t shared_power_bit = 1u << 3;
+          lgfx::i2c::writeRegister8(in_i2c_port, m5ioe1_i2c_addr, 0x23, 0x00, 0, m5ioe1_i2c_freq);
+          lgfx::i2c::bitOff(in_i2c_port, m5ioe1_i2c_addr, 0x13, touch_reset_bit, m5ioe1_i2c_freq);
+          lgfx::i2c::bitOff(in_i2c_port, m5ioe1_i2c_addr, 0x14, display_bits_h, m5ioe1_i2c_freq);
+          lgfx::i2c::bitOff(in_i2c_port, m5ioe1_i2c_addr, 0x14, shared_power_bit, m5ioe1_i2c_freq);
+          lgfx::i2c::bitOn( in_i2c_port, m5ioe1_i2c_addr, 0x03, touch_reset_bit, m5ioe1_i2c_freq);
+          lgfx::i2c::bitOn( in_i2c_port, m5ioe1_i2c_addr, 0x04, display_bits_h, m5ioe1_i2c_freq);
+          lgfx::i2c::bitOn( in_i2c_port, m5ioe1_i2c_addr, 0x04, shared_power_bit, m5ioe1_i2c_freq);
+          lgfx::i2c::bitOn(in_i2c_port, m5ioe1_i2c_addr, 0x05, touch_reset_bit, m5ioe1_i2c_freq);
+          lgfx::i2c::bitOn(in_i2c_port, m5ioe1_i2c_addr, 0x06, display_bits_h, m5ioe1_i2c_freq);
+          lgfx::i2c::bitOn(in_i2c_port, m5ioe1_i2c_addr, 0x06, shared_power_bit, m5ioe1_i2c_freq);
+
+          static constexpr uint16_t pwm_freq = 1000;
+          const uint8_t freq_data[] = {
+            0x25, static_cast<uint8_t>(pwm_freq), static_cast<uint8_t>(pwm_freq >> 8)
+          };
+          const uint8_t duty_data[] = { 0x1B, 0x00, 0x80 };
+          lgfx::i2c::transactionWrite(in_i2c_port, m5ioe1_i2c_addr,
+                                      freq_data, sizeof(freq_data), m5ioe1_i2c_freq);
+          lgfx::i2c::transactionWrite(in_i2c_port, m5ioe1_i2c_addr,
+                                      duty_data, sizeof(duty_data), m5ioe1_i2c_freq);
+          lgfx::delay(150);
+
+#if !CONFIG_SPIRAM
+          ESP_LOGE(LIBRARY_NAME, "M5CoreP4X needs PSRAM enabled");
+#else
+          auto bus_dsi = new Bus_DSI();
+          _bus_last.reset(bus_dsi);
+          auto bus_cfg = bus_dsi->config();
+          bus_cfg.bus_id = 0;
+          bus_cfg.lane_num = 2;
+          bus_cfg.lane_mbps = 600;
+          bus_cfg.ldo_chan_id = 3;
+          bus_cfg.ldo_voltage_mv = 2500;
+          bus_dsi->config(bus_cfg);
+          if (bus_dsi->init()) {
+            lgfx::delay(50);
+            auto p = new Panel_ST7102();
+            _panel_last.reset(p);
+            auto det = p->config_detail();
+            det.dpi_freq_mhz = 24;
+            det.hsync_back_porch = 40;
+            det.hsync_pulse_width = 2;
+            det.hsync_front_porch = 40;
+            det.vsync_back_porch = 8;
+            det.vsync_pulse_width = 4;
+            det.vsync_front_porch = 200;
+            p->config_detail(det);
+
+            auto cfg = p->config();
+            cfg.memory_width = 480;
+            cfg.memory_height = 480;
+            cfg.panel_width = 480;
+            cfg.panel_height = 480;
+            cfg.readable = false;
+            cfg.rgb_order = true;
+            cfg.bus_shared = false;
+            cfg.offset_x = 0;
+            cfg.offset_y = 0;
+            cfg.offset_rotation = 2;
+            cfg.pin_cs = GPIO_NUM_NC;
+            cfg.pin_rst = GPIO_NUM_NC;
+            p->config(cfg);
+            p->setBus(bus_dsi);
+
+            auto t = new lgfx::Touch_CST3530();
+            _touch_last.reset(t);
+            auto tcfg = t->config();
+            tcfg.pin_rst = -1;
+            tcfg.pin_sda = GPIO_NUM_11;
+            tcfg.pin_scl = GPIO_NUM_9;
+            tcfg.pin_int = GPIO_NUM_1;
+            tcfg.freq = 400000;
+            tcfg.x_min = 0;
+            tcfg.x_max = 479;
+            tcfg.y_min = 0;
+            tcfg.y_max = 479;
+            tcfg.i2c_port = I2C_NUM_1;
+            tcfg.bus_shared = false;
+            tcfg.offset_rotation = 2;
+            t->config(tcfg);
+            _panel_last->setTouch(t);
+          }
+          _set_backlight(new Light_M5CoreP4X());
+#endif
+          goto init_clear;
+        }
+      }
+
+      if (board == 0 || board == board_t::board_M5Tab5 || board == board_t::board_M5Tab5X)
       {
         // SDA = GPIO_NUM_31
         // SCL = GPIO_NUM_32
@@ -2934,8 +3074,10 @@ The usage of each pin is as follows.
         id = lgfx::i2c::readRegister8(probe_i2c_port, pi4io1_i2c_addr, 0x01).has_value()
           && lgfx::i2c::readRegister8(probe_i2c_port, pi4io2_i2c_addr, 0x01).has_value();
         if (id != 0) {
-          board = board_t::board_M5Tab5;
-          ESP_LOGI(LIBRARY_NAME, "[Autodetect] board_M5Tab5");
+          if (board == 0)
+            board = board_t::board_M5Tab5;
+          ESP_LOGI(LIBRARY_NAME, "[Autodetect] %s",
+                   board == board_t::board_M5Tab5X ? "board_M5Tab5X" : "board_M5Tab5");
 
           static constexpr const uint8_t reg_data_io1_1[] = {
             0x03, 0b01111111, 0,   // PI4IO_REG_IO_DIR
@@ -3707,6 +3849,7 @@ The usage of each pin is as follows.
     case board_M5Station:      title = "M5Station";      break;
     case board_M5StopWatch:    title = "M5StopWatch";    break;
     case board_M5ChainCaptain: title = "M5ChainCaptain"; break;
+    case board_M5CoreP4X:      title = "M5CoreP4X";      break;
     case board_M5AtomS3:       title = "M5AtomS3";       break;
     case board_M5AtomS3R:      title = "M5AtomS3R";      break;
     case board_M5Dial:         title = "M5Dial";         break;
@@ -3717,6 +3860,7 @@ The usage of each pin is as follows.
     case board_M5VAMeter:      title = "M5VAMeter";      break;
     case board_M5StampPLC:     title = "M5StampPLC";     break;
     case board_M5Tab5:         title = "M5Tab5";         break;
+    case board_M5Tab5X:        title = "M5Tab5X";        break;
     case board_M5UnitPoEP4:    title = "M5UnitPoEP4";    break;
     case board_ArduinoNessoN1: title = "ArduinoNessoN1"; break;
     default:                   title = "M5GFX";          break;
@@ -3809,6 +3953,7 @@ The usage of each pin is as follows.
       break;
 
     case board_M5Tab5:
+    case board_M5Tab5X:
       w = 720;
       h = 1280;
       break;

src/lgfx/boards.hpp

@@ -43,6 +43,7 @@ namespace lgfx // This should not be changed to "m5gfx"
     , board_M5ChainCaptain = 32
     , board_M5ToughC5 = 33
     , board_M5PaperDIY = 34
+    , board_M5Tab5X = 35
 
 /// non display boards
     , board_M5AtomLite = 128

src/lgfx/v1/gitTagVersion.h

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