Added event_wait_ex, which takes callback to event enabling function …

…as parameter.
cocoOS · Apr 17, 2019 · f58f1d7 · f58f1d7 · matteofranceschini · Mar 9, 2020
1 parent c659b15
commit f58f1d7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/inc/os_applAPI.h b/inc/os_applAPI.h
@@ -260,7 +260,8 @@ static void myTask(void) {
 }
  @endcode 
  *******************************************************************************/
-#define event_wait(event)    OS_WAIT_SINGLE_EVENT(event,0)
+#define event_wait(event)    OS_WAIT_SINGLE_EVENT(event,0,0)
+#define event_wait_ex(event, cb)    OS_WAIT_SINGLE_EVENT(event,0,cb)
 
 
 /*********************************************************************************/
@@ -290,7 +291,8 @@ static void myTask(void) {
 }
  @endcode 
  *******************************************************************************/
-#define event_wait_timeout(event,timeout)    OS_WAIT_SINGLE_EVENT(event,timeout)
+#define event_wait_timeout(event,timeout)    OS_WAIT_SINGLE_EVENT(event,timeout,0)
+#define event_wait_timeout_ex(event,timeout,cb)    OS_WAIT_SINGLE_EVENT(event,timeout,cb)
 
 /*********************************************************************************/
 /*  event_get_timeout()                                                 *//**

diff --git a/inc/os_event.h b/inc/os_event.h
@@ -50,8 +50,8 @@ extern "C" {
 #define EVENT_OFS2   11000
 #define EVENT_OFS3   12000
 
-#define OS_WAIT_SINGLE_EVENT(x,timeout)	do {\
-								os_wait_event(running_tid,x,1,timeout);\
+#define OS_WAIT_SINGLE_EVENT(x,timeout, cb)	do {\
+								os_wait_event(running_tid,x,1,timeout, cb);\
 								OS_SCHEDULE(EVENT_OFS1);\
 							   } while (0)
 
@@ -101,7 +101,7 @@ typedef struct {
 
 
 void os_event_init( void );
-void os_wait_event( uint8_t tid, Evt_t ev, uint8_t waitSingleEvent, uint32_t timeout );
+void os_wait_event( uint8_t tid, Evt_t ev, uint8_t waitSingleEvent, uint32_t timeout, void (*cb)(void) );
 void os_wait_multiple( uint8_t waitAll, ...);
 void os_signal_event( Evt_t ev );
 void os_event_set_signaling_tid( Evt_t ev, uint8_t tid );

diff --git a/src/os_event.c b/src/os_event.c
@@ -155,11 +155,14 @@ Evt_t event_last_signaled_get(void) {
 }
 
 
-void os_wait_event(uint8_t tid, Evt_t ev, uint8_t waitSingleEvent, uint32_t timeout) {
+void os_wait_event(uint8_t tid, Evt_t ev, uint8_t waitSingleEvent, uint32_t timeout, void (*cb)(void)) {
 #if( N_TOTAL_EVENTS > 0 )
     if ( ev < nEvents ) {
         eventList[ ev ].signaledByTid = NO_TID;
         os_task_wait_event( tid, ev, waitSingleEvent, timeout );
+        if (cb) {
+          cb();
+        }
     }
 #endif
 }