Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ICD] Create ICDConfigurationData class with associated refactor #30618

Merged
merged 25 commits into from
Nov 28, 2023
Merged

[ICD] Create ICDConfigurationData class with associated refactor #30618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
0ea5b1f
Create ICDData class with refactor
mkardous-silabs Nov 22, 2023
641fc13
Move ICD mode to ICDData
mkardous-silabs Nov 23, 2023
e7752f9
Add missing setters
mkardous-silabs Nov 23, 2023
93d67e3
Add shutdown calls
mkardous-silabs Nov 23, 2023
f615009
make ICDData a singleton
mkardous-silabs Nov 23, 2023
019523d
fix build issue
mkardous-silabs Nov 23, 2023
f5474d3
Add ICDData call where necessary
mkardous-silabs Nov 23, 2023
fafd649
Fix cmakelist
mkardous-silabs Nov 23, 2023
1dc30ee
fix pointer issue
mkardous-silabs Nov 23, 2023
1feaf55
Apply suggestions from code review
mkardous-silabs Nov 23, 2023
f66e2a6
Update src/app/icd/ICDData.h
mkardous-silabs Nov 23, 2023
6cbfe31
Add ICD args to wifi lock build
mkardous-silabs Nov 23, 2023
da38a1d
address review comments
mkardous-silabs Nov 23, 2023
7a2717c
rename table to monitoring-table
mkardous-silabs Nov 23, 2023
8ca7f42
fix build by removing unnecessary forward declaration
mkardous-silabs Nov 23, 2023
5daf5c2
Update src/app/clusters/icd-management-server/icd-management-server.cpp
mkardous-silabs Nov 28, 2023
b6bace3
rename SessionKeystore to SymmetricKeystore
mkardous-silabs Nov 28, 2023
86d4167
Rename ICDData to ICDConfigurationData
mkardous-silabs Nov 28, 2023
2b5813f
make fabric table const when reading monitoring table
mkardous-silabs Nov 28, 2023
2e2f2ea
replace server include with icd config
mkardous-silabs Nov 28, 2023
9422a1b
restyle
mkardous-silabs Nov 28, 2023
cf844ea
Remove deleted source file
mkardous-silabs Nov 28, 2023
1a8efa7
rename source-set from data to configuration-data
mkardous-silabs Nov 28, 2023
83e9207
fix rebase errors
mkardous-silabs Nov 28, 2023
ea2d1ae
fix ordering of inits
mkardous-silabs Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions examples/lock-app/silabs/build_for_wifi_args.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,13 @@ import("${chip_root}/src/platform/silabs/wifi_args.gni")

chip_enable_ota_requestor = true
app_data_model = "${chip_root}/examples/lock-app/lock-common"

mkardous-silabs marked this conversation as resolved.
Show resolved Hide resolved
# ICD Default configurations
chip_enable_icd_server = true
chip_subscription_timeout_resumption = false
sl_use_subscription_synching = true

# ICD Matter Configuration flags
sl_idle_mode_interval_s = 600 # 10min Idle Mode Interval
sl_active_mode_interval_ms = 10000 # 10s Active Mode Interval
sl_active_mode_threshold_ms = 1000 # 1s Active Mode Threshold
4 changes: 2 additions & 2 deletions src/app/ReadHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <app/reporting/Engine.h>

#if CHIP_CONFIG_ENABLE_ICD_SERVER
#include <app/icd/ICDManagementServer.h> // nogncheck
#include <app/icd/ICDConfigurationData.h> //nogncheck
#endif

namespace chip {
Expand All @@ -46,7 +46,7 @@ using Status = Protocols::InteractionModel::Status;
uint16_t ReadHandler::GetPublisherSelectedIntervalLimit()
{
#if CHIP_CONFIG_ENABLE_ICD_SERVER
return static_cast<uint16_t>(ICDManagementServer::GetInstance().GetIdleModeDurationSec());
return static_cast<uint16_t>(ICDConfigurationData::GetInstance().GetIdleModeDurationSec());
#else
return kSubscriptionMaxIntervalPublisherLimit;
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/app/chip_data_model.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ function(chip_configure_data_model APP_TARGET)
${CHIP_APP_BASE_DIR}/util/attribute-table.cpp
${CHIP_APP_BASE_DIR}/util/binding-table.cpp
${CHIP_APP_BASE_DIR}/icd/ICDMonitoringTable.cpp
${CHIP_APP_BASE_DIR}/icd/ICDManagementServer.cpp
${CHIP_APP_BASE_DIR}/icd/ICDNotifier.cpp
${CHIP_APP_BASE_DIR}/icd/ICDConfigurationData.cpp
${CHIP_APP_BASE_DIR}/util/DataModelHandler.cpp
${CHIP_APP_BASE_DIR}/util/ember-compatibility-functions.cpp
${CHIP_APP_BASE_DIR}/util/generic-callback-stubs.cpp
Expand Down
10 changes: 7 additions & 3 deletions src/app/chip_data_model.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ template("chip_data_model") {
"${_app_root}/clusters/color-control-server/color-control-server.h",
"${_app_root}/clusters/door-lock-server/door-lock-server.h",
"${_app_root}/clusters/groups-server/groups-server.h",
"${_app_root}/clusters/icd-management-server/icd-management-server.h",
"${_app_root}/clusters/identify-server/identify-server.h",
"${_app_root}/clusters/level-control/level-control.h",
"${_app_root}/clusters/on-off-server/on-off-server.h",
Expand Down Expand Up @@ -294,10 +293,15 @@ template("chip_data_model") {
"${_app_root}/clusters/${cluster}/dishwasher-alarm-delegate.h",
]
} else if (cluster == "icd-management-server") {
sources += [ "${_app_root}/clusters/${cluster}/${cluster}.cpp" ]
sources += [
"${_app_root}/clusters/${cluster}/${cluster}.cpp",
"${_app_root}/clusters/${cluster}/${cluster}.h",
]
deps += [
"${chip_root}/src/app/icd:cluster",
"${chip_root}/src/app/icd:configuration-data",
"${chip_root}/src/app/icd:icd_config",
"${chip_root}/src/app/icd:monitoring-table",
"${chip_root}/src/app/icd:notifier",
]
} else if (cluster == "resource-monitoring-server") {
sources += [
Expand Down
Loading
Loading