[pump] PostEvents now called from ScheduleWork (#19379)

* PostEvents now called from ScheduleWork * Fixed whitespace from restyle
project-chip · Jul 15, 2022 · 1062028 · 1062028
1 parent f6a2f6f
commit 1062028
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/AppTask.cpp
@@ -379,8 +379,10 @@ void AppTask::DispatchEvent(AppEvent * aEvent)
     case AppEvent::kEventType_ButtonLeft:
         if (AppEvent::kAppEventButtonType_Clicked == aEvent->ButtonEvent.Type)
         {
-            // Post event for demonstration purposes
-            sAppTask.PostEvents();
+            // Post event for demonstration purposes, we must ensure that the
+            // LogEvent is called in the right context which is the Matter mainloop
+            // thru ScheduleWork()
+            chip::DeviceLayer::PlatformMgr().ScheduleWork(sAppTask.PostEvents, reinterpret_cast<intptr_t>(nullptr));
 
             // Toggle BLE advertisements
             if (!ConnectivityMgr().IsBLEAdvertisingEnabled())
@@ -608,7 +610,7 @@ void AppTask::UpdateCluster(intptr_t context)
     }
 }
 
-void AppTask::PostEvents()
+void AppTask::PostEvents(intptr_t context)
 {
     // Example on posting events - here we post the general fault event on endpoints with PCC Server enabled
     for (auto endpoint : EnabledEndpointsWithServerCluster(PumpConfigurationAndControl::Id))

diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/AppTask.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/AppTask.h
@@ -64,7 +64,7 @@ class AppTask
     static void ButtonLeftEventHandler(Button_Handle handle, Button_EventMask events);
     static void ButtonRightEventHandler(Button_Handle handle, Button_EventMask events);
     static void TimerEventHandler(void * p_context);
-    static void PostEvents();
+    static void PostEvents(intptr_t context);
 
     enum Function_t
     {