Skip to content

Commit c3044ca

Browse files
author
Jiang Jiang Jian
committed
Merge branch 'bugfix/fix_delete_queue_error_in_espnow_example_v5.4' into 'release/v5.4'
fix(wifi): fix the delete queue error in espnow exapmle (v5.4) See merge request espressif/esp-idf!37014
2 parents 30307f6 + aeb4e02 commit c3044ca

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

examples/wifi/espnow/main/espnow_example_main.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
static const char *TAG = "espnow_example";
3636

37-
static QueueHandle_t s_example_espnow_queue;
37+
static QueueHandle_t s_example_espnow_queue = NULL;
3838

3939
static uint8_t s_example_broadcast_mac[ESP_NOW_ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
4040
static uint16_t s_example_espnow_seq[EXAMPLE_ESPNOW_DATA_MAX] = { 0, 0 };
@@ -302,7 +302,7 @@ static esp_err_t example_espnow_init(void)
302302

303303
s_example_espnow_queue = xQueueCreate(ESPNOW_QUEUE_SIZE, sizeof(example_espnow_event_t));
304304
if (s_example_espnow_queue == NULL) {
305-
ESP_LOGE(TAG, "Create mutex fail");
305+
ESP_LOGE(TAG, "Create queue fail");
306306
return ESP_FAIL;
307307
}
308308

@@ -321,7 +321,8 @@ static esp_err_t example_espnow_init(void)
321321
esp_now_peer_info_t *peer = malloc(sizeof(esp_now_peer_info_t));
322322
if (peer == NULL) {
323323
ESP_LOGE(TAG, "Malloc peer information fail");
324-
vSemaphoreDelete(s_example_espnow_queue);
324+
vQueueDelete(s_example_espnow_queue);
325+
s_example_espnow_queue = NULL;
325326
esp_now_deinit();
326327
return ESP_FAIL;
327328
}
@@ -337,7 +338,8 @@ static esp_err_t example_espnow_init(void)
337338
send_param = malloc(sizeof(example_espnow_send_param_t));
338339
if (send_param == NULL) {
339340
ESP_LOGE(TAG, "Malloc send parameter fail");
340-
vSemaphoreDelete(s_example_espnow_queue);
341+
vQueueDelete(s_example_espnow_queue);
342+
s_example_espnow_queue = NULL;
341343
esp_now_deinit();
342344
return ESP_FAIL;
343345
}
@@ -353,7 +355,8 @@ static esp_err_t example_espnow_init(void)
353355
if (send_param->buffer == NULL) {
354356
ESP_LOGE(TAG, "Malloc send buffer fail");
355357
free(send_param);
356-
vSemaphoreDelete(s_example_espnow_queue);
358+
vQueueDelete(s_example_espnow_queue);
359+
s_example_espnow_queue = NULL;
357360
esp_now_deinit();
358361
return ESP_FAIL;
359362
}
@@ -369,7 +372,8 @@ static void example_espnow_deinit(example_espnow_send_param_t *send_param)
369372
{
370373
free(send_param->buffer);
371374
free(send_param);
372-
vSemaphoreDelete(s_example_espnow_queue);
375+
vQueueDelete(s_example_espnow_queue);
376+
s_example_espnow_queue = NULL;
373377
esp_now_deinit();
374378
}
375379

0 commit comments

Comments
 (0)