feedc0de/arduino-esp32
1
0
Fork 0
forked from espressif/arduino-esp32
Code Pull Requests Activity

some compile fixes

Browse Source
This commit is contained in:
me-no-dev
2020-05-12 00:01:48 +03:00
parent 5570003949
commit d9c7b589a0
4 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/WiFi/src/WiFiGeneric.cpp
View File

@ -79,9 +79,24 @@ static void _network_event_task(void * arg){
_network_event_task_handle = NULL;
}
static esp_err_t _network_event_cb(void* arg, system_event_t *event) {
system_prov_event_t *sys_prov_data = (system_prov_event_t *)malloc(sizeof(system_prov_event_t));
if(sys_prov_data == NULL) {
return ESP_FAIL;
}
sys_prov_data->sys_event = event;
sys_prov_data->prov_event = NULL;
if (postToSysQueue(sys_prov_data) != ESP_OK){
free(sys_prov_data);
return ESP_FAIL;
}
return ESP_OK;
}
static void _network_event_cb(void* arg, esp_event_base_t base, int32_t id, void* data) {
if (xQueueSend(_network_event_queue, (system_event_t *)data, portMAX_DELAY) != pdPASS) {
log_w("Network Event Queue Send Failed!");
system_event_t *event = (system_event_t *)data;
if(_network_event_cb(arg, event) != ESP_OK){
log_e("event dispatch failed");
}
}
// static esp_err_t _network_event_cb(void *arg, system_event_t *event){

2
libraries/WiFi/src/WiFiGeneric.h
View File

@ -114,7 +114,7 @@ class WiFiGenericClass
bool setTxPower(wifi_power_t power);
wifi_power_t getTxPower();
static esp_err_t _eventCallback(void *arg, system_event_t *event, wifi_prov_event_t *prov_event);
static esp_err_t _eventCallback(void *arg, system_event_t *event, wifi_prov_event_t *prov_event=NULL);
protected:
static bool _persistent;