[ESP] Add ESP32C3 DevKitM support to all-clusters-app (#6345)

* update idf version to tag v4.3 and support esp32c3 for all-clusters-app

* fix wrong TLVWriter::Put function calling

config/esp32/components/chip/CMakeLists.txt

@@ -61,6 +61,7 @@ chip_gn_arg_bool("is_debug"                is_debug)
 
 if(CONFIG_ENABLE_PW_RPC)
     string(APPEND chip_gn_args "import(\"//build_overrides/pigweed.gni\")\n")
+    chip_gn_arg_append("remove_default_configs"             "[\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_build:cpp17\"]")
     chip_gn_arg_append("chip_build_pw_rpc_lib"              "true")
     chip_gn_arg_append("pw_log_BACKEND"                     "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log_basic\"")
     chip_gn_arg_append("pw_assert_BACKEND"                  "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log\"")

config/esp32/components/chip/component.mk

@@ -134,6 +134,7 @@ ifeq ($(is_debug),false)
 endif
 	if [[ "$(CONFIG_ENABLE_PW_RPC)" = "y" ]]; then                        \
 	  echo "chip_build_pw_rpc_lib = true" >> $(OUTPUT_DIR)/args.gn       ;\
+	  echo "remove_default_configs = [\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_build:cpp17\"]" >> $(OUTPUT_DIR)/args.gn		;\
 	  echo "pw_log_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log_basic\"" >> $(OUTPUT_DIR)/args.gn     ;\
 	  echo "pw_assert_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log\"" >> $(OUTPUT_DIR)/args.gn ;\
 	  echo "pw_sys_io_BACKEND = \"//third_party/connectedhomeip/examples/platform/esp32/pw_sys_io:pw_sys_io_esp32\"" >> $(OUTPUT_DIR)/args.gn      ;\

examples/all-clusters-app/esp32/CMakeLists.txt

@@ -21,11 +21,17 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
 set(EXTRA_COMPONENT_DIRS
     "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/config/esp32/components"
-    "${CMAKE_CURRENT_LIST_DIR}/../../common/m5stack-tft/repo/components"
     "${CMAKE_CURRENT_LIST_DIR}/../../common/QRCode"
+)
+if(${IDF_TARGET} STREQUAL "esp32")
+set(EXTRA_COMPONENT_DIRS
+    ${EXTRA_COMPONENT_DIRS}
+    "${CMAKE_CURRENT_LIST_DIR}/../../common/m5stack-tft/repo/components/tft"
+    "${CMAKE_CURRENT_LIST_DIR}/../../common/m5stack-tft/repo/components/spidriver"
     "${CMAKE_CURRENT_LIST_DIR}/../../common/screen-framework"
 )
+endif()
 
 project(chip-all-clusters-app)
-idf_build_set_property(CXX_COMPILE_OPTIONS "-std=c++14;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
+idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++14;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
 idf_build_set_property(C_COMPILE_OPTIONS "-Os;-DLWIP_IPV6_SCOPES=0" APPEND)

examples/all-clusters-app/esp32/README.md

@@ -23,26 +23,29 @@ devices: the
 [ESP32-DevKitC](https://www.espressif.com/en/products/hardware/esp32-devkitc/overview),
 the
 [ESP32-WROVER-KIT_V4.1](https://www.espressif.com/en/products/hardware/esp-wrover-kit/overview),
-and the [M5Stack](http://m5stack.com).
+the [M5Stack](http://m5stack.com), and the
+[ESP32C3-DevKitM](https://docs.espressif.com/projects/esp-idf/en/latest/esp32c3/hw-reference/esp32c3/user-guide-devkitm-1.html).
 
 Note: M5Stack Core 2 display is not supported in the tft component, while other
 functionality can still work fine.
 
 ## Building the Example Application
 
 Building the example application requires the use of the Espressif ESP32 IoT
-Development Framework and the xtensa-esp32-elf toolchain.
+Development Framework and the xtensa-esp32-elf toolchain for ESP32 modules or
+the riscv-esp32-elf toolchain for ESP32C3 modules.
 
 The VSCode devcontainer has these components pre-installed, so you can skip this
 step. To install these components manually, follow these steps:
 
--   Clone the Espressif ESP-IDF and checkout release/v4.2 branch
+-   Clone the Espressif ESP-IDF and checkout
+    [v4.3 tag](https://github.com/espressif/esp-idf/releases/v4.3)
 
           $ mkdir ${HOME}/tools
           $ cd ${HOME}/tools
           $ git clone https://github.com/espressif/esp-idf.git
           $ cd esp-idf
-          $ git checkout release/v4.2
+          $ git checkout v4.3
           $ git submodule update --init
           $ ./install.sh
 
@@ -69,6 +72,13 @@ make sure the IDF_PATH has been exported(See the manual setup steps above).
 
         $ source ./scripts/activate.sh
 
+-   Target Set
+
+To set IDF target, run set-target with one of the commands.
+
+          $ idf.py set-target esp32
+          $ idf.py set-target esp32c3
+
 -   Configuration Options
 
 To choose from the different configuration options, run menuconfig.
@@ -77,7 +87,7 @@ To choose from the different configuration options, run menuconfig.
 
 Select ESP32 based `Device Type` through `Demo`->`Device Type`. The device types
 that are currently supported include `ESP32-DevKitC` (default),
-`ESP32-WROVER-KIT_V4.1` and `M5Stack`
+`ESP32-WROVER-KIT_V4.1`, `M5Stack` and `ESP32C3-DevKitM`.
 
 -   To build the demo application.
 
@@ -207,11 +217,11 @@ commissioning and cluster control.
 ### Note
 
 This demo app illustrates controlling OnOff cluster (Server) attributes of an
-endpoint. For `ESP32-DevKitC` and `ESP32-WROVER-KIT_V4.1`, a GPIO (configurable
-through `STATUS_LED_GPIO_NUM` in `main/main.cpp`) is updated through the
-on/off/toggle commands from the `python-controller`. For `M5Stack`, a virtual
-Green LED on the display is used for the same.
-
-If you wish to see the actual effect of the commands on `ESP32-DevKitC` and
-`ESP32-WROVER-KIT_V4.1`, you will have to connect an external LED to GPIO
-`STATUS_LED_GPIO_NUM`.
+endpoint. For `ESP32-DevKitC`, `ESP32-WROVER-KIT_V4.1` and `ESP32C3-DevKitM`, a
+GPIO (configurable through `STATUS_LED_GPIO_NUM` in `main/main.cpp`) is updated
+through the on/off/toggle commands from the `python-controller`. For `M5Stack`,
+a virtual Green LED on the display is used for the same.
+
+If you wish to see the actual effect of the commands on `ESP32-DevKitC`,
+`ESP32-WROVER-KIT_V4.1` and `ESP32C3-DevKitM`, you will have to connect an
+external LED to GPIO `STATUS_LED_GPIO_NUM`.

examples/all-clusters-app/esp32/main/CMakeLists.txt

@@ -16,13 +16,15 @@
 #
 
 # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-idf_component_register(PRIV_INCLUDE_DIRS 
+# The list of src and include dirs must be in sync with that in all-clusters-app/esp32/main/component.mk
+set(PRIV_INCLUDE_DIRS_LIST
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/nlio/repo/include"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src"
                       "${CMAKE_CURRENT_LIST_DIR}/include"
-                      SRC_DIRS
+)
+set(SRC_DIRS_LIST
                       "${CMAKE_CURRENT_LIST_DIR}"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/gen"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/shell_extension"
@@ -62,7 +64,19 @@ idf_component_register(PRIV_INCLUDE_DIRS
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/relative-humidity-measurement-server"
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/pump-configuration-and-control-server"
                       #${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ias-zone-client
-                      PRIV_REQUIRES chip QRCode tft spidriver bt screen-framework)
+)
+
+if(("${CONFIG_DEVICE_TYPE_ESP32_DEVKITC}" STREQUAL "y") OR ("${CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM}" STREQUAL "y"))
+    set(PRIV_INCLUDE_DIRS_LIST ${PRIV_INCLUDE_DIRS_LIST}
+                               "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/screen-framework/include")
+    set(PRIV_REQUIRES_LIST chip QRCode bt)
+elseif(("${CONFIG_DEVICE_TYPE_M5STACK}" STREQUAL "y") OR ("${CONFIG_DEVICE_TYPE_ESP32_WROVER_KIT}" STREQUAL "y"))
+    set(PRIV_REQUIRES_LIST chip QRCode bt tft spidrier screen-framework)
+endif()
+
+idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
+                       SRC_DIRS ${SRC_DIRS_LIST}
+                       PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
 
 set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-DLWIP_IPV6_SCOPES=0" "-DCHIP_HAVE_CONFIG_H")

examples/all-clusters-app/esp32/main/Kconfig.projbuild

@@ -31,10 +31,16 @@ menu "Demo"
 
         config DEVICE_TYPE_ESP32_DEVKITC
             bool "ESP32-DevKitC"
+            depends on IDF_TARGET_ESP32
         config DEVICE_TYPE_ESP32_WROVER_KIT
             bool "ESP32-WROVER-KIT_V4.1"
+            depends on IDF_TARGET_ESP32
         config DEVICE_TYPE_M5STACK
             bool "M5Stack"
+            depends on IDF_TARGET_ESP32
+        config DEVICE_TYPE_ESP32_C3_DEVKITM
+            bool "EXP32C3-DevKitM"
+            depends on IDF_TARGET_ESP32C3
     endchoice
 
     choice
@@ -71,6 +77,7 @@ menu "Demo"
         int
         range 0 5
         default 0 if DEVICE_TYPE_ESP32_DEVKITC
+        default 0 if DEVICE_TYPE_ESP32_C3_DEVKITM
         default 3 if DEVICE_TYPE_M5STACK
         default 4 if DEVICE_TYPE_ESP32_WROVER_KIT
 

examples/all-clusters-app/esp32/main/main.cpp

@@ -85,6 +85,10 @@ using namespace ::chip::DeviceLayer;
 
 #define STATUS_LED_GPIO_NUM GPIO_NUM_2 // Use LED1 (blue LED) as status LED on DevKitC
 
+#elif CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM
+
+#define STATUS_LED_GPIO_NUM GPIO_NUM_2
+
 #else // !CONFIG_DEVICE_TYPE_ESP32_DEVKITC
 
 #error "Unsupported device type selected"

examples/lock-app/esp32/CMakeLists.txt

@@ -21,14 +21,15 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
 set(EXTRA_COMPONENT_DIRS
     "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/config/esp32/components"
-    "${CMAKE_CURRENT_LIST_DIR}/../../common/m5stack-tft/repo/components"
+    "${CMAKE_CURRENT_LIST_DIR}/../../common/m5stack-tft/repo/components/tft"
+    "${CMAKE_CURRENT_LIST_DIR}/../../common/m5stack-tft/repo/components/spidriver"
     "${CMAKE_CURRENT_LIST_DIR}/../../common/QRCode"
     "${CMAKE_CURRENT_LIST_DIR}/../../common/screen-framework"
 )
 
 project(chip-lock-app)
 # C++17 is required for RPC build.
-idf_build_set_property(CXX_COMPILE_OPTIONS "-std=c++17;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
+idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
 idf_build_set_property(C_COMPILE_OPTIONS "-Os;-DLWIP_IPV6_SCOPES=0" APPEND)
 
 if (CONFIG_ENABLE_PW_RPC)

examples/lock-app/esp32/README.md

@@ -22,13 +22,14 @@ Development Framework and the xtensa-esp32-elf toolchain.
 The VSCode devcontainer has these components pre-installed, so you can skip this
 step. To install these components manually, follow these steps:
 
--   Clone the Espressif ESP-IDF and checkout release/v4.2 branch
+-   Clone the Espressif ESP-IDF and checkout
+    [v4.3 tag](https://github.com/espressif/esp-idf/releases/v4.3)
 
           $ mkdir ${HOME}/tools
           $ cd ${HOME}/tools
           $ git clone https://github.com/espressif/esp-idf.git
           $ cd esp-idf
-          $ git checkout release/v4.2
+          $ git checkout v4.3
           $ git submodule update --init
           $ ./install.sh
 

examples/persistent-storage/esp32/CMakeLists.txt

@@ -23,5 +23,5 @@ set(EXTRA_COMPONENT_DIRS
 )
 
 project(persistent-storage)
-idf_build_set_property(CXX_COMPILE_OPTIONS "-std=c++14;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
+idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++14;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
 idf_build_set_property(C_COMPILE_OPTIONS "-Os;-DLWIP_IPV6_SCOPES=0" APPEND)

examples/persistent-storage/esp32/README.md

@@ -41,13 +41,14 @@ Development Framework and the xtensa-esp32-elf toolchain.
 The VSCode devcontainer has these components pre-installed, so you can skip this
 step. To install these components manually, follow these steps:
 
--   Clone the Espressif ESP-IDF and checkout release/v4.2 branch
+-   Clone the Espressif ESP-IDF and checkout
+    [v4.3 tag](https://github.com/espressif/esp-idf/releases/v4.3)
 
           $ mkdir ${HOME}/tools
           $ cd ${HOME}/tools
           $ git clone https://github.com/espressif/esp-idf.git
           $ cd esp-idf
-          $ git checkout release/v4.2
+          $ git checkout v4.3
           $ git submodule update --init
           $ ./install.sh
 

examples/pigweed-app/esp32/CMakeLists.txt

@@ -24,5 +24,5 @@ set(EXTRA_COMPONENT_DIRS
 )
 
 project(chip-pigweed-app)
-idf_build_set_property(CXX_COMPILE_OPTIONS "-std=c++17;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
+idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
 idf_build_set_property(C_COMPILE_OPTIONS "-Os;-DLWIP_IPV6_SCOPES=0" APPEND)

examples/pigweed-app/esp32/README.md

@@ -35,13 +35,14 @@ Development Framework and the xtensa-esp32-elf toolchain.
 The VSCode devcontainer has these components pre-installed, so you can skip this
 step. To install these components manually, follow these steps:
 
--   Clone the Espressif ESP-IDF and checkout release/v4.2 branch
+-   Clone the Espressif ESP-IDF and checkout
+    [v4.3 tag](https://github.com/espressif/esp-idf/releases/v4.3)
 
           $ mkdir ${HOME}/tools
           $ cd ${HOME}/tools
           $ git clone https://github.com/espressif/esp-idf.git
           $ cd esp-idf
-          $ git checkout release/v4.2
+          $ git checkout v4.3
           $ git submodule update --init
           $ ./install.sh
 

examples/shell/esp32/main/CMakeLists.txt

@@ -26,4 +26,4 @@ idf_component_register(SRCS main.cpp
                       PRIV_INCLUDE_DIRS
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src"
                       "${CHIP_SHELL_DIR}/shell_common/include"
-                      PRIV_REQUIRES chip nvs_flash bt console)
+                      PRIV_REQUIRES chip nvs_flash bt console esp32_mbedtls)

examples/temperature-measurement-app/esp32/CMakeLists.txt

@@ -27,11 +27,12 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
 set(EXTRA_COMPONENT_DIRS
     "${CMAKE_CURRENT_LIST_DIR}/third_party/connectedhomeip/config/esp32/components"
-    "${CMAKE_CURRENT_LIST_DIR}/../../common/m5stack-tft/repo/components"
+    "${CMAKE_CURRENT_LIST_DIR}/../../common/m5stack-tft/repo/components/tft"
+    "${CMAKE_CURRENT_LIST_DIR}/../../common/m5stack-tft/repo/components/spidriver"
     "${CMAKE_CURRENT_LIST_DIR}/../../common/QRCode"
     "${CMAKE_CURRENT_LIST_DIR}/../../common/screen-framework"
 )
 
 project(chip-temperature-measurement-app)
-idf_build_set_property(CXX_COMPILE_OPTIONS "-std=c++14;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
+idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++14;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
 idf_build_set_property(C_COMPILE_OPTIONS "-Os;-DLWIP_IPV6_SCOPES=0" APPEND)

examples/temperature-measurement-app/esp32/README.md

@@ -22,13 +22,14 @@ Development Framework and the xtensa-esp32-elf toolchain.
 The VSCode devcontainer has these components pre-installed, so you can skip this
 step. To install these components manually, follow these steps:
 
--   Clone the Espressif ESP-IDF and checkout release/v4.2 branch
+-   Clone the Espressif ESP-IDF and checkout
+    [v4.3 tag](https://github.com/espressif/esp-idf/releases/v4.3)
 
           $ mkdir ${HOME}/tools
           $ cd ${HOME}/tools
           $ git clone https://github.com/espressif/esp-idf.git
           $ cd esp-idf
-          $ git checkout release/v4.2
+          $ git checkout v4.3
           $ git submodule update --init
           $ ./install.sh
 

integrations/docker/images/chip-build-esp32/Dockerfile

@@ -7,9 +7,8 @@ RUN set -x \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y python libgcrypt20-dev \
     && mkdir -p /opt/espressif \
     && cd /opt/espressif \
-    && git clone --progress -b release/v4.2 https://github.com/espressif/esp-idf.git \
+    && git clone --progress -b v4.3 https://github.com/espressif/esp-idf.git \
     && cd esp-idf \
-    && git reset --hard d9ec7df3931bea46292f015a99d19a28670bd561 \
     && git submodule update --init --progress \
     && IDF_TOOLS_PATH=/opt/espressif/tools ./install.sh \
     && : # last line

integrations/docker/images/chip-build/version

@@ -1 +1 @@
-0.4.29
+0.4.30

scripts/constraints.txt

@@ -154,7 +154,7 @@ python-dateutil==2.8.1
     #   pykwalify
 python-engineio==4.2.0
     # via python-socketio
-python-socketio==5.3.0
+python-socketio<5
     # via flask-socketio
 pytz==2021.1
     # via pandas

scripts/requirements.esp32.txt

@@ -10,3 +10,6 @@ pygdbmi<=0.9.0.2
 reedsolo>=1.5.3,<=1.5.4
 bitstring>=3.1.6
 ecdsa>=0.16.0
+kconfiglib==13.7.1
+construct==2.10.54
+python-socketio<5

src/lib/core/CHIPTLV.h

@@ -36,6 +36,7 @@
 
 #include <stdarg.h>
 #include <stdlib.h>
+#include <type_traits>
 
 /**
  * @namespace chip::TLV
@@ -1108,6 +1109,15 @@ class DLL_EXPORT TLVWriter
      */
     CHIP_ERROR Put(uint64_t tag, ByteSpan data);
 
+    /**
+     * static_cast to enumerations' underlying type when data is an enumeration.
+     */
+    template <typename T>
+    CHIP_ERROR Put(uint64_t tag, T data)
+    {
+        return Put(tag, static_cast<std::underlying_type_t<T>>(data));
+    }
+
     /**
      * Encodes a TLV boolean value.
      *

src/platform/ESP32/PlatformManagerImpl.cpp

@@ -90,7 +90,7 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
         esp_fill_random(ap_mac, sizeof(ap_mac));
         /* Bit 0 of the first octet of MAC Address should always be 0 */
         ap_mac[0] &= (uint8_t) ~0x01;
-        err = esp_wifi_set_mac(ESP_IF_WIFI_AP, ap_mac);
+        err = esp_wifi_set_mac(WIFI_IF_AP, ap_mac);
         SuccessOrExit(err);
     }