Skip to content

Commit 47f0915

Browse files
andreilitvinandreilitvin
committed
Merge branch 'master' into move_timeout
2 parents c7d875b + fc61ca0 commit 47f0915

File tree

129 files changed

+8057
-380
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+8057
-380
lines changed

‎.github/workflows/lint.yml

-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ jobs:
100100
--known-failure app/CompatEnumNames.h \
101101
--known-failure app/data-model/ListLargeSystemExtensions.h \
102102
--known-failure app/EventHeader.h \
103-
--known-failure app/EventLoggingDelegate.h \
104-
--known-failure app/EventLogging.h \
105103
--known-failure app/EventLoggingTypes.h \
106104
--known-failure app/InteractionModelHelper.h \
107105
--known-failure app/ReadClient.h \

‎build/config/BUILDCONFIG.gn

+3-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,9 @@ if (_chip_defaults.custom_toolchain != "") {
127127
"Unsupported target_cpu: ${current_cpu}. Shall be arm for webOS")
128128
}
129129
} else {
130-
assert(false, "No toolchain specified, please specify custom_toolchain")
130+
assert(
131+
false,
132+
"No toolchain specified, please specify custom_toolchain for host_os='${host_os}', target_os='${target_os}', host_cpu='${host_cpu}', target_cpu='${target_cpu}'")
131133
}
132134

133135
set_default_toolchain(_default_toolchain)

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+48
Original file line numberDiff line numberDiff line change
@@ -4455,6 +4455,40 @@ provisional cluster EnergyEvse = 153 {
44554455
timed command ClearTargets(): DefaultSuccess = 7;
44564456
}
44574457

4458+
/** This cluster provides an interface to specify preferences for how devices should consume energy. */
4459+
provisional cluster EnergyPreference = 155 {
4460+
revision 1;
4461+
4462+
enum EnergyPriorityEnum : enum8 {
4463+
kComfort = 0;
4464+
kSpeed = 1;
4465+
kEfficiency = 2;
4466+
kWaterConsumption = 3;
4467+
}
4468+
4469+
bitmap Feature : bitmap32 {
4470+
kEnergyBalance = 0x1;
4471+
kLowPowerModeSensitivity = 0x2;
4472+
}
4473+
4474+
struct BalanceStruct {
4475+
percent step = 0;
4476+
optional char_string<64> label = 1;
4477+
}
4478+
4479+
readonly attribute optional BalanceStruct energyBalances[] = 0;
4480+
attribute optional int8u currentEnergyBalance = 1;
4481+
readonly attribute optional EnergyPriorityEnum energyPriorities[] = 2;
4482+
readonly attribute optional BalanceStruct lowPowerModeSensitivities[] = 3;
4483+
attribute optional int8u currentLowPowerModeSensitivity = 4;
4484+
readonly attribute command_id generatedCommandList[] = 65528;
4485+
readonly attribute command_id acceptedCommandList[] = 65529;
4486+
readonly attribute event_id eventList[] = 65530;
4487+
readonly attribute attrib_id attributeList[] = 65531;
4488+
readonly attribute bitmap32 featureMap = 65532;
4489+
readonly attribute int16u clusterRevision = 65533;
4490+
}
4491+
44584492
/** The Power Topology Cluster provides a mechanism for expressing how power is flowing between endpoints. */
44594493
provisional cluster PowerTopology = 156 {
44604494
revision 1;
@@ -8361,6 +8395,20 @@ endpoint 1 {
83618395
handle command ClearTargets;
83628396
}
83638397

8398+
server cluster EnergyPreference {
8399+
callback attribute energyBalances;
8400+
ram attribute currentEnergyBalance;
8401+
callback attribute energyPriorities;
8402+
callback attribute lowPowerModeSensitivities;
8403+
ram attribute currentLowPowerModeSensitivity;
8404+
callback attribute generatedCommandList;
8405+
callback attribute acceptedCommandList;
8406+
callback attribute eventList;
8407+
callback attribute attributeList;
8408+
ram attribute featureMap default = 3;
8409+
ram attribute clusterRevision default = 1;
8410+
}
8411+
83648412
server cluster PowerTopology {
83658413
callback attribute availableEndpoints;
83668414
callback attribute activeEndpoints;

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

+186
Original file line numberDiff line numberDiff line change
@@ -14692,6 +14692,192 @@
1469214692
}
1469314693
]
1469414694
},
14695+
{
14696+
"name": "Energy Preference",
14697+
"code": 155,
14698+
"mfgCode": null,
14699+
"define": "ENERGY_PREFERENCE_CLUSTER",
14700+
"side": "server",
14701+
"enabled": 1,
14702+
"attributes": [
14703+
{
14704+
"name": "EnergyBalances",
14705+
"code": 0,
14706+
"mfgCode": null,
14707+
"side": "server",
14708+
"type": "array",
14709+
"included": 1,
14710+
"storageOption": "External",
14711+
"singleton": 0,
14712+
"bounded": 0,
14713+
"defaultValue": null,
14714+
"reportable": 1,
14715+
"minInterval": 1,
14716+
"maxInterval": 65534,
14717+
"reportableChange": 0
14718+
},
14719+
{
14720+
"name": "CurrentEnergyBalance",
14721+
"code": 1,
14722+
"mfgCode": null,
14723+
"side": "server",
14724+
"type": "int8u",
14725+
"included": 1,
14726+
"storageOption": "RAM",
14727+
"singleton": 0,
14728+
"bounded": 0,
14729+
"defaultValue": "",
14730+
"reportable": 1,
14731+
"minInterval": 1,
14732+
"maxInterval": 65534,
14733+
"reportableChange": 0
14734+
},
14735+
{
14736+
"name": "EnergyPriorities",
14737+
"code": 2,
14738+
"mfgCode": null,
14739+
"side": "server",
14740+
"type": "array",
14741+
"included": 1,
14742+
"storageOption": "External",
14743+
"singleton": 0,
14744+
"bounded": 0,
14745+
"defaultValue": null,
14746+
"reportable": 1,
14747+
"minInterval": 1,
14748+
"maxInterval": 65534,
14749+
"reportableChange": 0
14750+
},
14751+
{
14752+
"name": "LowPowerModeSensitivities",
14753+
"code": 3,
14754+
"mfgCode": null,
14755+
"side": "server",
14756+
"type": "array",
14757+
"included": 1,
14758+
"storageOption": "External",
14759+
"singleton": 0,
14760+
"bounded": 0,
14761+
"defaultValue": null,
14762+
"reportable": 1,
14763+
"minInterval": 1,
14764+
"maxInterval": 65534,
14765+
"reportableChange": 0
14766+
},
14767+
{
14768+
"name": "CurrentLowPowerModeSensitivity",
14769+
"code": 4,
14770+
"mfgCode": null,
14771+
"side": "server",
14772+
"type": "int8u",
14773+
"included": 1,
14774+
"storageOption": "RAM",
14775+
"singleton": 0,
14776+
"bounded": 0,
14777+
"defaultValue": "",
14778+
"reportable": 1,
14779+
"minInterval": 1,
14780+
"maxInterval": 65534,
14781+
"reportableChange": 0
14782+
},
14783+
{
14784+
"name": "GeneratedCommandList",
14785+
"code": 65528,
14786+
"mfgCode": null,
14787+
"side": "server",
14788+
"type": "array",
14789+
"included": 1,
14790+
"storageOption": "External",
14791+
"singleton": 0,
14792+
"bounded": 0,
14793+
"defaultValue": null,
14794+
"reportable": 1,
14795+
"minInterval": 1,
14796+
"maxInterval": 65534,
14797+
"reportableChange": 0
14798+
},
14799+
{
14800+
"name": "AcceptedCommandList",
14801+
"code": 65529,
14802+
"mfgCode": null,
14803+
"side": "server",
14804+
"type": "array",
14805+
"included": 1,
14806+
"storageOption": "External",
14807+
"singleton": 0,
14808+
"bounded": 0,
14809+
"defaultValue": null,
14810+
"reportable": 1,
14811+
"minInterval": 1,
14812+
"maxInterval": 65534,
14813+
"reportableChange": 0
14814+
},
14815+
{
14816+
"name": "EventList",
14817+
"code": 65530,
14818+
"mfgCode": null,
14819+
"side": "server",
14820+
"type": "array",
14821+
"included": 1,
14822+
"storageOption": "External",
14823+
"singleton": 0,
14824+
"bounded": 0,
14825+
"defaultValue": null,
14826+
"reportable": 1,
14827+
"minInterval": 1,
14828+
"maxInterval": 65534,
14829+
"reportableChange": 0
14830+
},
14831+
{
14832+
"name": "AttributeList",
14833+
"code": 65531,
14834+
"mfgCode": null,
14835+
"side": "server",
14836+
"type": "array",
14837+
"included": 1,
14838+
"storageOption": "External",
14839+
"singleton": 0,
14840+
"bounded": 0,
14841+
"defaultValue": null,
14842+
"reportable": 1,
14843+
"minInterval": 1,
14844+
"maxInterval": 65534,
14845+
"reportableChange": 0
14846+
},
14847+
{
14848+
"name": "FeatureMap",
14849+
"code": 65532,
14850+
"mfgCode": null,
14851+
"side": "server",
14852+
"type": "bitmap32",
14853+
"included": 1,
14854+
"storageOption": "RAM",
14855+
"singleton": 0,
14856+
"bounded": 0,
14857+
"defaultValue": "3",
14858+
"reportable": 1,
14859+
"minInterval": 1,
14860+
"maxInterval": 65534,
14861+
"reportableChange": 0
14862+
},
14863+
{
14864+
"name": "ClusterRevision",
14865+
"code": 65533,
14866+
"mfgCode": null,
14867+
"side": "server",
14868+
"type": "int16u",
14869+
"included": 1,
14870+
"storageOption": "RAM",
14871+
"singleton": 0,
14872+
"bounded": 0,
14873+
"defaultValue": "1",
14874+
"reportable": 1,
14875+
"minInterval": 0,
14876+
"maxInterval": 65344,
14877+
"reportableChange": 0
14878+
}
14879+
]
14880+
},
1469514881
{
1469614882
"name": "Window Covering",
1469714883
"code": 258,

0 commit comments

Comments
 (0)