merge conflicts

Author: mykrupp

examples/platform/silabs/MatterConfig.cpp

@@ -79,6 +79,13 @@ static chip::DeviceLayer::Internal::Efr32PsaOperationalKeystore gOperationalKeys
 
 #include <platform/silabs/platformAbstraction/SilabsPlatform.h>
 
+#if CHIP_ENABLE_OPENTHREAD && (SL_MATTER_GN_BUILD == 0)
+// SLC-FIX
+// TODO: Remove the Power Manager include when OT does not add an EM1 req at init
+#define CURRENT_MODULE_NAME "OPENTHREAD"
+#include "sl_power_manager.h"
+#endif
+
 /**********************************************************
  * Defines
  *********************************************************/
@@ -183,6 +190,12 @@ void ApplicationStart(void * unused)
 
 void SilabsMatterConfig::AppInit()
 {
+    #if CHIP_ENABLE_OPENTHREAD && (SL_MATTER_GN_BUILD == 0)
+    // SLC-FIX
+    // TODO: Remove the Power Manager remove req when OT does not add an EM1 req at init
+    sl_power_manager_remove_em_requirement(SL_POWER_MANAGER_EM1);
+    #endif
+
     GetPlatform().Init();
     sMainTaskHandle = osThreadNew(ApplicationStart, nullptr, &kMainTaskAttr);
     SILABS_LOG("Starting scheduler");

examples/platform/silabs/SiWx917/SiWx917/sl_wifi_if.cpp

@@ -70,6 +70,9 @@ extern "C" {
 #include "sl_si91x_button_pin_config.h"
 #include "sl_si91x_power_manager.h"
 
+// [SLC-TEMP] Adding power manager include until we update wiseconnect version and upstream the changes
+#include "sl_si91x_power_manager.h"
+
 namespace {
 // TODO: should be removed once we are getting the press interrupt for button 0 with sleep
 #define BUTTON_PRESSED 1
@@ -639,7 +642,7 @@ static sl_status_t wfx_rsi_do_join(void)
     case WFX_SEC_WPA3:
         ap.security = SL_WIFI_WPA3_TRANSITION;
 #else
-        ap.security          = SL_WIFI_WPA_WPA2_MIXED;
+        ap.security = SL_WIFI_WPA_WPA2_MIXED;
 #endif // WIFI_ENABLE_SECURITY_WPA3_TRANSITION
         break;
     case WFX_SEC_NONE:

examples/platform/silabs/SoftwareFaultReports.cpp

@@ -126,6 +126,7 @@ extern "C" __attribute__((used)) void debugHardfault(uint32_t * sp)
 /**
  * Override default hard-fault handler
  */
+#ifndef SL_CATALOG_ZIGBEE_STACK_COMMON_PRESENT
 extern "C" __attribute__((naked)) void HardFault_Handler(void)
 {
     __asm volatile("tst lr, #4                                    \n"
@@ -136,6 +137,7 @@ extern "C" __attribute__((naked)) void HardFault_Handler(void)
                    "bx r1                                         \n"
                    "debugHardfault_address: .word debugHardfault  \n");
 }
+#endif // SL_CATALOG_ZIGBEE_STACK_COMMON_PRESENT
 
 extern "C" void vApplicationMallocFailedHook(void)
 {
@@ -229,6 +231,7 @@ extern "C" void vApplicationGetTimerTaskMemory(StaticTask_t ** ppxTimerTaskTCBBu
 }
 
 #if !defined(SLI_SI91X_MCU_INTERFACE) || !defined(SLI_SI91X_ENABLE_BLE)
+#ifndef SL_CATALOG_ZIGBEE_STACK_COMMON_PRESENT
 extern "C" void RAILCb_AssertFailed(RAIL_Handle_t railHandle, uint32_t errorCode)
 {
     char faultMessage[kMaxFaultStringLen] = { 0 };
@@ -252,5 +255,6 @@ extern "C" void RAILCb_AssertFailed(RAIL_Handle_t railHandle, uint32_t errorCode
 
     chipAbort();
 }
+#endif // SL_CATALOG_ZIGBEE_STACK_COMMON_PRESENT
 #endif // !defined(SLI_SI91X_MCU_INTERFACE) || !defined(SLI_SI91X_ENABLE_BLE)
 #endif // HARD_FAULT_LOG_ENABLE

src/app/tests/BUILD.gn

@@ -251,7 +251,10 @@ chip_test_suite("tests") {
     "${chip_root}/src/app",
     "${chip_root}/src/app/codegen-data-model-provider:instance-header",
     "${chip_root}/src/app/common:cluster-objects",
+<<<<<<< HEAD
     "${chip_root}/src/app/data-model-provider/tests:encode-decode",
+=======
+>>>>>>> test_release_2.4-1.4
     "${chip_root}/src/app/icd/client:handler",
     "${chip_root}/src/app/icd/client:manager",
     "${chip_root}/src/app/tests:helpers",

src/app/util/attribute-metadata.cpp

@@ -36,4 +36,4 @@ bool emberAfIsStringAttributeType(EmberAfAttributeType attributeType)
 bool emberAfIsLongStringAttributeType(EmberAfAttributeType attributeType)
 {
     return (attributeType == ZCL_LONG_OCTET_STRING_ATTRIBUTE_TYPE || attributeType == ZCL_LONG_CHAR_STRING_ATTRIBUTE_TYPE);
-}
+}