Merge pull request #108 from m5stack/develop

0.2.0

Author: lovyan03

.github/workflows/pioPkgPublish.yml

@@ -0,0 +1,42 @@
+name: pioPkgPublish
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Cache pip
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+      - name: Cache PlatformIO
+        uses: actions/cache@v3
+        with:
+          path: ~/.platformio
+          key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
+      - name: Set up Python
+        uses: actions/setup-python@v4
+
+      - name: Install PlatformIO
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade platformio
+
+      - name: Run PlatformIO
+        env:
+          PLATFORMIO_AUTH_TOKEN: ${{ secrets.PLATFORMIO_AUTH_TOKEN }}
+        run: |
+          pio package publish --owner m5stack --non-interactive

library.json

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

library.properties

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

src/M5AtomDisplay.h

@@ -148,9 +148,9 @@ class M5AtomDisplay : public M5GFX
     int spi_miso = GPIO_NUM_22;
     int spi_sclk = GPIO_NUM_5;
 
-    std::uint32_t pkg_ver = lgfx::get_pkg_ver();
+    uint32_t pkg_ver = lgfx::get_pkg_ver();
 #if defined ( ESP_LOGD )
-    ESP_LOGD("LGFX","pkg:%d", pkg_ver);
+    ESP_LOGD("LGFX","pkg:%d", (int)pkg_ver);
 #endif
     switch (pkg_ver)
     {

src/M5GFX.cpp

@@ -1165,8 +1165,10 @@ namespace m5gfx
 
     std::uint32_t id;
 
-//     std::uint32_t pkg_ver = m5gfx::get_pkg_ver();
-// ESP_LOGE("DEBUG","pkg_ver:%02x", (int)pkg_ver);
+    std::uint32_t pkg_ver = m5gfx::get_pkg_ver();
+//  ESP_LOGD(LIBRARY_NAME, "pkg_ver : %02x", (int)pkg_ver);
+    switch (pkg_ver) {
+    case 0: // EFUSE_PKG_VERSION_ESP32S3:     // QFN56
 
       if (board == 0 || board == board_t::board_M5StackCoreS3 || board == board_t::board_M5StackCoreS3SE)
       {
@@ -1255,50 +1257,6 @@ namespace m5gfx
         lgfx::i2c::release(i2c_port);
       }
 
-      if (board == 0 || board == board_t::board_M5AtomS3R)
-      {
-        _pin_reset(GPIO_NUM_48, use_reset); // LCD RST
-        bus_cfg.pin_mosi = GPIO_NUM_21;
-        bus_cfg.pin_miso = (gpio_num_t)-1; //GPIO_NUM_NC;
-        bus_cfg.pin_sclk = GPIO_NUM_15;
-        bus_cfg.pin_dc   = GPIO_NUM_42;
-        bus_cfg.spi_mode = 0;
-        bus_cfg.spi_3wire = true;
-        bus_spi->config(bus_cfg);
-        bus_spi->init();
-        id = _read_panel_id(bus_spi, GPIO_NUM_14);
-        if ((id & 0xFFFFFF) == 0x079100)
-        {  //  check panel (GC9107)
-          board = board_t::board_M5AtomS3R;
-          ESP_LOGW(LIBRARY_NAME, "[Autodetect] board_M5AtomS3R");
-          bus_spi->release();
-          bus_cfg.spi_host = SPI3_HOST;
-          bus_cfg.freq_write = 40000000;
-          bus_cfg.freq_read  = 16000000;
-          bus_spi->config(bus_cfg);
-          bus_spi->init();
-          auto p = new Panel_GC9107();
-          p->bus(bus_spi);
-          {
-            auto cfg = p->config();
-            cfg.pin_cs  = GPIO_NUM_14;
-            cfg.pin_rst = GPIO_NUM_48;
-            cfg.panel_width = 128;
-            cfg.panel_height = 128;
-            cfg.offset_y = 32;
-            cfg.readable = false;
-            cfg.bus_shared = false;
-            p->config(cfg);
-          }
-          _panel_last.reset(p);
-          _set_backlight(new Light_M5StackAtomS3R());
-
-          goto init_clear;
-        }
-        lgfx::pinMode(GPIO_NUM_48, lgfx::pin_mode_t::input); // LCD RST
-        bus_spi->release();
-      }
-
       if (board == 0 || board == board_t::board_M5AtomS3)
       {
         _pin_reset(GPIO_NUM_34, use_reset); // LCD RST
@@ -1346,7 +1304,7 @@ namespace m5gfx
       {
         _pin_reset(GPIO_NUM_8, use_reset); // LCD RST
         bus_cfg.pin_mosi = GPIO_NUM_5;
-        bus_cfg.pin_miso = GPIO_NUM_NC;
+        bus_cfg.pin_miso = (gpio_num_t)-1; //GPIO_NUM_NC;
         bus_cfg.pin_sclk = GPIO_NUM_6;
         bus_cfg.pin_dc   = GPIO_NUM_4;
         bus_cfg.spi_mode = 0;
@@ -1415,7 +1373,7 @@ namespace m5gfx
       {
         _pin_reset(GPIO_NUM_8, use_reset); // LCD RST
         bus_cfg.pin_mosi = GPIO_NUM_5;
-        bus_cfg.pin_miso = GPIO_NUM_NC;
+        bus_cfg.pin_miso = (gpio_num_t)-1; //GPIO_NUM_NC;
         bus_cfg.pin_sclk = GPIO_NUM_6;
         bus_cfg.pin_dc   = GPIO_NUM_4;
         bus_cfg.spi_mode = 0;
@@ -1460,7 +1418,7 @@ namespace m5gfx
       {
         _pin_reset(GPIO_NUM_33, use_reset); // LCD RST
         bus_cfg.pin_mosi = GPIO_NUM_35;
-        bus_cfg.pin_miso = GPIO_NUM_NC;
+        bus_cfg.pin_miso = (gpio_num_t)-1; //GPIO_NUM_NC;
         bus_cfg.pin_sclk = GPIO_NUM_36;
         bus_cfg.pin_dc   = GPIO_NUM_34;
         bus_cfg.spi_mode = 0;
@@ -1533,7 +1491,7 @@ namespace m5gfx
       {
         _pin_reset( GPIO_NUM_2, true); // EPDがDeepSleepしている場合は自動認識に失敗する。そのためRST制御を必ず行う。;
         bus_cfg.pin_mosi = GPIO_NUM_6;
-        bus_cfg.pin_miso = GPIO_NUM_NC;
+        bus_cfg.pin_miso = (gpio_num_t)-1; //GPIO_NUM_NC;
         bus_cfg.pin_sclk = GPIO_NUM_5;
         bus_cfg.pin_dc   = GPIO_NUM_3;
         bus_cfg.spi_3wire = true;
@@ -1577,6 +1535,58 @@ namespace m5gfx
         bus_spi->release();
       }
 
+      break;
+    case 1: // EFUSE_PKG_VERSION_ESP32S3PICO: // LGA56
+
+      if (board == 0 || board == board_t::board_M5AtomS3R)
+      {
+        _pin_reset(GPIO_NUM_48, use_reset); // LCD RST
+        bus_cfg.pin_mosi = GPIO_NUM_21;
+        bus_cfg.pin_miso = (gpio_num_t)-1; //GPIO_NUM_NC;
+        bus_cfg.pin_sclk = GPIO_NUM_15;
+        bus_cfg.pin_dc   = GPIO_NUM_42;
+        bus_cfg.spi_mode = 0;
+        bus_cfg.spi_3wire = true;
+        bus_spi->config(bus_cfg);
+        bus_spi->init();
+        id = _read_panel_id(bus_spi, GPIO_NUM_14);
+        if ((id & 0xFFFFFF) == 0x079100)
+        {  //  check panel (GC9107)
+          board = board_t::board_M5AtomS3R;
+          ESP_LOGW(LIBRARY_NAME, "[Autodetect] board_M5AtomS3R");
+          bus_spi->release();
+          bus_cfg.spi_host = SPI3_HOST;
+          bus_cfg.freq_write = 40000000;
+          bus_cfg.freq_read  = 16000000;
+          bus_spi->config(bus_cfg);
+          bus_spi->init();
+          auto p = new Panel_GC9107();
+          p->bus(bus_spi);
+          {
+            auto cfg = p->config();
+            cfg.pin_cs  = GPIO_NUM_14;
+            cfg.pin_rst = GPIO_NUM_48;
+            cfg.panel_width = 128;
+            cfg.panel_height = 128;
+            cfg.offset_y = 32;
+            cfg.readable = false;
+            cfg.bus_shared = false;
+            p->config(cfg);
+          }
+          _panel_last.reset(p);
+          _set_backlight(new Light_M5StackAtomS3R());
+
+          goto init_clear;
+        }
+        lgfx::pinMode(GPIO_NUM_48, lgfx::pin_mode_t::input); // LCD RST
+        bus_spi->release();
+      }
+
+      break;
+
+    default: break;
+    }
+
 #endif
 
     board = board_t::board_unknown;

src/M5ModuleRCA.h

@@ -16,7 +16,7 @@
  #if defined ( CONFIG_IDF_TARGET_ESP32 ) || !defined ( CONFIG_IDF_TARGET )
   #define M5MODULERCA_PIN_DAC GPIO_NUM_26
  #else
-  #define M5MODULERCA_PIN_DAC GPIO_NUM_NC
+  #define M5MODULERCA_PIN_DAC ((gpio_num_t)-1) //GPIO_NUM_NC;
  #endif
 #endif
 #else

src/M5UnitRCA.h

@@ -16,7 +16,7 @@
  #if defined ( CONFIG_IDF_TARGET_ESP32 ) || !defined ( CONFIG_IDF_TARGET )
   #define M5UNITRCA_PIN_DAC GPIO_NUM_26
  #else
-  #define M5UNITRCA_PIN_DAC GPIO_NUM_NC
+  #define M5UNITRCA_PIN_DAC ((gpio_num_t)-1) //GPIO_NUM_NC;
  #endif
 #endif
 #else

src/lgfx/boards.hpp

@@ -27,8 +27,9 @@ namespace lgfx // This should not be changed to "m5gfx"
     , board_M5AtomS3R
 
 /// non display boards 
-    , board_M5Atom = 128
-    , board_M5ATOM = board_M5Atom
+    , board_M5AtomLite = 128
+    , board_M5ATOM __attribute__ ((deprecated)) = board_M5AtomLite
+    , board_M5Atom __attribute__ ((deprecated)) = board_M5AtomLite
     , board_M5AtomPsram
     , board_M5AtomU
     , board_M5Camera
@@ -41,6 +42,10 @@ namespace lgfx // This should not be changed to "m5gfx"
     , board_M5AtomS3U
     , board_M5Capsule
     , board_M5NanoC6
+    , board_M5AtomMatrix
+    , board_M5AtomEcho
+    , board_M5AtomS3RExt
+    , board_M5AtomS3RCam
 
 /// external displays
     , board_M5AtomDisplay = 192

src/lgfx/utility/pgmspace.h

@@ -41,7 +41,7 @@ Original Source:
 
 /// for  not ESP8266
 #if !defined ( pgm_read_dword_with_offset )
- #if defined (__SAMD21__) || defined(__SAMD21G18A__) || defined(__SAMD21J18A__) || defined(__SAMD21E17A__) || defined(__SAMD21E18A__) || defined(ARDUINO_ARCH_MBED_RP2040) || defined(ARDUINO_ARCH_RP2040)
+ #if defined (__SAMD21__) || defined(__SAMD21G18A__) || defined(__SAMD21J18A__) || defined(__SAMD21E17A__) || defined(__SAMD21E18A__) || defined(ARDUINO_ARCH_MBED_RP2040) || defined(ARDUINO_ARCH_RP2040) || defined(USE_PICO_SDK)
   #define pgm_read_word_unaligned(addr) (uint16_t) \
     ( *(const uint8_t *)((uintptr_t)addr) \
     | *(const uint8_t *)((uintptr_t)addr+1) << 8 )
@@ -64,7 +64,7 @@ Original Source:
  #define pgm_read_3byte_unaligned(addr) (pgm_read_dword_unaligned(addr) & 0xFFFFFFu)
 #endif
 
-#if defined ( ESP8266 ) || defined (__SAMD21__) || defined(__SAMD21G18A__) || defined(__SAMD21J18A__) || defined(__SAMD21E17A__) || defined(__SAMD21E18A__) || defined(ARDUINO_ARCH_MBED_RP2040) || defined(ARDUINO_ARCH_RP2040)
+#if defined ( ESP8266 ) || defined (__SAMD21__) || defined(__SAMD21G18A__) || defined(__SAMD21J18A__) || defined(__SAMD21E17A__) || defined(__SAMD21E18A__) || defined(ARDUINO_ARCH_MBED_RP2040) || defined(ARDUINO_ARCH_RP2040) || defined(USE_PICO_SDK)
   static inline void write_3byte_unaligned(void* addr, uint32_t value)
   {
     ((uint8_t*)(addr))[0] = value;

src/lgfx/v1/LGFXBase.cpp

@@ -2575,7 +2575,7 @@ namespace lgfx
 
 //----------------------------------------------------------------------------
 
-  void LGFXBase::qrcode(const char *string, int32_t x, int32_t y, int32_t w, uint8_t version) {
+  void LGFXBase::qrcode(const char *string, int32_t x, int32_t y, int32_t w, uint8_t version, bool margin) {
     if (w == -1) {
       w = std::min(width(), height()) * 9 / 10;
     }
@@ -2592,6 +2592,16 @@ namespace lgfx
       int_fast16_t thickness = w / qrcode.size;
       int_fast16_t lineLength = qrcode.size * thickness;
       int_fast16_t offset = (w - lineLength) >> 1;
+
+      if(margin) {
+        int_fast16_t mlen = thickness * 4; // Need 4 cell or greater margin
+        if(offset < mlen) {
+          thickness = (w - (mlen << 1)) / qrcode.size;
+          lineLength = qrcode.size * thickness;
+          offset = (w - lineLength) >> 1;
+        }
+      }
+
       startWrite();
       writeFillRect(x, y, w, offset, TFT_WHITE);
       int_fast16_t dy = y + offset;