Merge branch 'fix/fix_a_build_warning' into 'main'

fix(rcp update): fix a issue with the parameters order See merge request espressif/esp-thread-br!139
espressif · Sep 14, 2024 · 2eab508 · 2eab508
2 parents 3ebae10 + ba66512
commit 2eab508
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -54,8 +54,9 @@ pre_commit:
  - idf.py set-target esp32h2
  - git rev-parse HEAD
  - idf.py build
-
  - cd $ESP_THREAD_BR_PATH/examples/basic_thread_border_router
+ - rm -rf CMakeLists.txt
+ - cp ${CI_TOOLS_PATH}/basic_thread_border_router.cmake CMakeLists.txt
  - rm -rf sdkconfig.defaults
  - cp ${CI_TOOLS_PATH}/sdkconfig.br.basic sdkconfig.defaults
  - idf.py build
@@ -69,6 +70,8 @@ pre_commit:
  - cd $ESP_THREAD_BR_PATH/examples/basic_thread_border_router
  - rm -rf main/idf_component.yml
  - cp ${CI_TOOLS_PATH}/idf_component_local.yml main/idf_component.yml
+ - rm -rf CMakeLists.txt
+ - cp ${CI_TOOLS_PATH}/basic_thread_border_router.cmake CMakeLists.txt
  - rm -rf sdkconfig.defaults
  - cp ${CI_TOOLS_PATH}/sdkconfig.br.basic sdkconfig.defaults
  - idf.py build

diff --git a/components/esp_ot_br_server/src/esp_br_web_api.c b/components/esp_ot_br_server/src/esp_br_web_api.c
@@ -898,7 +898,7 @@ static void diagnosticTlv_result_handler(otError aError, otMessage *aMessage, co
  * @brief the function will send diagnostic to get network's topology message and update the set of diagnostic.
  *
  */
-static esp_err_t build_thread_network_topology()
+static esp_err_t build_thread_network_topology(void)
 {
  esp_err_t ret = ESP_OK;
  otInstance *ins = esp_openthread_get_instance();

diff --git a/components/esp_rcp_update/idf_component.yml b/components/esp_rcp_update/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.3.0"
+version: "1.3.1"
 description: Espressif RCP Update Component for Thread Border Router and Zigbee Gateway
 url: https://github.com/espressif/esp-thread-br/tree/main/components/esp_rcp_update
 dependencies:

diff --git a/components/esp_rcp_update/src/esp_rcp_ota.c b/components/esp_rcp_update/src/esp_rcp_ota.c
@@ -43,7 +43,7 @@ esp_err_t esp_rcp_ota_begin(esp_rcp_ota_handle_t *out_handle)
  rcp_ota_entry_t *new_entry = NULL;
  ESP_RETURN_ON_FALSE(out_handle, ESP_ERR_INVALID_ARG, TAG, "out_handle cannot be NULL");
 
- new_entry = (rcp_ota_entry_t *)calloc(sizeof(rcp_ota_entry_t), 1);
+ new_entry = (rcp_ota_entry_t *)calloc(1, sizeof(rcp_ota_entry_t));
  ESP_RETURN_ON_FALSE(new_entry, ESP_ERR_NO_MEM, TAG, "Failed to allocate memory for RCP OTA handle");
  LIST_INSERT_HEAD(&s_rcp_ota_entries_head, new_entry, entries);
 

diff --git a/tools/ci/basic_thread_border_router.cmake b/tools/ci/basic_thread_border_router.cmake
@@ -0,0 +1,21 @@
+# The following lines of boilerplate have to be in your project's CMakeLists
+# in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.5)
+
+set(ENV{EXTRA_CFLAGS} "-Werror -Werror=deprecated-declarations -Werror=unused-variable \
+ -Werror=unused-but-set-variable -Werror=unused-function -Wstrict-prototypes")
+
+set(ENV{EXTRA_CXXFLAGS} "-Werror -Werror=deprecated-declarations -Werror=unused-variable \
+ -Werror=unused-but-set-variable -Werror=unused-function")
+
+# (Not part of the boilerplate)
+# This example uses an extra component for common functions such as Wi-Fi and Ethernet connection.
+set(EXTRA_COMPONENT_DIRS
+ ${CMAKE_CURRENT_SOURCE_DIR}/../common
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../components/esp_br_http_ota
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../components/esp_ot_br_server
+ $ENV{IDF_PATH}/examples/common_components/protocol_examples_common
+)
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(esp_ot_br)