rework espidf matrix and add C6

gin66 · Aug 25, 2024 · 34f4a5d · 34f4a5d
1 parent ddbf73f
commit 34f4a5d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 21 deletions.
diff --git a/.github/workflows/build_idf_examples_matrix.yml b/.github/workflows/build_idf_examples_matrix.yml
@@ -24,11 +24,12 @@ jobs:
           # - esp32_idf_V6_7_0 fails due to missing simple encoder
           - esp32_idf_V6_8_1
           - esp32c3_idf_V5_3_0
-          # - esp32c3_idf_V6_0_0 fails
+          - esp32c3_idf_V6_8_1
+          - esp32c6_idf_V6_8_1
           - esp32s2_idf_V5_3_0
-          # - esp32s2_idf_V6_0_0 fails
+          - esp32s2_idf_V6_8_1
           - esp32s3_idf_V5_3_0
-          # - esp32s3_idf_V6_0_0 fails
+          - esp32s3_idf_V6_8_1
 
     runs-on: ubuntu-latest
 

diff --git a/extras/ci/platformio.ini b/extras/ci/platformio.ini
@@ -301,14 +301,6 @@ build_flags = -Wall
 board_build.f_cpu = 240000000L
 lib_extra_dirs = ../../..
 
-[env:esp32_idf_V6_3_0]
-platform    = espressif32 @ 5.3.0
-board       = esp32dev
-framework   = espidf
-build_flags = -Werror -Wall -Wno-deprecated-declarations -Wno-error=incompatible-pointer-types -Wno-unused-function -Wno-error=attributes
-board_build.f_cpu = 240000000L
-lib_extra_dirs = ../..
-
 [env:esp32_idf_V6_8_1]
 platform    = espressif32 @ 6.8.1
 board       = esp32dev
@@ -365,8 +357,8 @@ lib_extra_dirs = ../..
 #board_build.f_cpu = 240000000L
 #lib_extra_dirs = ../../
 
-[env:esp32c3_idf_V6_0_0]
-platform    = espressif32 @ 6.0.0
+[env:esp32c3_idf_V6_8_1]
+platform    = espressif32 @ 6.8.1
 board       = esp32-c3-devkitm-1
 framework   = espidf
 build_flags = -Werror -Wall -Wno-deprecated-declarations -Wno-error=incompatible-pointer-types -Wno-unused-function -Wno-error=attributes
@@ -381,8 +373,8 @@ build_flags = -Werror -Wall -Wno-deprecated-declarations -Wno-error=incompatible
 board_build.f_cpu = 240000000L
 lib_extra_dirs = ../..
 
-[env:esp32s2_idf_V6_0_0]
-platform    = espressif32 @ 6.0.0
+[env:esp32s2_idf_V6_8_1]
+platform    = espressif32 @ 6.8.1
 board       = esp32-s2-saola-1
 framework   = espidf
 build_flags = -Werror -Wall -Wno-deprecated-declarations -Wno-error=incompatible-pointer-types -Wno-unused-function -Wno-error=attributes
@@ -397,8 +389,8 @@ build_flags = -Werror -Wall -Wno-deprecated-declarations -Wno-error=incompatible
 board_build.f_cpu = 240000000L
 lib_extra_dirs = ../..
 
-[env:esp32s3_idf_V6_0_0]
-platform    = espressif32 @ 6.0.0
+[env:esp32s3_idf_V6_8_1]
+platform    = espressif32 @ 6.8.1
 board       = esp32-s3-devkitc-1
 framework   = espidf
 build_flags = -Werror -Wall -Wno-deprecated-declarations -Wno-error=incompatible-pointer-types -Wno-unused-function -Wno-error=attributes
@@ -413,6 +405,22 @@ build_flags = -Werror -Wall -Wno-deprecated-declarations -Wno-error=incompatible
 board_build.f_cpu = 240000000L
 lib_extra_dirs = ../..
 
+[env:esp32c6_idf_V6_8_1]
+platform    = espressif32 @ 6.8.1
+board       = esp32-c6-devkitm-1
+framework   = espidf
+build_flags = -Werror -Wall -Wno-deprecated-declarations -Wno-error=incompatible-pointer-types -Wno-unused-function -Wno-error=attributes
+board_build.f_cpu = 240000000L
+lib_extra_dirs = ../..
+
+[env:esp32h2_idf_V6_8_1]
+platform    = espressif32 @ 6.8.1
+board       = esp32-h2-devkitm-1
+framework   = espidf
+build_flags = -Werror -Wall -Wno-deprecated-declarations -Wno-error=incompatible-pointer-types -Wno-unused-function -Wno-error=attributes
+board_build.f_cpu = 240000000L
+lib_extra_dirs = ../..
+
 #[env:esp32s2]
 #board = esp32-s2-saola-1
 #framework = arduino

diff --git a/src/fas_arch/common_esp32_idf5.h b/src/fas_arch/common_esp32_idf5.h
@@ -48,7 +48,7 @@
 #define SUPPORT_ESP32_RMT
 #define SUPPORT_ESP32_PULSE_COUNTER 8
 #define HAVE_ESP32S3_PULSE_COUNTER
-#define HAVE_ESP32S3_RMT
+#define HAVE_ESP32_RMT
 #define RMT_SIZE 48
 
 //#define QUEUES_MCPWM_PCNT 4
@@ -65,7 +65,7 @@
 //==========================================================================
 #elif CONFIG_IDF_TARGET_ESP32C3
 #define SUPPORT_ESP32_RMT
-#define HAVE_ESP32C3_RMT
+#define HAVE_ESP32_RMT
 #define RMT_SIZE 48
 #define QUEUES_MCPWM_PCNT 0
 #define QUEUES_RMT 2
@@ -79,7 +79,7 @@
 #elif CONFIG_IDF_TARGET_ESP32C6
 #define SUPPORT_ESP32_RMT
 #define SUPPORT_ESP32_PULSE_COUNTER 4
-#define HAVE_ESP32C3_RMT
+#define HAVE_ESP32_RMT
 #define RMT_SIZE 48
 #define QUEUES_MCPWM_PCNT 0
 #define QUEUES_RMT 2
@@ -94,7 +94,7 @@
 #elif CONFIG_IDF_TARGET_ESP32H2
 #define SUPPORT_ESP32_RMT
 #define SUPPORT_ESP32_PULSE_COUNTER 4
-#define HAVE_ESP32C3_RMT
+#define HAVE_ESP32_RMT
 #define RMT_SIZE 48
 #define QUEUES_MCPWM_PCNT 0
 #define QUEUES_RMT 2