alex/esp-rainmaker
1
0
Fork 0
mirror of https://github.com/espressif/esp-rainmaker.git synced 2026-01-19 09:45:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'task/idf-v5.0' into 'master'

Browse Source 
esp_rmaker_core: Minor changes for compilation with idf v5.0/master

See merge request app-frameworks/esp-rainmaker!310
This commit is contained in:
Piyush Shah
2022-07-12 12:47:16 +08:00
parent 00bcf4c0c3 88335d174c
commit 6e8c65e8dd
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab-ci.yml
View File

@@ -81,11 +81,19 @@ build_idf_v4.4:
variables:
EXAMPLE_TARGETS: "esp32 esp32s2 esp32c3 esp32s3"
build_idf_v5.0:
extends: .build_template
image: espressif/idf:release-v5.0
variables:
EXAMPLE_TARGETS: "esp32 esp32s2 esp32c3 esp32s3"
EXAMPLES: "switch led_light fan temperature_sensor multi_device gpio"
build_idf_master:
extends: .build_template
image: espressif/idf:latest
variables:
EXAMPLE_TARGETS: "esp32 esp32s2 esp32c3 esp32s3"
EXAMPLES: "switch led_light fan temperature_sensor multi_device gpio"
build_docs:
stage: build

13
components/esp_rainmaker/src/core/esp_rmaker_local_ctrl.c
View File

@@ -266,7 +266,12 @@ static esp_err_t __esp_rmaker_start_local_ctrl_service(const char *serv_name)
};
/* If sec1, add security type details to the config */
protocomm_security_pop_t *pop = NULL;
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
#define PROTOCOMM_SEC_DATA protocomm_security1_params_t
#else
#define PROTOCOMM_SEC_DATA protocomm_security_pop_t
#endif /* ESP_IDF_VERSION */
PROTOCOMM_SEC_DATA *pop = NULL;
#if ESP_RMAKER_LOCAL_CTRL_SECURITY_TYPE == 1
char *pop_str = esp_rmaker_local_ctrl_get_pop();
/* Note: pop_str shouldn't be freed. If it gets freed, the pointer which is internally copied in esp_local_ctrl_start() will become invalid which would cause corruption. */
@@ -274,7 +279,7 @@ static esp_err_t __esp_rmaker_start_local_ctrl_service(const char *serv_name)
int sec_ver = esp_rmaker_local_ctrl_get_security_type();
if (sec_ver != 0 && pop_str) {
pop = (protocomm_security_pop_t *)calloc(1, sizeof(protocomm_security_pop_t));
pop = (PROTOCOMM_SEC_DATA *)calloc(1, sizeof(PROTOCOMM_SEC_DATA));
if (!pop) {
ESP_LOGE(TAG, "Failed to allocate pop");
free(pop_str);
@@ -286,7 +291,11 @@ static esp_err_t __esp_rmaker_start_local_ctrl_service(const char *serv_name)
config.proto_sec.version = sec_ver;
config.proto_sec.custom_handle = NULL;
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
config.proto_sec.sec_params = pop;
#else
config.proto_sec.pop = pop;
#endif /* ESP_IDF_VERSION */
#endif
/* Start esp_local_ctrl service */