Skip to content

[pull] master from espressif:master #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 11, 2019
Merged

[pull] master from espressif:master #2

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
188560e
Some event log messages were off by one. (#3391)
xk Nov 11, 2019
ec63d09
Fix WiFiGeneric event handler (#3412)
Nov 11, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix WiFiGeneric event handler (espressif#3412)
  • Loading branch information
@me-no-dev
Mikhail Khalizev authored and me-no-dev committed Nov 11, 2019
commit ec63d09e545322b3d898d52936f8ac97972bd682
8 changes: 4 additions & 4 deletions libraries/WiFi/src/WiFiGeneric.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,18 @@ static TaskHandle_t _network_event_task_handle = NULL;
static EventGroupHandle_t _network_event_group = NULL;

static void _network_event_task(void * arg){
system_event_t *event = NULL;
system_event_t event;
for (;;) {
if(xQueueReceive(_network_event_queue, &event, portMAX_DELAY) == pdTRUE){
WiFiGenericClass::_eventCallback(arg, event);
WiFiGenericClass::_eventCallback(arg, &event);
}
}
vTaskDelete(NULL);
_network_event_task_handle = NULL;
}

static esp_err_t _network_event_cb(void *arg, system_event_t *event){
if (xQueueSend(_network_event_queue, &event, portMAX_DELAY) != pdPASS) {
if (xQueueSend(_network_event_queue, event, portMAX_DELAY) != pdPASS) {
log_w("Network Event Queue Send Failed!");
return ESP_FAIL;
}
Expand All @@ -82,7 +82,7 @@ static bool _start_network_event_task(){
xEventGroupSetBits(_network_event_group, WIFI_DNS_IDLE_BIT);
}
if(!_network_event_queue){
_network_event_queue = xQueueCreate(32, sizeof(system_event_t *));
_network_event_queue = xQueueCreate(32, sizeof(system_event_t));
if(!_network_event_queue){
log_e("Network Event Queue Create Failed!");
return false;
Expand Down