@@ -27,7 +27,6 @@ static void _network_event_task(void * arg){
2727
2828ESP_Network_Events::ESP_Network_Events ()
2929 : _arduino_event_group(NULL )
30- , _arduino_event_group_h(NULL )
3130 , _arduino_event_queue(NULL )
3231 , _arduino_event_task_handle(NULL )
3332{}
@@ -41,10 +40,6 @@ ESP_Network_Events::~ESP_Network_Events(){
4140 vEventGroupDelete (_arduino_event_group);
4241 _arduino_event_group = NULL ;
4342 }
44- if (_arduino_event_group_h != NULL ){
45- vEventGroupDelete (_arduino_event_group_h);
46- _arduino_event_group_h = NULL ;
47- }
4843 if (_arduino_event_queue != NULL ){
4944 arduino_event_t *event = NULL ;
5045 while (xQueueReceive (_arduino_event_queue, &event, 0 ) == pdTRUE){
@@ -66,13 +61,6 @@ bool ESP_Network_Events::initNetworkEvents(){
6661 }
6762 xEventGroupSetBits (_arduino_event_group, _initial_bits);
6863 }
69- if (!_arduino_event_group_h){
70- _arduino_event_group_h = xEventGroupCreate ();
71- if (!_arduino_event_group_h){
72- log_e (" Network Event Group 2 Create Failed!"
73- return false ;
74- }
75- }
7664
7765 if (!_arduino_event_queue){
7866 _arduino_event_queue = xQueueCreate (32 , sizeof (arduino_event_t *));
@@ -189,6 +177,48 @@ network_event_handle_t ESP_Network_Events::onEvent(NetworkEventSysCb cbEvent, ar
189177 return newEventHandler.id ;
190178}
191179
180+ network_event_handle_t ESP_Network_Events::onSysEvent (NetworkEventCb cbEvent, arduino_event_id_t event)
181+ {
182+ if (!cbEvent) {
183+ return 0 ;
184+ }
185+ NetworkEventCbList_t newEventHandler;
186+ newEventHandler.cb = cbEvent;
187+ newEventHandler.fcb = NULL ;
188+ newEventHandler.scb = NULL ;
189+ newEventHandler.event = event;
190+ cbEventList.insert (cbEventList.begin (), newEventHandler);
191+ return newEventHandler.id ;
192+ }
193+
194+ network_event_handle_t ESP_Network_Events::onSysEvent (NetworkEventFuncCb cbEvent, arduino_event_id_t event)
195+ {
196+ if (!cbEvent) {
197+ return 0 ;
198+ }
199+ NetworkEventCbList_t newEventHandler;
200+ newEventHandler.cb = NULL ;
201+ newEventHandler.fcb = cbEvent;
202+ newEventHandler.scb = NULL ;
203+ newEventHandler.event = event;
204+ cbEventList.insert (cbEventList.begin (), newEventHandler);
205+ return newEventHandler.id ;
206+ }
207+
208+ network_event_handle_t ESP_Network_Events::onSysEvent (NetworkEventSysCb cbEvent, arduino_event_id_t event)
209+ {
210+ if (!cbEvent) {
211+ return 0 ;
212+ }
213+ NetworkEventCbList_t newEventHandler;
214+ newEventHandler.cb = NULL ;
215+ newEventHandler.fcb = NULL ;
216+ newEventHandler.scb = cbEvent;
217+ newEventHandler.event = event;
218+ cbEventList.insert (cbEventList.begin (), newEventHandler);
219+ return newEventHandler.id ;
220+ }
221+
192222void ESP_Network_Events::removeEvent (NetworkEventCb cbEvent, arduino_event_id_t event)
193223{
194224 if (!cbEvent) {
@@ -203,6 +233,27 @@ void ESP_Network_Events::removeEvent(NetworkEventCb cbEvent, arduino_event_id_t
203233 }
204234}
205235
236+ template <typename T, typename ... U>
237+ static size_t getStdFunctionAddress (std::function<T(U...)> f) {
238+ typedef T (fnType)(U...);
239+ fnType ** fnPointer = f.template target <fnType*>();
240+ return (size_t ) *fnPointer;
241+ }
242+
243+ void ESP_Network_Events::removeEvent (NetworkEventFuncCb cbEvent, arduino_event_id_t event)
244+ {
245+ if (!cbEvent) {
246+ return ;
247+ }
248+
249+ for (uint32_t i = 0 ; i < cbEventList.size (); i++) {
250+ NetworkEventCbList_t entry = cbEventList[i];
251+ if (getStdFunctionAddress (entry.fcb ) == getStdFunctionAddress (cbEvent) && entry.event == event) {
252+ cbEventList.erase (cbEventList.begin () + i);
253+ }
254+ }
255+ }
256+
206257void ESP_Network_Events::removeEvent (NetworkEventSysCb cbEvent, arduino_event_id_t event)
207258{
208259 if (!cbEvent) {
@@ -232,62 +283,42 @@ int ESP_Network_Events::setStatusBits(int bits){
232283 _initial_bits |= bits;
233284 return _initial_bits;
234285 }
235- int l=bits & 0x00FFFFFF , h=(bits & 0xFF000000 ) >> 24 ;
236- if (l){
237- l = xEventGroupSetBits (_arduino_event_group, l);
238- }
239- if (h){
240- h = xEventGroupSetBits (_arduino_event_group_h, h);
241- }
242- return l | (h << 24 );
286+ return xEventGroupSetBits (_arduino_event_group, bits);
243287}
244288
245289int ESP_Network_Events::clearStatusBits (int bits){
246290 if (!_arduino_event_group){
247291 _initial_bits &= ~bits;
248292 return _initial_bits;
249293 }
250- int l=bits & 0x00FFFFFF , h=(bits & 0xFF000000 ) >> 24 ;
251- if (l){
252- l = xEventGroupClearBits (_arduino_event_group, l);
253- }
254- if (h){
255- h = xEventGroupClearBits (_arduino_event_group_h, h);
256- }
257- return l | (h << 24 );
294+ return xEventGroupClearBits (_arduino_event_group, bits);
258295}
259296
260297int ESP_Network_Events::getStatusBits (){
261298 if (!_arduino_event_group){
262299 return _initial_bits;
263300 }
264- return xEventGroupGetBits (_arduino_event_group) | ( xEventGroupGetBits (_arduino_event_group_h) << 24 ) ;
301+ return xEventGroupGetBits (_arduino_event_group);
265302}
266303
267304int ESP_Network_Events::waitStatusBits (int bits, uint32_t timeout_ms){
268305 if (!_arduino_event_group){
269306 return 0 ;
270307 }
271- int l=bits & 0x00FFFFFF , h=(bits & 0xFF000000 ) >> 24 ;
272- if (l){
273- l = xEventGroupWaitBits (
274- _arduino_event_group, // The event group being tested.
275- l, // The bits within the event group to wait for.
276- pdFALSE, // bits should be cleared before returning.
277- pdTRUE, // Don't wait for all bits, any bit will do.
278- timeout_ms / portTICK_PERIOD_MS ) & l; // Wait a maximum of timeout_ms for any bit to be set.
279- }
280- if (h){
281- h = xEventGroupWaitBits (
282- _arduino_event_group, // The event group being tested.
283- h, // The bits within the event group to wait for.
284- pdFALSE, // bits should be cleared before returning.
285- pdTRUE, // Don't wait for all bits, any bit will do.
286- timeout_ms / portTICK_PERIOD_MS ) & h; // Wait a maximum of timeout_ms for any bit to be set.
287- }
288- return l | (h << 24 );
308+ return xEventGroupWaitBits (
309+ _arduino_event_group, // The event group being tested.
310+ bits, // The bits within the event group to wait for.
311+ pdFALSE, // bits should be cleared before returning.
312+ pdTRUE, // Don't wait for all bits, any bit will do.
313+ timeout_ms / portTICK_PERIOD_MS ) & bits; // Wait a maximum of timeout_ms for any bit to be set.
289314}
290315
316+ /* *
317+ * @brief Convert arduino_event_id_t to a C string.
318+ * @param [in] id The event id to be converted.
319+ * @return A string representation of the event id.
320+ * @note: arduino_event_id_t values as of Mar 2023 (arduino-esp32 r2.0.7) are: 0-39 (ARDUINO_EVENT_MAX=40) and are defined in WiFiGeneric.h.
321+ */
291322const char * ESP_Network_Events::eventName (arduino_event_id_t id) {
292323 switch (id) {
293324 case ARDUINO_EVENT_ETH_START: return " ETH_START"
@@ -306,6 +337,7 @@ const char * ESP_Network_Events::eventName(arduino_event_id_t id) {
306337 // case ARDUINO_EVENT_PPP_LOST_IP: return "PPP_LOST_IP";
307338 // case ARDUINO_EVENT_PPP_GOT_IP6: return "PPP_GOT_IP6";
308339#if SOC_WIFI_SUPPORTED
340+ case ARDUINO_EVENT_WIFI_OFF: return " WIFI_OFF"
309341 case ARDUINO_EVENT_WIFI_READY: return " WIFI_READY"
310342 case ARDUINO_EVENT_WIFI_SCAN_DONE: return " SCAN_DONE"
311343 case ARDUINO_EVENT_WIFI_STA_START: return " STA_START"
0 commit comments