Skip to content

Commit ba66512

Browse files
committed
fix(rcp update): fix a issue with the parameters order
1 parent 3ebae10 commit ba66512

File tree

5 files changed

+28
-4
lines changed

5 files changed

+28
-4
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ pre_commit:
5454
- idf.py set-target esp32h2
5555
- git rev-parse HEAD
5656
- idf.py build
57-
5857
- cd $ESP_THREAD_BR_PATH/examples/basic_thread_border_router
58+
- rm -rf CMakeLists.txt
59+
- cp ${CI_TOOLS_PATH}/basic_thread_border_router.cmake CMakeLists.txt
5960
- rm -rf sdkconfig.defaults
6061
- cp ${CI_TOOLS_PATH}/sdkconfig.br.basic sdkconfig.defaults
6162
- idf.py build
@@ -69,6 +70,8 @@ pre_commit:
6970
- cd $ESP_THREAD_BR_PATH/examples/basic_thread_border_router
7071
- rm -rf main/idf_component.yml
7172
- cp ${CI_TOOLS_PATH}/idf_component_local.yml main/idf_component.yml
73+
- rm -rf CMakeLists.txt
74+
- cp ${CI_TOOLS_PATH}/basic_thread_border_router.cmake CMakeLists.txt
7275
- rm -rf sdkconfig.defaults
7376
- cp ${CI_TOOLS_PATH}/sdkconfig.br.basic sdkconfig.defaults
7477
- idf.py build

components/esp_ot_br_server/src/esp_br_web_api.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,7 @@ static void diagnosticTlv_result_handler(otError aError, otMessage *aMessage, co
898898
* @brief the function will send diagnostic to get network's topology message and update the set of diagnostic.
899899
*
900900
*/
901-
static esp_err_t build_thread_network_topology()
901+
static esp_err_t build_thread_network_topology(void)
902902
{
903903
esp_err_t ret = ESP_OK;
904904
otInstance *ins = esp_openthread_get_instance();

components/esp_rcp_update/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "1.3.0"
1+
version: "1.3.1"
22
description: Espressif RCP Update Component for Thread Border Router and Zigbee Gateway
33
url: https://github.com/espressif/esp-thread-br/tree/main/components/esp_rcp_update
44
dependencies:

components/esp_rcp_update/src/esp_rcp_ota.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ esp_err_t esp_rcp_ota_begin(esp_rcp_ota_handle_t *out_handle)
4343
rcp_ota_entry_t *new_entry = NULL;
4444
ESP_RETURN_ON_FALSE(out_handle, ESP_ERR_INVALID_ARG, TAG, "out_handle cannot be NULL");
4545

46-
new_entry = (rcp_ota_entry_t *)calloc(sizeof(rcp_ota_entry_t), 1);
46+
new_entry = (rcp_ota_entry_t *)calloc(1, sizeof(rcp_ota_entry_t));
4747
ESP_RETURN_ON_FALSE(new_entry, ESP_ERR_NO_MEM, TAG, "Failed to allocate memory for RCP OTA handle");
4848
LIST_INSERT_HEAD(&s_rcp_ota_entries_head, new_entry, entries);
4949

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# The following lines of boilerplate have to be in your project's CMakeLists
2+
# in this exact order for cmake to work correctly
3+
cmake_minimum_required(VERSION 3.5)
4+
5+
set(ENV{EXTRA_CFLAGS} "-Werror -Werror=deprecated-declarations -Werror=unused-variable \
6+
-Werror=unused-but-set-variable -Werror=unused-function -Wstrict-prototypes")
7+
8+
set(ENV{EXTRA_CXXFLAGS} "-Werror -Werror=deprecated-declarations -Werror=unused-variable \
9+
-Werror=unused-but-set-variable -Werror=unused-function")
10+
11+
# (Not part of the boilerplate)
12+
# This example uses an extra component for common functions such as Wi-Fi and Ethernet connection.
13+
set(EXTRA_COMPONENT_DIRS
14+
${CMAKE_CURRENT_SOURCE_DIR}/../common
15+
${CMAKE_CURRENT_SOURCE_DIR}/../../components/esp_br_http_ota
16+
${CMAKE_CURRENT_SOURCE_DIR}/../../components/esp_ot_br_server
17+
$ENV{IDF_PATH}/examples/common_components/protocol_examples_common
18+
)
19+
20+
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
21+
project(esp_ot_br)

0 commit comments

Comments
 (0)