diff --git a/examples/chef/silabs/include/AppTask.h b/examples/chef/silabs/include/AppTask.h index 2aa1b8acaaa847..578d0a17834d29 100644 --- a/examples/chef/silabs/include/AppTask.h +++ b/examples/chef/silabs/include/AppTask.h @@ -28,9 +28,8 @@ #include "AppEvent.h" #include "BaseApplication.h" -#include "FreeRTOS.h" -#include "timers.h" // provides FreeRTOS timer support #include +#include #include #include diff --git a/examples/chef/silabs/src/AppTask.cpp b/examples/chef/silabs/src/AppTask.cpp index 0375f68d542249..aed343e1b3750f 100644 --- a/examples/chef/silabs/src/AppTask.cpp +++ b/examples/chef/silabs/src/AppTask.cpp @@ -81,7 +81,7 @@ CHIP_ERROR AppTask::StartAppTask() void AppTask::AppTaskMain(void * pvParameter) { AppEvent event; - QueueHandle_t sAppEventQueue = *(static_cast(pvParameter)); + osMessageQueueId_t sAppEventQueue = *(static_cast(pvParameter)); CHIP_ERROR err = sAppTask.Init(); if (err != CHIP_NO_ERROR) @@ -94,11 +94,11 @@ void AppTask::AppTaskMain(void * pvParameter) while (true) { - BaseType_t eventReceived = xQueueReceive(sAppEventQueue, &event, pdMS_TO_TICKS(10)); - while (eventReceived == pdTRUE) + osStatus_t eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, osWaitForever); + while (eventReceived == osOK) { sAppTask.DispatchEvent(&event); - eventReceived = xQueueReceive(sAppEventQueue, &event, 0); + eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, 0); } } } diff --git a/examples/light-switch-app/silabs/include/AppTask.h b/examples/light-switch-app/silabs/include/AppTask.h index 50a04dadf10df5..a6a74b4605f52c 100644 --- a/examples/light-switch-app/silabs/include/AppTask.h +++ b/examples/light-switch-app/silabs/include/AppTask.h @@ -28,9 +28,8 @@ #include "AppEvent.h" #include "BaseApplication.h" -#include "FreeRTOS.h" -#include "timers.h" // provides FreeRTOS timer support #include +#include #include #include diff --git a/examples/light-switch-app/silabs/src/AppTask.cpp b/examples/light-switch-app/silabs/src/AppTask.cpp index c9759d24118fdd..140a99136d6ef3 100644 --- a/examples/light-switch-app/silabs/src/AppTask.cpp +++ b/examples/light-switch-app/silabs/src/AppTask.cpp @@ -105,7 +105,7 @@ CHIP_ERROR AppTask::StartAppTask() void AppTask::AppTaskMain(void * pvParameter) { AppEvent event; - QueueHandle_t sAppEventQueue = *(static_cast(pvParameter)); + osMessageQueueId_t sAppEventQueue = *(static_cast(pvParameter)); CHIP_ERROR err = sAppTask.Init(); if (err != CHIP_NO_ERROR) @@ -121,11 +121,11 @@ void AppTask::AppTaskMain(void * pvParameter) SILABS_LOG("App Task started"); while (true) { - BaseType_t eventReceived = xQueueReceive(sAppEventQueue, &event, portMAX_DELAY); - while (eventReceived == pdTRUE) + osStatus_t eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, osWaitForever); + while (eventReceived == osOK) { sAppTask.DispatchEvent(&event); - eventReceived = xQueueReceive(sAppEventQueue, &event, 0); + eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, 0); } } } diff --git a/examples/lighting-app/silabs/include/AppTask.h b/examples/lighting-app/silabs/include/AppTask.h index 1f47264349bd51..450d9c61b719b4 100644 --- a/examples/lighting-app/silabs/include/AppTask.h +++ b/examples/lighting-app/silabs/include/AppTask.h @@ -28,10 +28,9 @@ #include "AppEvent.h" #include "BaseApplication.h" -#include "FreeRTOS.h" #include "LightingManager.h" -#include "timers.h" // provides FreeRTOS timer support #include +#include #include #include diff --git a/examples/lighting-app/silabs/src/AppTask.cpp b/examples/lighting-app/silabs/src/AppTask.cpp index 7430bd2828d233..338d6d85e2ef51 100644 --- a/examples/lighting-app/silabs/src/AppTask.cpp +++ b/examples/lighting-app/silabs/src/AppTask.cpp @@ -117,7 +117,7 @@ CHIP_ERROR AppTask::StartAppTask() void AppTask::AppTaskMain(void * pvParameter) { AppEvent event; - QueueHandle_t sAppEventQueue = *(static_cast(pvParameter)); + osMessageQueueId_t sAppEventQueue = *(static_cast(pvParameter)); CHIP_ERROR err = sAppTask.Init(); if (err != CHIP_NO_ERROR) @@ -134,11 +134,11 @@ void AppTask::AppTaskMain(void * pvParameter) while (true) { - BaseType_t eventReceived = xQueueReceive(sAppEventQueue, &event, portMAX_DELAY); - while (eventReceived == pdTRUE) + osStatus_t eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, osWaitForever); + while (eventReceived == osOK) { sAppTask.DispatchEvent(&event); - eventReceived = xQueueReceive(sAppEventQueue, &event, 0); + eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, 0); } } } diff --git a/examples/lit-icd-app/silabs/include/AppTask.h b/examples/lit-icd-app/silabs/include/AppTask.h index e653f3680defc2..1fc5f2fae5f18c 100644 --- a/examples/lit-icd-app/silabs/include/AppTask.h +++ b/examples/lit-icd-app/silabs/include/AppTask.h @@ -28,9 +28,8 @@ #include "AppEvent.h" #include "BaseApplication.h" -#include "FreeRTOS.h" -#include "timers.h" // provides FreeRTOS timer support #include +#include #include #include diff --git a/examples/lit-icd-app/silabs/src/AppTask.cpp b/examples/lit-icd-app/silabs/src/AppTask.cpp index f960375dab2b16..bb7bf1a77bc17e 100644 --- a/examples/lit-icd-app/silabs/src/AppTask.cpp +++ b/examples/lit-icd-app/silabs/src/AppTask.cpp @@ -94,7 +94,7 @@ CHIP_ERROR AppTask::StartAppTask() void AppTask::AppTaskMain(void * pvParameter) { AppEvent event; - QueueHandle_t sAppEventQueue = *(static_cast(pvParameter)); + osMessageQueueId_t sAppEventQueue = *(static_cast(pvParameter)); CHIP_ERROR err = sAppTask.Init(); if (err != CHIP_NO_ERROR) @@ -110,11 +110,11 @@ void AppTask::AppTaskMain(void * pvParameter) SILABS_LOG("App Task started"); while (true) { - BaseType_t eventReceived = xQueueReceive(sAppEventQueue, &event, portMAX_DELAY); - while (eventReceived == pdTRUE) + osStatus_t eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, osWaitForever); + while (eventReceived == osOK) { sAppTask.DispatchEvent(&event); - eventReceived = xQueueReceive(sAppEventQueue, &event, 0); + eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, 0); } } } diff --git a/examples/lock-app/silabs/include/AppTask.h b/examples/lock-app/silabs/include/AppTask.h index 01dbee88262543..e1560ac19439b5 100644 --- a/examples/lock-app/silabs/include/AppTask.h +++ b/examples/lock-app/silabs/include/AppTask.h @@ -28,10 +28,9 @@ #include "AppEvent.h" #include "BaseApplication.h" -#include "FreeRTOS.h" #include "LockManager.h" -#include "timers.h" // provides FreeRTOS timer support #include +#include #include #include diff --git a/examples/lock-app/silabs/src/AppTask.cpp b/examples/lock-app/silabs/src/AppTask.cpp index 2510fa7f351c03..6937dbb78e8aa5 100644 --- a/examples/lock-app/silabs/src/AppTask.cpp +++ b/examples/lock-app/silabs/src/AppTask.cpp @@ -210,7 +210,7 @@ CHIP_ERROR AppTask::StartAppTask() void AppTask::AppTaskMain(void * pvParameter) { AppEvent event; - QueueHandle_t sAppEventQueue = *(static_cast(pvParameter)); + osMessageQueueId_t sAppEventQueue = *(static_cast(pvParameter)); CHIP_ERROR err = sAppTask.Init(); if (err != CHIP_NO_ERROR) @@ -230,11 +230,11 @@ void AppTask::AppTaskMain(void * pvParameter) while (true) { - BaseType_t eventReceived = xQueueReceive(sAppEventQueue, &event, portMAX_DELAY); - while (eventReceived == pdTRUE) + osStatus_t eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, osWaitForever); + while (eventReceived == osOK) { sAppTask.DispatchEvent(&event); - eventReceived = xQueueReceive(sAppEventQueue, &event, 0); + eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, 0); } } } diff --git a/examples/pump-app/silabs/include/AppTask.h b/examples/pump-app/silabs/include/AppTask.h index 84e44d45a4b302..69bf7021bf47dd 100644 --- a/examples/pump-app/silabs/include/AppTask.h +++ b/examples/pump-app/silabs/include/AppTask.h @@ -28,10 +28,9 @@ #include "AppEvent.h" #include "BaseApplication.h" -#include "FreeRTOS.h" #include "PumpManager.h" -#include "timers.h" // provides FreeRTOS timer support #include +#include #include #include diff --git a/examples/pump-app/silabs/src/AppTask.cpp b/examples/pump-app/silabs/src/AppTask.cpp index 365c53fc7a33ac..1b4881ff77db51 100644 --- a/examples/pump-app/silabs/src/AppTask.cpp +++ b/examples/pump-app/silabs/src/AppTask.cpp @@ -125,7 +125,7 @@ CHIP_ERROR AppTask::StartAppTask() void AppTask::AppTaskMain(void * pvParameter) { AppEvent event; - QueueHandle_t sAppEventQueue = *(static_cast(pvParameter)); + osMessageQueueId_t sAppEventQueue = *(static_cast(pvParameter)); CHIP_ERROR err = sAppTask.Init(); if (err != CHIP_NO_ERROR) @@ -142,11 +142,11 @@ void AppTask::AppTaskMain(void * pvParameter) while (true) { - BaseType_t eventReceived = xQueueReceive(sAppEventQueue, &event, portMAX_DELAY); - while (eventReceived == pdTRUE) + osStatus_t eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, osWaitForever); + while (eventReceived == osOK) { sAppTask.DispatchEvent(&event); - eventReceived = xQueueReceive(sAppEventQueue, &event, 0); + eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, 0); } } } diff --git a/examples/smoke-co-alarm-app/silabs/include/AppTask.h b/examples/smoke-co-alarm-app/silabs/include/AppTask.h index b91ef5e1335a28..9e68505d341a36 100644 --- a/examples/smoke-co-alarm-app/silabs/include/AppTask.h +++ b/examples/smoke-co-alarm-app/silabs/include/AppTask.h @@ -26,10 +26,9 @@ #include "AppEvent.h" #include "BaseApplication.h" -#include "FreeRTOS.h" #include "SmokeCoAlarmManager.h" -#include "timers.h" // provides FreeRTOS timer support #include +#include #include #include diff --git a/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp b/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp index 0ead0862709abd..9db4af7c127902 100644 --- a/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp +++ b/examples/smoke-co-alarm-app/silabs/src/AppTask.cpp @@ -112,7 +112,7 @@ CHIP_ERROR AppTask::StartAppTask() void AppTask::AppTaskMain(void * pvParameter) { AppEvent event; - QueueHandle_t sAppEventQueue = *(static_cast(pvParameter)); + osMessageQueueId_t sAppEventQueue = *(static_cast(pvParameter)); CHIP_ERROR err = sAppTask.Init(); if (err != CHIP_NO_ERROR) @@ -129,11 +129,11 @@ void AppTask::AppTaskMain(void * pvParameter) while (true) { - BaseType_t eventReceived = xQueueReceive(sAppEventQueue, &event, portMAX_DELAY); - while (eventReceived == pdTRUE) + osStatus_t eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, osWaitForever); + while (eventReceived == osOK) { sAppTask.DispatchEvent(&event); - eventReceived = xQueueReceive(sAppEventQueue, &event, 0); + eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, 0); } } } diff --git a/examples/thermostat/silabs/include/AppTask.h b/examples/thermostat/silabs/include/AppTask.h index 695b7d5b8ed751..25177b9ab43808 100644 --- a/examples/thermostat/silabs/include/AppTask.h +++ b/examples/thermostat/silabs/include/AppTask.h @@ -32,11 +32,10 @@ #include "AppEvent.h" #include "BaseApplication.h" -#include "FreeRTOS.h" #include "SensorManager.h" #include "TemperatureManager.h" -#include "timers.h" // provides FreeRTOS timer support #include +#include #include #include diff --git a/examples/thermostat/silabs/src/AppTask.cpp b/examples/thermostat/silabs/src/AppTask.cpp index b58ad0a288a99e..e033a3fe2b9144 100644 --- a/examples/thermostat/silabs/src/AppTask.cpp +++ b/examples/thermostat/silabs/src/AppTask.cpp @@ -113,7 +113,7 @@ CHIP_ERROR AppTask::StartAppTask() void AppTask::AppTaskMain(void * pvParameter) { AppEvent event; - QueueHandle_t sAppEventQueue = *(static_cast(pvParameter)); + osMessageQueueId_t sAppEventQueue = *(static_cast(pvParameter)); CHIP_ERROR err = sAppTask.Init(); if (err != CHIP_NO_ERROR) @@ -129,11 +129,11 @@ void AppTask::AppTaskMain(void * pvParameter) SILABS_LOG("App Task started"); while (true) { - BaseType_t eventReceived = xQueueReceive(sAppEventQueue, &event, portMAX_DELAY); - while (eventReceived == pdTRUE) + osStatus_t eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, osWaitForever); + while (eventReceived == osOK) { sAppTask.DispatchEvent(&event); - eventReceived = xQueueReceive(sAppEventQueue, &event, 0); + eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, 0); } } } diff --git a/examples/window-app/silabs/include/AppTask.h b/examples/window-app/silabs/include/AppTask.h index bd05d30f85acd1..268e5eea415a06 100644 --- a/examples/window-app/silabs/include/AppTask.h +++ b/examples/window-app/silabs/include/AppTask.h @@ -27,9 +27,8 @@ #include #include "BaseApplication.h" -#include "FreeRTOS.h" -#include "timers.h" // provides FreeRTOS timer support #include +#include #include #include diff --git a/examples/window-app/silabs/src/AppTask.cpp b/examples/window-app/silabs/src/AppTask.cpp index e8b5cc332bfc2f..f255beda6851b6 100644 --- a/examples/window-app/silabs/src/AppTask.cpp +++ b/examples/window-app/silabs/src/AppTask.cpp @@ -80,9 +80,8 @@ CHIP_ERROR AppTask::StartAppTask() void AppTask::AppTaskMain(void * pvParameter) { - AppEvent event; - QueueHandle_t sAppEventQueue = *(static_cast(pvParameter)); + osMessageQueueId_t sAppEventQueue = *(static_cast(pvParameter)); CHIP_ERROR err = sAppTask.Init(); if (err != CHIP_NO_ERROR) @@ -102,11 +101,11 @@ void AppTask::AppTaskMain(void * pvParameter) while (true) { - BaseType_t eventReceived = xQueueReceive(sAppEventQueue, &event, portMAX_DELAY); - while (eventReceived == pdTRUE) + osStatus_t eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, osWaitForever); + while (eventReceived == osOK) { sAppTask.DispatchEvent(&event); - eventReceived = xQueueReceive(sAppEventQueue, &event, 0); + eventReceived = osMessageQueueGet(sAppEventQueue, &event, NULL, 0); } } }