From 3785539b55645eedf2d7c794742db80e633b972d Mon Sep 17 00:00:00 2001 From: mkardous-silabs <84793247+mkardous-silabs@users.noreply.github.com> Date: Thu, 7 Dec 2023 00:24:39 -0500 Subject: [PATCH] Move define to icd config (#30862) --- src/app/icd/BUILD.gn | 6 +++++- src/app/icd/ICDConfigurationData.cpp | 1 + src/app/icd/ICDConfigurationData.h | 5 ----- src/app/icd/icd.gni | 4 ++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/app/icd/BUILD.gn b/src/app/icd/BUILD.gn index 7fdada476e989c..fcb396b3bcd41b 100644 --- a/src/app/icd/BUILD.gn +++ b/src/app/icd/BUILD.gn @@ -26,6 +26,7 @@ buildconfig_header("icd_buildconfig") { "CHIP_CONFIG_ENABLE_ICD_SERVER=${chip_enable_icd_server}", "ICD_REPORT_ON_ENTER_ACTIVE_MODE=${chip_report_on_active_mode}", "ICD_MAX_NOTIFICATION_SUBSCRIBERS=${icd_max_notification_subscribers}", + "ICD_ENFORCE_SIT_SLOW_POLL_LIMIT=${icd_enforce_sit_slow_poll_limit}", ] visibility = [ ":icd_config" ] @@ -108,5 +109,8 @@ source_set("configuration-data") { "ICDConfigurationData.h", ] - deps = [ "${chip_root}/src/lib/core" ] + deps = [ + ":icd_config", + "${chip_root}/src/lib/core", + ] } diff --git a/src/app/icd/ICDConfigurationData.cpp b/src/app/icd/ICDConfigurationData.cpp index d3f57eacced070..6abb9784fde1ce 100644 --- a/src/app/icd/ICDConfigurationData.cpp +++ b/src/app/icd/ICDConfigurationData.cpp @@ -16,6 +16,7 @@ */ #include "ICDConfigurationData.h" +#include namespace chip { diff --git a/src/app/icd/ICDConfigurationData.h b/src/app/icd/ICDConfigurationData.h index 4fd16c92c1a7b1..2bdd832c52f0c5 100644 --- a/src/app/icd/ICDConfigurationData.h +++ b/src/app/icd/ICDConfigurationData.h @@ -20,11 +20,6 @@ #include #include -#ifndef ICD_ENFORCE_SIT_SLOW_POLL_LIMIT -// Set to 1 to enforce SIT Slow Polling Max value to 15seconds (spec 9.16.1.5) -#define ICD_ENFORCE_SIT_SLOW_POLL_LIMIT 0 -#endif - namespace chip { namespace app { diff --git a/src/app/icd/icd.gni b/src/app/icd/icd.gni index cfb5a1a183be8a..b2be3caf06df1c 100644 --- a/src/app/icd/icd.gni +++ b/src/app/icd/icd.gni @@ -23,5 +23,9 @@ declare_args() { # Matter SDK Configuration flag to make the ICD manager emit a report on entering active mode chip_report_on_active_mode = false + icd_max_notification_subscribers = 1 + + # Set to true to enforce SIT Slow Polling Max value to 15seconds (spec 9.16.1.5) + icd_enforce_sit_slow_poll_limit = false }