Fix CI and apps should use emberAfActionsClusterInitCallback instead …

…of MatterActionsPluginServerInitCallback in example
project-chip · Oct 10, 2024 · 2cfcc26 · 2cfcc26
1 parent 863fa0f
commit 2cfcc26
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack.defaults b/examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack.defaults
@@ -73,3 +73,9 @@ CONFIG_BUILD_CHIP_TESTS=y
 
 # Move functions from IRAM to flash
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
+
+# Reduce the event logging buffer to reduce the DRAM usage
+# TODO: [ESP32] Fix the DRAM overflow in esp32 apps #34717
+CONFIG_EVENT_LOGGING_CRIT_BUFFER_SIZE=512
+CONFIG_EVENT_LOGGING_INFO_BUFFER_SIZE=512
+CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=512
diff --git a/examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack_rpc.defaults b/examples/all-clusters-minimal-app/esp32/sdkconfig_m5stack_rpc.defaults
@@ -88,3 +88,9 @@ CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
 CONFIG_EVENT_LOGGING_CRIT_BUFFER_SIZE=1024
 
 CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP=y
+
+# Reduce the event logging buffer to reduce the DRAM usage
+# TODO: [ESP32] Fix the DRAM overflow in esp32 apps #34717
+CONFIG_EVENT_LOGGING_CRIT_BUFFER_SIZE=512
+CONFIG_EVENT_LOGGING_INFO_BUFFER_SIZE=512
+CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=512
diff --git a/examples/bridge-app/linux/BUILD.gn b/examples/bridge-app/linux/BUILD.gn
@@ -28,14 +28,6 @@ executable("chip-bridge-app") {
     "main.cpp",
   ]
 
-  # Generic implementation of the actions cluster is not introduced in this app as this app has
-  # an interface to test actions.
-  # TODO: Generic implementation can be used here instead of having its own.
-  excludes = [ "${chip_root}/src/app/clusters/actions-server/**" ]
-
-  # Apply excludes to the sources
-  sources -= excludes
-
   deps = [
     "${chip_root}/examples/bridge-app/bridge-common",
     "${chip_root}/examples/platform/linux:app-main",

diff --git a/examples/bridge-app/linux/bridged-actions-stub.cpp b/examples/bridge-app/linux/bridged-actions-stub.cpp
@@ -131,7 +131,7 @@ CHIP_ERROR ActionsAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attr
 }
 } // anonymous namespace
 
-void MatterActionsPluginServerInitCallback()
+void emberAfActionsClusterInitCallback()
 {
     AttributeAccessInterfaceRegistry::Instance().Register(&gAttrAccess);
 }
diff --git a/examples/bridge-app/telink/CMakeLists.txt b/examples/bridge-app/telink/CMakeLists.txt
@@ -38,7 +38,6 @@ target_include_directories(app PRIVATE
 target_sources(app PRIVATE
                src/AppTask.cpp
                src/Device.cpp
-               src/DeviceCallbacks.cpp
                ${TELINK_COMMON}/common/src/mainCommon.cpp
                ${TELINK_COMMON}/common/src/AppTaskCommon.cpp
                ${TELINK_COMMON}/util/src/LEDManager.cpp