Skip to content

Commit

Permalink
Merge branch 'release_2.5-1.4' into bugfix/refrigerator-alarm-cluster
Browse files Browse the repository at this point in the history
  • Loading branch information
@shgutte
shgutte authored Dec 2, 2024
2 parents b52c3e4 + aecfee2 commit 061cd3b
Show file tree
Hide file tree
Showing 16 changed files with 123 additions and 355 deletions.
12 changes: 7 additions & 5 deletions examples/platform/silabs/MatterConfig.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,12 @@
#include "MemMonitoring.h"
#endif

#if defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1
#include <platform/silabs/SiWx917/SiWxPlatformInterface.h>
#if ( ( defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1 ) || defined(EXP_BOARD) )
#include <platform/silabs/wifi/wiseconnect-abstraction/WiseconnectInterfaceAbstraction.h>
#endif // SLI_SI91X_MCU_INTERFACE
#if !defined(EXP_BOARD)
#include <platform/silabs/SiWx917/SiWxPlatformInterface.h>
#endif //!defined(EXP_BOARD)
#endif // ( ( defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1 ) || defined(EXP_BOARD) )

#include <crypto/CHIPCryptoPAL.h>
// If building with the EFR32-provided crypto backend, we can use the
Expand Down Expand Up @@ -379,9 +381,9 @@ CHIP_ERROR SilabsMatterConfig::InitWiFi(void)
#endif // SL_WFX_USE_SECURE_LINK
#endif // WF200_WIFI

#if defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1
#if ( ( defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1 ) || defined(EXP_BOARD) )
VerifyOrReturnError(sl_matter_wifi_platform_init() == SL_STATUS_OK, CHIP_ERROR_INTERNAL);
#endif // SLI_SI91X_MCU_INTERFACE
#endif // ( ( defined(SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE == 1 ) || defined(EXP_BOARD) )

return CHIP_NO_ERROR;
}
Expand Down
4 changes: 2 additions & 2 deletions examples/refrigerator-app/silabs/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import("//build_overrides/efr32_sdk.gni")
import("//build_overrides/pigweed.gni")

import("${build_root}/config/defaults.gni")
import("${efr32_sdk_build_root}/silabs_executable.gni")
import("${silabs_sdk_build_root}/silabs_executable.gni")

import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
import("${chip_root}/src/platform/device.gni")
Expand All @@ -38,7 +38,7 @@ if (wifi_soc) {
import("${chip_root}/third_party/silabs/SiWx917_sdk.gni")
examples_plat_dir = "${chip_root}/examples/platform/silabs/SiWx917"
} else {
import("${efr32_sdk_build_root}/efr32_sdk.gni")
import("${silabs_sdk_build_root}/efr32_sdk.gni")
examples_plat_dir = "${chip_root}/examples/platform/silabs/efr32"
}

Expand Down
16 changes: 1 addition & 15 deletions examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1642,6 +1642,7 @@ cluster RefrigeratorAlarm = 87 {
endpoint 0 {
device type ma_rootdevice = 22, version 1;

binding cluster OtaSoftwareUpdateProvider;

server cluster Identify {
ram attribute identifyTime default = 0x0;
Expand Down Expand Up @@ -1717,21 +1718,6 @@ endpoint 0 {
ram attribute clusterRevision default = 3;
}

server cluster OtaSoftwareUpdateProvider {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;

handle command QueryImage;
handle command QueryImageResponse;
handle command ApplyUpdateRequest;
handle command ApplyUpdateResponse;
handle command NotifyUpdateApplied;
}

server cluster OtaSoftwareUpdateRequestor {
callback attribute defaultOTAProviders;
ram attribute updatePossible default = true;
Expand Down
134 changes: 22 additions & 112 deletions examples/refrigerator-app/silabs/data_model/refrigerator-thread-app.zap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,16 @@
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
"name": "MA-rootdevice"
"name": "MA-rootdevice",
"deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 22,
"profileId": 259,
"label": "MA-rootdevice",
"name": "MA-rootdevice"
"name": "MA-rootdevice",
"deviceTypeOrder": 0
}
],
"deviceVersions": [
Expand Down Expand Up @@ -1027,147 +1029,49 @@
"code": 41,
"mfgCode": null,
"define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER",
"side": "server",
"side": "client",
"enabled": 1,
"commands": [
{
"name": "QueryImage",
"code": 0,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isIncoming": 0,
"isEnabled": 1
},
{
"name": "QueryImageResponse",
"code": 1,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "ApplyUpdateRequest",
"code": 2,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isIncoming": 0,
"isEnabled": 1
},
{
"name": "ApplyUpdateResponse",
"code": 3,
"mfgCode": null,
"source": "server",
"isIncoming": 0,
"isIncoming": 1,
"isEnabled": 1
},
{
"name": "NotifyUpdateApplied",
"code": 4,
"mfgCode": null,
"source": "client",
"isIncoming": 1,
"isIncoming": 0,
"isEnabled": 1
}
],
"attributes": [
{
"name": "GeneratedCommandList",
"code": 65528,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AcceptedCommandList",
"code": 65529,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "EventList",
"code": 65530,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "AttributeList",
"code": 65531,
"mfgCode": null,
"side": "server",
"type": "array",
"included": 1,
"storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": null,
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "FeatureMap",
"code": 65532,
"mfgCode": null,
"side": "server",
"type": "bitmap32",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "0",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
},
{
"name": "ClusterRevision",
"code": 65533,
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
"defaultValue": "1",
"reportable": 1,
"minInterval": 1,
"maxInterval": 65534,
"reportableChange": 0
}
]
},
{
Expand Down Expand Up @@ -3149,14 +3053,16 @@
"code": 112,
"profileId": 259,
"label": "MA-refrigerator",
"name": "MA-refrigerator"
"name": "MA-refrigerator",
"deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 112,
"profileId": 259,
"label": "MA-refrigerator",
"name": "MA-refrigerator"
"name": "MA-refrigerator",
"deviceTypeOrder": 0
}
],
"deviceVersions": [
Expand Down Expand Up @@ -3642,14 +3548,16 @@
"code": 113,
"profileId": 259,
"label": "MA-temperature-controlled-cabinet",
"name": "MA-temperature-controlled-cabinet"
"name": "MA-temperature-controlled-cabinet",
"deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 113,
"profileId": 259,
"label": "MA-temperature-controlled-cabinet",
"name": "MA-temperature-controlled-cabinet"
"name": "MA-temperature-controlled-cabinet",
"deviceTypeOrder": 0
}
],
"deviceVersions": [
Expand Down Expand Up @@ -3989,14 +3897,16 @@
"code": 113,
"profileId": 259,
"label": "MA-temperature-controlled-cabinet",
"name": "MA-temperature-controlled-cabinet"
"name": "MA-temperature-controlled-cabinet",
"deviceTypeOrder": 0
},
"deviceTypes": [
{
"code": 113,
"profileId": 259,
"label": "MA-temperature-controlled-cabinet",
"name": "MA-temperature-controlled-cabinet"
"name": "MA-temperature-controlled-cabinet",
"deviceTypeOrder": 0
}
],
"deviceVersions": [
Expand Down
16 changes: 1 addition & 15 deletions examples/refrigerator-app/silabs/data_model/refrigerator-wifi-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1553,6 +1553,7 @@ cluster RefrigeratorAlarm = 87 {
endpoint 0 {
device type ma_rootdevice = 22, version 1;

binding cluster OtaSoftwareUpdateProvider;

server cluster Identify {
ram attribute identifyTime default = 0x0;
Expand Down Expand Up @@ -1628,21 +1629,6 @@ endpoint 0 {
ram attribute clusterRevision default = 3;
}

server cluster OtaSoftwareUpdateProvider {
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
callback attribute attributeList;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 1;

handle command QueryImage;
handle command QueryImageResponse;
handle command ApplyUpdateRequest;
handle command ApplyUpdateResponse;
handle command NotifyUpdateApplied;
}

server cluster OtaSoftwareUpdateRequestor {
callback attribute defaultOTAProviders;
ram attribute updatePossible default = true;
Expand Down
Loading

0 comments on commit 061cd3b

Please sign in to comment.