fix compilation errors for other esp examples on esp32c3 (#11716)

project-chip · Nov 16, 2021 · 40320ad · 40320ad
1 parent 4500190
commit 40320ad
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 3 deletions.
diff --git a/examples/ipv6only-app/esp32/README.md b/examples/ipv6only-app/esp32/README.md
@@ -55,6 +55,10 @@ make sure the IDF_PATH has been exported(See the manual setup steps above).
 
         $ source ./scripts/activate.sh
 
+-   Select IDF Target
+
+        $ idf.py set-target esp32(or esp32c3)
+
 -   Configuration Options
 
         To choose from the different configuration options, run menuconfig

diff --git a/examples/ipv6only-app/esp32/main/main.cpp b/examples/ipv6only-app/esp32/main/main.cpp
@@ -50,7 +50,7 @@ void UdpReceiver(void * pvParameters)
     int optval;                     // flag value for setsockopt
     int n;                          // message byte size
     int sockfd = 0;
-    unsigned int clientlen;         // byte size of client's address
+    socklen_t clientlen;            // byte size of client's address
     struct sockaddr_in6 clientaddr; // client addr
 
     while (1)

diff --git a/examples/lock-app/esp32/README.md b/examples/lock-app/esp32/README.md
@@ -57,6 +57,10 @@ make sure the IDF_PATH has been exported(See the manual setup steps above).
 
         $ source ./scripts/activate.sh
 
+-   Target Set
+
+        $ idf.py set-target esp32(or esp32c3)
+
 -   Configuration Options
 
     This application uses `ESP32-DevKitC` as a default device type. To use other

diff --git a/examples/lock-app/esp32/main/include/AppConfig.h b/examples/lock-app/esp32/main/include/AppConfig.h
@@ -22,13 +22,19 @@
 // ---- Lock Example App Config ----
 
 #define APP_TASK_NAME "LOCK-APP"
-
+#if CONFIG_IDF_TARGET_ESP32
 #define SYSTEM_STATE_LED GPIO_NUM_25
 #define LOCK_STATE_LED GPIO_NUM_26
 
 #define APP_LOCK_BUTTON GPIO_NUM_34
 #define APP_FUNCTION_BUTTON GPIO_NUM_35
+#elif CONFIG_IDF_TARGET_ESP32C3
+#define SYSTEM_STATE_LED GPIO_NUM_8
+#define LOCK_STATE_LED GPIO_NUM_9
 
+#define APP_LOCK_BUTTON GPIO_NUM_18
+#define APP_FUNCTION_BUTTON GPIO_NUM_19
+#endif
 #define APP_BUTTON_DEBOUNCE_PERIOD_MS 50
 
 #define APP_BUTTON_PRESSED 0

diff --git a/examples/pigweed-app/esp32/README.md b/examples/pigweed-app/esp32/README.md
@@ -71,6 +71,10 @@ To download and install packages.
 
         $ source ./scripts/activate.sh
 
+-   Target Select
+
+        $ idf.py set-target esp32(or esp32c3)
+
 -   Configuration Options
 
         To choose from the different configuration options, run menuconfig.

diff --git a/examples/temperature-measurement-app/esp32/README.md b/examples/temperature-measurement-app/esp32/README.md
@@ -57,6 +57,10 @@ make sure the IDF_PATH has been exported(See the manual setup steps above).
 
         $ source ./scripts/activate.sh
 
+-   Target Select
+
+        $ idf.py set-target esp32(or esp32c3)
+
 -   Configuration Options
 
     This application uses `ESP32-DevKitC` as a default device type. To use other

diff --git a/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp b/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp
@@ -827,7 +827,7 @@ CHIP_ERROR GenericThreadStackManagerImpl_OpenThread<ImplClass>::_WriteThreadNetw
 
     case ThreadNetworkDiagnostics::Attributes::RoutingRole::Id: {
         otDeviceRole role = otThreadGetDeviceRole(mOTInst);
-        err               = encoder.Encode(role);
+        err               = encoder.Encode(static_cast<uint8_t>(role));
     }
     break;