# This is a combination of 4 commits.

# This is the 1st commit message: WIP # This is the commit message #2: WIP # This is the commit message #3: WIP # This is the commit message #4: WIP
mkardous-silabs · Oct 14, 2022 · bfa08b0 · bfa08b0
1 parent b6c9191
commit bfa08b0
Show file tree

Hide file tree

Showing 21 changed files with 125 additions and 33 deletions.
diff --git a/examples/chef/efr32/BUILD.gn b/examples/chef/efr32/BUILD.gn
@@ -94,7 +94,7 @@ chip_data_model("chef-common") {
 
 # ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD)
 if (silabs_board == "BRD4166A" || silabs_board == "BRD2601B" ||
-    silabs_board == "BRD2703A" || silabs_board == "BRD4319A") {
+    silabs_board == "BRD2703A" || silabs_board == "BRD4319A" ) {
   show_qr_code = false
   disable_lcd = true
 }

diff --git a/examples/light-switch-app/efr32/BUILD.gn b/examples/light-switch-app/efr32/BUILD.gn
@@ -87,7 +87,8 @@ if (chip_enable_wifi) {
 
 # ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD)
 if (silabs_board == "BRD4166A" || silabs_board == "BRD2601B" ||
-    silabs_board == "BRD2703A" || silabs_board == "BRD4319A") {
+    silabs_board == "BRD2703A" || silabs_board == "BRD4319A" ||
+    silabs_board == "BRD2704A") {
   show_qr_code = false
   disable_lcd = true
 }

diff --git a/examples/light-switch-app/efr32/include/AppTask.h b/examples/light-switch-app/efr32/include/AppTask.h
@@ -29,7 +29,11 @@
 #include "AppEvent.h"
 #include "BaseApplication.h"
 #include "FreeRTOS.h"
+
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
 #include "sl_simple_button_instances.h"
+#endif // SL_CATALOG_SIMPLE_BUTTON_PRESENT
+
 #include "timers.h" // provides FreeRTOS timer support
 #include <app/clusters/identify-server/identify-server.h>
 #include <ble/BLEEndPoint.h>
@@ -69,6 +73,7 @@ class AppTask : public BaseApplication
 
     CHIP_ERROR StartAppTask();
 
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
     /**
      * @brief Event handler when a button is pressed
      * Function posts an event for button processing
@@ -78,6 +83,7 @@ class AppTask : public BaseApplication
      *                  SL_SIMPLE_BUTTON_RELEASED or SL_SIMPLE_BUTTON_DISABLED
      */
     void ButtonEventHandler(const sl_button_t * buttonHandle, uint8_t btnAction) override;
+#endif // #ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
 
     /**
      * @brief Callback called by the identify-server when an identify command is received

diff --git a/examples/light-switch-app/efr32/src/AppTask.cpp b/examples/light-switch-app/efr32/src/AppTask.cpp
@@ -55,11 +55,10 @@
 /**********************************************************
  * Defines and Constants
  *********************************************************/
-
-#define SYSTEM_STATE_LED &sl_led_led0
-
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
 #define APP_FUNCTION_BUTTON &sl_button_btn0
 #define APP_LIGHT_SWITCH &sl_button_btn1
+#endif // SL_CATALOG_SIMPLE_BUTTON_PRESENT
 
 using namespace chip;
 using namespace ::chip::DeviceLayer;
@@ -249,6 +248,7 @@ void AppTask::SwitchActionEventHandler(AppEvent * aEvent)
     }
 }
 
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
 void AppTask::ButtonEventHandler(const sl_button_t * buttonHandle, uint8_t btnAction)
 {
     if (buttonHandle == NULL)
@@ -271,3 +271,4 @@ void AppTask::ButtonEventHandler(const sl_button_t * buttonHandle, uint8_t btnAc
         sAppTask.PostEvent(&button_event);
     }
 }
+#endif // SL_CATALOG_SIMPLE_BUTTON_PRESENT
diff --git a/examples/light-switch-app/efr32/src/main.cpp b/examples/light-switch-app/efr32/src/main.cpp
@@ -21,7 +21,11 @@
 
 #include "AppConfig.h"
 #include "init_efrPlatform.h"
+
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
 #include "sl_simple_button_instances.h"
+#endif // SL_CATALOG_SIMPLE_BUTTON_PRESENT
+
 #include "sl_system_kernel.h"
 #include <DeviceInfoProviderImpl.h>
 #include <app/server/Server.h>
@@ -78,7 +82,9 @@ int main(void)
     appError(CHIP_ERROR_INTERNAL);
 }
 
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
 void sl_button_on_change(const sl_button_t * handle)
 {
     AppTask::GetAppTask().ButtonEventHandler(handle, sl_button_get_state(handle));
 }
+#endif // SL_CATALOG_SIMPLE_BUTTON_PRESENT
diff --git a/examples/lighting-app/efr32/BUILD.gn b/examples/lighting-app/efr32/BUILD.gn
@@ -87,7 +87,8 @@ if (chip_enable_wifi) {
 
 # ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD)
 if (silabs_board == "BRD4166A" || silabs_board == "BRD2601B" ||
-    silabs_board == "BRD2703A" || silabs_board == "BRD4319A") {
+    silabs_board == "BRD2703A" || silabs_board == "BRD4319A" ||
+    silabs_board == "BRD2704A") {
   show_qr_code = false
   disable_lcd = true
 }

diff --git a/examples/lighting-app/efr32/include/AppTask.h b/examples/lighting-app/efr32/include/AppTask.h
@@ -30,7 +30,11 @@
 #include "BaseApplication.h"
 #include "FreeRTOS.h"
 #include "LightingManager.h"
+
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
 #include "sl_simple_button_instances.h"
+#endif // SL_CATALOG_SIMPLE_BUTTON_PRESENT
+
 #include "timers.h" // provides FreeRTOS timer support
 #include <app/clusters/identify-server/identify-server.h>
 #include <ble/BLEEndPoint.h>
@@ -69,7 +73,7 @@ class AppTask : public BaseApplication
     static void AppTaskMain(void * pvParameter);
 
     CHIP_ERROR StartAppTask();
-
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
     /**
      * @brief Event handler when a button is pressed
      * Function posts an event for button processing
@@ -79,7 +83,7 @@ class AppTask : public BaseApplication
      *                  SL_SIMPLE_BUTTON_RELEASED or SL_SIMPLE_BUTTON_DISABLED
      */
     void ButtonEventHandler(const sl_button_t * buttonHandle, uint8_t btnAction) override;
-
+#endif // SL_CATALOG_SIMPLE_BUTTON_PRESENT
     /**
      * @brief Callback called by the identify-server when an identify command is received
      *

diff --git a/examples/lighting-app/efr32/src/AppTask.cpp b/examples/lighting-app/efr32/src/AppTask.cpp
@@ -45,21 +45,26 @@
 #include <platform/CHIPDeviceLayer.h>
 
 #ifdef ENABLE_WSTK_LEDS
+
 #define SYSTEM_STATE_LED &sl_led_led0
+#ifdef SL_CATALOG_LED1_PRESENT
 #define LIGHT_LED &sl_led_led1
+#endif // SL_CATALOG_LED1_PRESENT
 #endif // ENABLE_WSTK_LEDS
 
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
 #define APP_FUNCTION_BUTTON &sl_button_btn0
 #define APP_LIGHT_SWITCH &sl_button_btn1
+#endif // SL_CATALOG_SIMPLE_BUTTON_PRESENT
 
 using namespace chip;
 using namespace ::chip::DeviceLayer;
 
 namespace {
 
-#ifdef ENABLE_WSTK_LEDS
+#if defined(ENABLE_WSTK_LEDS) && defined(SL_CATALOG_LED1_PRESENT)
 LEDWidget sLightLED;
-#endif // ENABLE_WSTK_LEDS
+#endif // ENABLE_WSTK_LEDS && SL_CATALOG_LED1_PRESENT
 
 EmberAfIdentifyEffectIdentifier sIdentifyEffect = EMBER_ZCL_IDENTIFY_EFFECT_IDENTIFIER_STOP_EFFECT;
 
@@ -154,10 +159,10 @@ CHIP_ERROR AppTask::Init()
 
     LightMgr().SetCallbacks(ActionInitiated, ActionCompleted);
 
-#ifdef ENABLE_WSTK_LEDS
+#if defined(ENABLE_WSTK_LEDS) && defined(SL_CATALOG_LED1_PRESENT)
     sLightLED.Init(LIGHT_LED);
     sLightLED.Set(LightMgr().IsLightOn());
-#endif // ENABLE_WSTK_LEDS
+#endif // ENABLE_WSTK_LEDS && SL_CATALOG_LED1_PRESENT
 
     return err;
 }
@@ -247,6 +252,7 @@ void AppTask::LightActionEventHandler(AppEvent * aEvent)
     }
 }
 
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
 void AppTask::ButtonEventHandler(const sl_button_t * buttonHandle, uint8_t btnAction)
 {
     if (buttonHandle == NULL)
@@ -269,16 +275,17 @@ void AppTask::ButtonEventHandler(const sl_button_t * buttonHandle, uint8_t btnAc
         sAppTask.PostEvent(&button_event);
     }
 }
+#endif // SL_CATALOG_SIMPLE_BUTTON_PRESENT
 
 void AppTask::ActionInitiated(LightingManager::Action_t aAction, int32_t aActor)
 {
     // Action initiated, update the light led
     bool lightOn = aAction == LightingManager::ON_ACTION;
     EFR32_LOG("Turning light %s", (lightOn) ? "On" : "Off")
 
-#ifdef ENABLE_WSTK_LEDS
+#if defined(ENABLE_WSTK_LEDS) && defined(SL_CATALOG_LED1_PRESENT)
     sLightLED.Set(lightOn);
-#endif // ENABLE_WSTK_LEDS
+#endif // ENABLE_WSTK_LEDS && SL_CATALOG_LED1_PRESENT
 
 #ifdef DISPLAY_ENABLED
     sAppTask.GetLCD().WriteDemoUI(lightOn);

diff --git a/examples/lighting-app/efr32/src/main.cpp b/examples/lighting-app/efr32/src/main.cpp
@@ -21,7 +21,11 @@
 
 #include "AppConfig.h"
 #include "init_efrPlatform.h"
+
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
 #include "sl_simple_button_instances.h"
+#endif // SL_CATALOG_SIMPLE_BUTTON_PRESENT
+
 #include "sl_system_kernel.h"
 #include <DeviceInfoProviderImpl.h>
 #include <app/server/Server.h>
@@ -33,7 +37,7 @@
 #include <credentials/examples/DeviceAttestationCredsExample.h>
 #endif
 
-#define BLE_DEV_NAME "SiLabs-Light"
+#define BLE_DEV_NAME "BRD2704A-SiLabs-Light"
 using namespace ::chip;
 using namespace ::chip::Inet;
 using namespace ::chip::DeviceLayer;
@@ -78,7 +82,9 @@ int main(void)
     appError(CHIP_ERROR_INTERNAL);
 }
 
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
 void sl_button_on_change(const sl_button_t * handle)
 {
     AppTask::GetAppTask().ButtonEventHandler(handle, sl_button_get_state(handle));
 }
+#endif // SL_CATALOG_SIMPLE_BUTTON_PRESENT
diff --git a/examples/lock-app/efr32/BUILD.gn b/examples/lock-app/efr32/BUILD.gn
@@ -87,7 +87,8 @@ if (chip_enable_wifi) {
 
 # ThunderBoards, Explorer Kit and MGM240L do not support LCD (No LCD)
 if (silabs_board == "BRD4166A" || silabs_board == "BRD2601B" ||
-    silabs_board == "BRD2703A" || silabs_board == "BRD4319A") {
+    silabs_board == "BRD2703A" || silabs_board == "BRD4319A" ||
+    silabs_board == "BRD2704A") {
   show_qr_code = false
   disable_lcd = true
 }

diff --git a/examples/lock-app/efr32/include/AppTask.h b/examples/lock-app/efr32/include/AppTask.h
@@ -30,7 +30,11 @@
 #include "BaseApplication.h"
 #include "FreeRTOS.h"
 #include "LockManager.h"
+
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
 #include "sl_simple_button_instances.h"
+#endif // SL_CATALOG_SIMPLE_BUTTON_PRESENT
+
 #include "timers.h" // provides FreeRTOS timer support
 #include <app/clusters/identify-server/identify-server.h>
 #include <ble/BLEEndPoint.h>
@@ -75,6 +79,7 @@ class AppTask : public BaseApplication
     static void ActionInitiated(LockManager::Action_t aAction, int32_t aActor);
     static void ActionCompleted(LockManager::Action_t aAction);
 
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
     /**
      * @brief Event handler when a button is pressed
      * Function posts an event for button processing
@@ -84,6 +89,7 @@ class AppTask : public BaseApplication
      *                  SL_SIMPLE_BUTTON_RELEASED or SL_SIMPLE_BUTTON_DISABLED
      */
     void ButtonEventHandler(const sl_button_t * buttonHandle, uint8_t btnAction) override;
+#endif
 
     /**
      * @brief Callback called by the identify-server when an identify command is received
@@ -109,6 +115,7 @@ class AppTask : public BaseApplication
      */
     CHIP_ERROR Init();
 
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
     /**
      * @brief PB0 Button event processing function
      *        Press and hold will trigger a factory reset timer start
@@ -125,6 +132,7 @@ class AppTask : public BaseApplication
      * @param aEvent button event being processed
      */
     static void SwitchActionEventHandler(AppEvent * aEvent);
+#endif // SL_CATALOG_SIMPLE_BUTTON_PRESENT
 
     /**
      * @brief Update Cluster State

diff --git a/examples/lock-app/efr32/src/AppTask.cpp b/examples/lock-app/efr32/src/AppTask.cpp
@@ -57,7 +57,10 @@
 
 #ifdef ENABLE_WSTK_LEDS
 #define SYSTEM_STATE_LED &sl_led_led0
+
+#ifdef SL_CATALOG_LED1_PRESENT
 #define LOCK_STATE_LED &sl_led_led1
+#endif // SL_CATALOG_LED1_PRESENT
 #endif // ENABLE_WSTK_LEDS
 
 #define APP_FUNCTION_BUTTON &sl_button_btn0
@@ -73,7 +76,7 @@ using namespace ::chip::DeviceLayer::Internal;
 using namespace EFR32DoorLock::LockInitParams;
 
 namespace {
-#ifdef ENABLE_WSTK_LEDS
+#if  defined(ENABLE_WSTK_LEDS) && defined(SL_CATALOG_LED1_PRESENT)
 LEDWidget sLockLED;
 #endif // ENABLE_WSTK_LEDS
 
@@ -235,11 +238,11 @@ CHIP_ERROR AppTask::Init()
 
     LockMgr().SetCallbacks(ActionInitiated, ActionCompleted);
 
-#ifdef ENABLE_WSTK_LEDS
+#if defined(ENABLE_WSTK_LEDS) && defined(SL_CATALOG_LED1_PRESENT)
     // Initialize LEDs
     sLockLED.Init(LOCK_STATE_LED);
     sLockLED.Set(state.Value() == DlLockState::kUnlocked);
-#endif // ENABLE_WSTK_LEDS
+#endif // ENABLE_WSTK_LEDS && SL_CATALOG_LED1_PRESENT
 
     chip::DeviceLayer::PlatformMgr().ScheduleWork(UpdateClusterState, reinterpret_cast<intptr_t>(nullptr));
 
@@ -343,6 +346,7 @@ void AppTask::LockActionEventHandler(AppEvent * aEvent)
     }
 }
 
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
 void AppTask::ButtonEventHandler(const sl_button_t * buttonHandle, uint8_t btnAction)
 {
     if (buttonHandle == NULL)
@@ -365,16 +369,17 @@ void AppTask::ButtonEventHandler(const sl_button_t * buttonHandle, uint8_t btnAc
         sAppTask.PostEvent(&button_event);
     }
 }
+#endif // SL_CATALOG_SIMPLE_BUTTON_PRESENT
 
 void AppTask::ActionInitiated(LockManager::Action_t aAction, int32_t aActor)
 {
     if (aAction == LockManager::UNLOCK_ACTION || aAction == LockManager::LOCK_ACTION)
     {
         bool locked = (aAction == LockManager::LOCK_ACTION);
         EFR32_LOG("%s Action has been initiated", (locked) ? "Lock" : "Unlock");
-#ifdef ENABLE_WSTK_LEDS
+#if defined(ENABLE_WSTK_LEDS) && defined(SL_CATALOG_LED1_PRESENT)
         sLockLED.Set(!locked);
-#endif // ENABLE_WSTK_LEDS
+#endif // ENABLE_WSTK_LEDS && SL_CATALOG_LED1_PRESENT
 
 #ifdef DISPLAY_ENABLED
         sAppTask.GetLCD().WriteDemoUI(locked);

diff --git a/examples/lock-app/efr32/src/main.cpp b/examples/lock-app/efr32/src/main.cpp
@@ -21,7 +21,11 @@
 
 #include "AppConfig.h"
 #include "init_efrPlatform.h"
+
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
 #include "sl_simple_button_instances.h"
+#endif // SL_CATALOG_SIMPLE_BUTTON_PRESENT
+
 #include "sl_system_kernel.h"
 #include <DeviceInfoProviderImpl.h>
 #include <app/server/Server.h>
@@ -78,7 +82,9 @@ int main(void)
     appError(CHIP_ERROR_INTERNAL);
 }
 
+#ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
 void sl_button_on_change(const sl_button_t * handle)
 {
     AppTask::GetAppTask().ButtonEventHandler(handle, sl_button_get_state(handle));
 }
+#endif // SL_CATALOG_SIMPLE_BUTTON_PRESENT