fix indentation for esp32-c3

.github/workflows/stale.yml

@@ -0,0 +1,25 @@
+name: 'Close stale issues and PRs'
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 4 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Checkout script repository
+        uses: actions/checkout@v4
+        with:
+            repository: Seeed-Studio/sync-github-all-issues
+            path: ci
+
+      - name: Run script
+        run: ./ci/tools/stale.sh
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sync_issues.yml

@@ -0,0 +1,24 @@
+name: Automate Issue Management
+
+on:
+  issues:
+    types:
+      - opened
+      - edited
+      - assigned
+      - unassigned
+      - labeled
+      - unlabeled
+      - reopened
+
+jobs:
+  add_issue_to_project:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add issue to GitHub Project
+        uses: actions/add-to-project@v1.0.2
+        with:
+          project-url: https://github.com/orgs/Seeed-Studio/projects/17
+          github-token: ${{ secrets.ISSUE_ASSEMBLE }}
+          labeled: bug
+          label-operator: NOT

.gitignore

@@ -1,3 +1,5 @@
+.vscode
+
 # Windows image file caches
 Thumbs.db
 ehthumbs.db

Extensions/EPaper.cpp

@@ -0,0 +1,76 @@
+EPaper::EPaper() : _sleep(false), TFT_eSprite(this)
+{
+    setColorDepth(EPD_COLOR_DEPTH);
+    createSprite(_width, _height, 1);
+}
+
+void EPaper::begin(uint8_t tc)
+{
+    setBitmapColor(1, 0);
+    setTextFont(1);
+    setTextColor(TFT_BLACK, TFT_WHITE, true);
+    init(tc);
+    fillSprite(1);
+#ifdef EPD_HORIZONTAL_MIRROR
+    EPD_PUSH_OLD_COLORS_FLIP(_width, _height, _img8);
+    fillSprite(0);
+    EPD_PUSH_NEW_COLORS_FLIP(_width, _height, _img8);
+#else
+    EPD_PUSH_OLD_COLORS(_width, _height, _img8);
+    fillSprite(0);
+    EPD_PUSH_NEW_COLORS(_width, _height, _img8);
+#endif
+    EPD_UPDATE();
+    EPD_WAKEUP();
+}
+
+void EPaper::update()
+{
+    wake();
+    EPD_SET_WINDOW(0, 0, (_width - 1), (_height - 1));
+#ifdef EPD_HORIZONTAL_MIRROR
+    EPD_PUSH_NEW_COLORS_FLIP(_width, _height, _img8);
+#else
+    EPD_PUSH_NEW_COLORS(_width, _height, _img8);
+#endif
+    EPD_UPDATE();
+    sleep();
+}
+
+void EPaper::update(uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t *data)
+{
+    if (_sleep)
+    {
+        EPD_WAKEUP();
+        _sleep = false;
+    }
+    uint8_t *p = (uint8_t *)data;
+    // only support x, y multiple of 8 (floor)
+    x = (x / 8) * 8;
+    y = (y / 8) * 8;
+    pushImage(x, y, w, h, (uint16_t *)p);
+    EPD_SET_WINDOW(x, y, (x + w - 1), (y + h - 1));
+#ifdef EPD_HORIZONTAL_MIRROR
+    EPD_PUSH_NEW_COLORS_FLIP(w, h, p);
+#else
+    EPD_PUSH_NEW_COLORS(w, h, p);
+#endif
+    EPD_UPDATE();
+    sleep();
+}
+
+void EPaper::sleep()
+{
+    if (_sleep)
+        return;
+    EPD_SLEEP();
+    _sleep = true;
+}
+
+void EPaper::wake()
+{
+    if (!_sleep)
+        return;
+    EPD_WAKEUP();
+    _sleep = false;
+}

Extensions/EPaper.h

@@ -0,0 +1,19 @@
+#include "TFT_eSPI.h"
+
+class EPaper : public TFT_eSprite
+{
+public:
+    explicit EPaper();
+
+    void begin(uint8_t tc = TAB_COLOUR);
+
+    void update();
+    void update(uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint16_t *data);
+
+    void sleep();
+    void wake();
+
+private:
+    bool _sleep;
+};
+

Processors/TFT_eSPI_ESP32_C3.c

@@ -259,7 +259,7 @@ void TFT_eSPI::pushBlock(uint16_t color, uint32_t len){
     while (*_spi_cmd&SPI_USR);
     for (i=0; i < rem; i+=2) *spi_w++ = color32;
     *_spi_mosi_dlen = (rem << 4) - 1;
-#if CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
     *_spi_cmd = SPI_UPDATE;
     while (*_spi_cmd & SPI_UPDATE);
 #endif
@@ -276,7 +276,7 @@ void TFT_eSPI::pushBlock(uint16_t color, uint32_t len){
   while(len)
   {
     while (*_spi_cmd&SPI_USR);
-#if CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
     *_spi_cmd = SPI_UPDATE;
     while (*_spi_cmd & SPI_UPDATE);
 #endif
@@ -325,7 +325,7 @@ void TFT_eSPI::pushSwapBytePixels(const void* data_in, uint32_t len){
       WRITE_PERI_REG(SPI_W13_REG(SPI_PORT), color[13]);
       WRITE_PERI_REG(SPI_W14_REG(SPI_PORT), color[14]);
       WRITE_PERI_REG(SPI_W15_REG(SPI_PORT), color[15]);
-#if CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
       SET_PERI_REG_MASK(SPI_CMD_REG(SPI_PORT), SPI_UPDATE);
       while (READ_PERI_REG(SPI_CMD_REG(SPI_PORT))&SPI_UPDATE);
 #endif
@@ -352,7 +352,7 @@ void TFT_eSPI::pushSwapBytePixels(const void* data_in, uint32_t len){
     WRITE_PERI_REG(SPI_W5_REG(SPI_PORT),  color[5]);
     WRITE_PERI_REG(SPI_W6_REG(SPI_PORT),  color[6]);
     WRITE_PERI_REG(SPI_W7_REG(SPI_PORT),  color[7]);
-#if CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
     SET_PERI_REG_MASK(SPI_CMD_REG(SPI_PORT), SPI_UPDATE);
     while (READ_PERI_REG(SPI_CMD_REG(SPI_PORT))&SPI_UPDATE);
 #endif
@@ -367,7 +367,7 @@ void TFT_eSPI::pushSwapBytePixels(const void* data_in, uint32_t len){
     for (uint32_t i=0; i <= (len<<1); i+=4) {
       WRITE_PERI_REG(SPI_W0_REG(SPI_PORT)+i, DAT8TO32(data)); data+=4;
     }
-#if CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
     SET_PERI_REG_MASK(SPI_CMD_REG(SPI_PORT), SPI_UPDATE);
     while (READ_PERI_REG(SPI_CMD_REG(SPI_PORT))&SPI_UPDATE);
 #endif
@@ -412,7 +412,7 @@ void TFT_eSPI::pushPixels(const void* data_in, uint32_t len){
       WRITE_PERI_REG(SPI_W13_REG(SPI_PORT), *data++);
       WRITE_PERI_REG(SPI_W14_REG(SPI_PORT), *data++);
       WRITE_PERI_REG(SPI_W15_REG(SPI_PORT), *data++);
-#if CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
       SET_PERI_REG_MASK(SPI_CMD_REG(SPI_PORT), SPI_UPDATE);
       while (READ_PERI_REG(SPI_CMD_REG(SPI_PORT))&SPI_UPDATE);
 #endif
@@ -426,7 +426,7 @@ void TFT_eSPI::pushPixels(const void* data_in, uint32_t len){
     while (READ_PERI_REG(SPI_CMD_REG(SPI_PORT))&SPI_USR);
     WRITE_PERI_REG(SPI_MOSI_DLEN_REG(SPI_PORT), (len << 4) - 1);
     for (uint32_t i=0; i <= (len<<1); i+=4) WRITE_PERI_REG((SPI_W0_REG(SPI_PORT) + i), *data++);
-#if CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
       SET_PERI_REG_MASK(SPI_CMD_REG(SPI_PORT), SPI_UPDATE);
       while (READ_PERI_REG(SPI_CMD_REG(SPI_PORT))&SPI_UPDATE);
 #endif
@@ -476,7 +476,7 @@ void TFT_eSPI::pushBlock(uint16_t color, uint32_t len)
       WRITE_PERI_REG(SPI_W12_REG(SPI_PORT), r0);
       WRITE_PERI_REG(SPI_W13_REG(SPI_PORT), r1);
       WRITE_PERI_REG(SPI_W14_REG(SPI_PORT), r2);
-#if CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
       SET_PERI_REG_MASK(SPI_CMD_REG(SPI_PORT), SPI_UPDATE);
       while (READ_PERI_REG(SPI_CMD_REG(SPI_PORT))&SPI_UPDATE);
 #endif
@@ -507,7 +507,7 @@ void TFT_eSPI::pushBlock(uint16_t color, uint32_t len)
       WRITE_PERI_REG(SPI_W13_REG(SPI_PORT), r1);
       WRITE_PERI_REG(SPI_W14_REG(SPI_PORT), r2);
     }
-#if CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
     SET_PERI_REG_MASK(SPI_CMD_REG(SPI_PORT), SPI_UPDATE);
     while (READ_PERI_REG(SPI_CMD_REG(SPI_PORT))&SPI_UPDATE);
 #endif
@@ -834,7 +834,7 @@ bool TFT_eSPI::initDMA(bool ctrl_cs)
     .pre_cb = 0, //dc_callback, //Callback to handle D/C line
     .post_cb = 0
   };
-  ret = spi_bus_initialize(spi_host, &buscfg, DMA_CHANNEL);
+  ret = spi_bus_initialize(spi_host, &buscfg, SPI_DMA_CH_AUTO);
   ESP_ERROR_CHECK(ret);
   ret = spi_bus_add_device(spi_host, &devcfg, &dmaHAL);
   ESP_ERROR_CHECK(ret);

Processors/TFT_eSPI_ESP32_C3.h

@@ -19,7 +19,7 @@
 #include "driver/spi_master.h"
 #include "hal/gpio_ll.h"
 
-#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32)
+#if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32) 
   #define CONFIG_IDF_TARGET_ESP32
 #endif
 
@@ -28,7 +28,7 @@
 #endif
 
 // Fix IDF problems with ESP32C3
-#if CONFIG_IDF_TARGET_ESP32C3
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
   // Fix ESP32C3 IDF bug for missing definition (VSPI/FSPI only tested at the moment)
   #ifndef REG_SPI_BASE
     #define REG_SPI_BASE(i) DR_REG_SPI2_BASE
@@ -68,7 +68,11 @@ SPI3_HOST = 2
 */
 
 // ESP32 specific SPI port selection - only SPI2_HOST available on C3
-#define SPI_PORT SPI2_HOST
+#if ESP_ARDUINO_VERSION_MAJOR < 3
+  #define SPI_PORT SPI2_HOST
+#else
+  #define SPI_PORT 2
+#endif
 
 #ifdef RPI_DISPLAY_TYPE
   #define CMD_BITS (16-1)
@@ -313,7 +317,7 @@ SPI3_HOST = 2
       #define TFT_SCLK 18
     #endif
 
-    #if defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S2)
+    #if defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32C6)
       #if (TFT_MISO == -1)
         #undef TFT_MISO
         #define TFT_MISO TFT_MOSI
@@ -532,18 +536,18 @@ SPI3_HOST = 2
   #define tft_Write_32D(C) TFT_WRITE_BITS((uint16_t)((C)<<8 | (C)>>8)<<16 | (uint16_t)((C)<<8 | (C)>>8), 32)
 //*/
 //* Replacement slimmer macros
-  #if !defined(CONFIG_IDF_TARGET_ESP32C3)
-    #define TFT_WRITE_BITS(D, B) *_spi_mosi_dlen = B-1;  \
-                               *_spi_w = D;              \
-                               *_spi_cmd = SPI_USR;      \
-                        while (*_spi_cmd & SPI_USR);
+  #if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C6)
+    #define TFT_WRITE_BITS(D, B)  *_spi_mosi_dlen = B-1;  \
+                                  *_spi_w = D;              \
+                                  *_spi_cmd = SPI_USR;      \
+                                  while (*_spi_cmd & SPI_USR);
   #else
-    #define TFT_WRITE_BITS(D, B) *_spi_mosi_dlen = B-1;  \
-                               *_spi_w = D;              \
-                               *_spi_cmd = SPI_UPDATE;   \
-                        while (*_spi_cmd & SPI_UPDATE);  \
-                               *_spi_cmd = SPI_USR;      \
-                        while (*_spi_cmd & SPI_USR);
+    #define TFT_WRITE_BITS(D, B)  *_spi_mosi_dlen = B-1;  \
+                                  *_spi_w = D;              \
+                                  *_spi_cmd = SPI_UPDATE;   \
+                                  while (*_spi_cmd & SPI_UPDATE);  \
+                                  *_spi_cmd = SPI_USR;      \
+                                  while (*_spi_cmd & SPI_USR);
   #endif
   // Write 8 bits
   #define tft_Write_8(C) TFT_WRITE_BITS(C, 8)
@@ -552,16 +556,16 @@ SPI3_HOST = 2
   #define tft_Write_16(C) TFT_WRITE_BITS((C)<<8 | (C)>>8, 16)
 
   // Future option for transfer without wait
-  #if !defined(CONFIG_IDF_TARGET_ESP32C3)
-    #define tft_Write_16N(C) *_spi_mosi_dlen = 16-1;    \
-                           *_spi_w = ((C)<<8 | (C)>>8); \
-                           *_spi_cmd = SPI_USR;
+  #if !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32C6)
+    #define tft_Write_16N(C)  *_spi_mosi_dlen = 16-1;    \
+                              *_spi_w = ((C)<<8 | (C)>>8); \
+                              *_spi_cmd = SPI_USR;
   #else
-    #define tft_Write_16N(C) *_spi_mosi_dlen = 16-1;    \
-                           *_spi_w = ((C)<<8 | (C)>>8); \
-                           *_spi_cmd = SPI_UPDATE;      \
-                    while (*_spi_cmd & SPI_UPDATE);     \
-                           *_spi_cmd = SPI_USR;
+    #define tft_Write_16N(C)  *_spi_mosi_dlen = 16-1;    \
+                              *_spi_w = ((C)<<8 | (C)>>8); \
+                              *_spi_cmd = SPI_UPDATE;      \
+                              while (*_spi_cmd & SPI_UPDATE);     \
+                              *_spi_cmd = SPI_USR;
   #endif
 
   // Write 16 bits

Processors/TFT_eSPI_Generic.h

@@ -32,8 +32,8 @@
 // If smooth fonts are enabled the filing system may need to be loaded
 #ifdef SMOOTH_FONT
   // Call up the filing system for the anti-aliased fonts
-  //#define FS_NO_GLOBALS
-  //#include <FS.h>
+  #define FS_NO_GLOBALS
+  #include <Seeed_Arduino_FS.h>
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////////////