jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow WiFi Event Callback to read the event info

Browse Source 
Helps in cases where Event Info is needed (WPS and others)
This commit is contained in:
me-no-dev 2017-09-18 17:54:57 +08:00
parent db79c2ee95
commit f648ad7cea
2 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,6 +120,12 @@ static bool espWiFiStop(){
// ------------------------------------------------- Generic WiFi function ----------------------------------------------- // ------------------------------------------------- Generic WiFi function -----------------------------------------------
// ----------------------------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------------------------
typedef struct {
WiFiEventCb cb;
WiFiEventFullCb fcb;
system_event_id_t event;
} WiFiEventCbList_t;
// arduino dont like std::vectors move static here // arduino dont like std::vectors move static here
static std::vector<WiFiEventCbList_t> cbEventList; static std::vector<WiFiEventCbList_t> cbEventList;
@ -143,6 +149,19 @@ void WiFiGenericClass::onEvent(WiFiEventCb cbEvent, system_event_id_t event)
} }
WiFiEventCbList_t newEventHandler; WiFiEventCbList_t newEventHandler;
newEventHandler.cb = cbEvent; newEventHandler.cb = cbEvent;
newEventHandler.fcb = NULL;
newEventHandler.event = event;
cbEventList.push_back(newEventHandler);
}
void WiFiGenericClass::onEvent(WiFiEventFullCb cbEvent, system_event_id_t event)
{
if(!cbEvent) {
return;
}
WiFiEventCbList_t newEventHandler;
newEventHandler.cb = NULL;
newEventHandler.fcb = cbEvent;
newEventHandler.event = event; newEventHandler.event = event;
cbEventList.push_back(newEventHandler); cbEventList.push_back(newEventHandler);
} }
@ -166,6 +185,20 @@ void WiFiGenericClass::removeEvent(WiFiEventCb cbEvent, system_event_id_t event)
} }
} }
void WiFiGenericClass::removeEvent(WiFiEventFullCb cbEvent, system_event_id_t event)
{
if(!cbEvent) {
return;
}
for(uint32_t i = 0; i < cbEventList.size(); i++) {
WiFiEventCbList_t entry = cbEventList[i];
if(entry.fcb == cbEvent && entry.event == event) {
cbEventList.erase(cbEventList.begin() + i);
}
}
}
/** /**
* callback for WiFi events * callback for WiFi events
* @param arg * @param arg
@ -208,9 +241,13 @@ esp_err_t WiFiGenericClass::_eventCallback(void *arg, system_event_t *event)
for(uint32_t i = 0; i < cbEventList.size(); i++) { for(uint32_t i = 0; i < cbEventList.size(); i++) {
WiFiEventCbList_t entry = cbEventList[i]; WiFiEventCbList_t entry = cbEventList[i];
if(entry.cb) { if(entry.cb || entry.fcb) {
if(entry.event == (system_event_id_t) event->event_id || entry.event == SYSTEM_EVENT_MAX) { if(entry.event == (system_event_id_t) event->event_id || entry.event == SYSTEM_EVENT_MAX) {
if(entry.cb){
entry.cb((system_event_id_t) event->event_id); entry.cb((system_event_id_t) event->event_id);
} else {
entry.fcb((system_event_id_t) event->event_id, (system_event_info_t) event->event_info);
}
} }
} }
} }

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

@ -28,11 +28,7 @@
#include <esp_event_loop.h> #include <esp_event_loop.h>
typedef void (*WiFiEventCb)(system_event_id_t event); typedef void (*WiFiEventCb)(system_event_id_t event);
typedef void (*WiFiEventFullCb)(system_event_id_t event, system_event_info_t info);
typedef struct {
WiFiEventCb cb;
system_event_id_t event;
} WiFiEventCbList_t;
class WiFiGenericClass class WiFiGenericClass
{ {
@ -41,7 +37,9 @@ public:
WiFiGenericClass(); WiFiGenericClass();
void onEvent(WiFiEventCb cbEvent, system_event_id_t event = SYSTEM_EVENT_MAX); void onEvent(WiFiEventCb cbEvent, system_event_id_t event = SYSTEM_EVENT_MAX);
void onEvent(WiFiEventFullCb cbEvent, system_event_id_t event = SYSTEM_EVENT_MAX);
void removeEvent(WiFiEventCb cbEvent, system_event_id_t event = SYSTEM_EVENT_MAX); void removeEvent(WiFiEventCb cbEvent, system_event_id_t event = SYSTEM_EVENT_MAX);
void removeEvent(WiFiEventFullCb cbEvent, system_event_id_t event = SYSTEM_EVENT_MAX);
int32_t channel(void); int32_t channel(void);