Skip to content

Commit 30769d4

Browse files
lazarkovlazarkov
authored
Merge branch 'master' into feature/app-installation-status-report
2 parents d396f5d + fd28025 commit 30769d4

File tree

20 files changed

+77
-40
lines changed

20 files changed

+77
-40
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3334,7 +3334,7 @@ cluster DishwasherAlarm = 93 {
33343334
}
33353335

33363336
/** Attributes and commands for selecting a mode from a list of supported options. */
3337-
provisional cluster MicrowaveOvenMode = 94 {
3337+
cluster MicrowaveOvenMode = 94 {
33383338
revision 1;
33393339

33403340
enum ModeTag : enum16 {

‎examples/android/CHIPTool/app/build.gradle

-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ android {
4343
targetCompatibility JavaVersion.VERSION_1_8
4444
}
4545

46-
packagingOptions {
47-
exclude 'META-INF/main.kotlin_module'
48-
}
4946

5047
buildFeatures {
5148
viewBinding = true

‎examples/lighting-app/silabs/src/AppTask.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "LEDWidget.h"
2525

2626
#include <app/clusters/on-off-server/on-off-server.h>
27-
#include <app/clusters/scenes-server/scenes-server.h>
2827
#include <app/server/OnboardingCodesUtil.h>
2928
#include <app/server/Server.h>
3029
#include <app/util/attribute-storage.h>

‎examples/lock-app/silabs/openthread.gni

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ openthread_external_platform =
2828
sl_enable_test_event_trigger = true
2929

3030
# ICD Default configurations
31-
chip_enable_icd_server = false
31+
chip_enable_icd_server = true
3232
chip_subscription_timeout_resumption = false
3333
sl_use_subscription_syncing = true
3434

‎examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@ cluster GroupKeyManagement = 63 {
10121012
}
10131013

10141014
/** Attributes and commands for selecting a mode from a list of supported options. */
1015-
provisional cluster MicrowaveOvenMode = 94 {
1015+
cluster MicrowaveOvenMode = 94 {
10161016
revision 1;
10171017

10181018
enum ModeTag : enum16 {
@@ -1046,7 +1046,7 @@ provisional cluster MicrowaveOvenMode = 94 {
10461046
}
10471047

10481048
/** Attributes and commands for configuring the microwave oven control, and reporting cooking stats. */
1049-
provisional cluster MicrowaveOvenControl = 95 {
1049+
cluster MicrowaveOvenControl = 95 {
10501050
revision 1; // NOTE: Default/not specifically set
10511051

10521052
bitmap Feature : bitmap32 {

‎src/app/clusters/color-control-server/color-control-server.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -431,15 +431,16 @@ ColorControlServer & ColorControlServer::Instance()
431431
return instance;
432432
}
433433

434+
#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
434435
chip::scenes::SceneHandler * ColorControlServer::GetSceneHandler()
435436
{
436-
437-
#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
437+
#if CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
438438
return &sColorControlSceneHandler;
439439
#else
440440
return nullptr;
441-
#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
441+
#endif // CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
442442
}
443+
#endif // ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
443444

444445
bool ColorControlServer::HasFeature(chip::EndpointId endpoint, Feature feature)
445446
{

‎src/app/clusters/color-control-server/color-control-server.h

+8-1
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,17 @@
2020
#include <app-common/zap-generated/cluster-objects.h>
2121
#include <app/CommandHandler.h>
2222
#include <app/ConcreteCommandPath.h>
23-
#include <app/clusters/scenes-server/SceneTable.h>
2423
#include <app/util/af-types.h>
2524
#include <app/util/attribute-storage.h>
2625
#include <app/util/basic-types.h>
2726
#include <app/util/config.h>
2827
#include <platform/CHIPDeviceConfig.h>
2928
#include <protocols/interaction_model/StatusCode.h>
3029

30+
#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
31+
#include <app/clusters/scenes-server/SceneTable.h>
32+
#endif
33+
3134
/**********************************************************
3235
* Defines and Macros
3336
*********************************************************/
@@ -134,7 +137,9 @@ class ColorControlServer
134137
*********************************************************/
135138
static ColorControlServer & Instance();
136139

140+
#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
137141
chip::scenes::SceneHandler * GetSceneHandler();
142+
#endif
138143

139144
bool HasFeature(chip::EndpointId endpoint, Feature feature);
140145
chip::Protocols::InteractionModel::Status stopAllColorTransitions(chip::EndpointId endpoint);
@@ -272,7 +277,9 @@ class ColorControlServer
272277

273278
EmberEventControl eventControls[kColorControlClusterServerMaxEndpointCount];
274279

280+
#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
275281
friend class DefaultColorControlSceneHandler;
282+
#endif
276283
};
277284

278285
/**********************************************************

‎src/app/clusters/level-control/level-control.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -608,14 +608,16 @@ Status MoveToLevel(EndpointId endpointId, const Commands::MoveToLevel::Decodable
608608
INVALID_STORED_LEVEL); // Don't revert to the stored level
609609
}
610610

611+
#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
611612
chip::scenes::SceneHandler * GetSceneHandler()
612613
{
613-
#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
614+
#if CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
614615
return &sLevelControlSceneHandler;
615616
#else
616617
return nullptr;
617-
#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
618+
#endif // CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
618619
}
620+
#endif // ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
619621

620622
} // namespace LevelControlServer
621623

‎src/app/clusters/level-control/level-control.h

+6-1
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,12 @@
2828

2929
#include <app-common/zap-generated/cluster-enums.h>
3030
#include <app-common/zap-generated/cluster-objects.h>
31-
#include <app/clusters/scenes-server/SceneTable.h>
3231
#include <app/util/basic-types.h>
3332

33+
#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
34+
#include <app/clusters/scenes-server/SceneTable.h>
35+
#endif
36+
3437
/** @brief Level Control Cluster Server Post Init
3538
*
3639
* Following resolution of the Level Control state at startup for this endpoint, perform any
@@ -53,6 +56,8 @@ chip::Protocols::InteractionModel::Status
5356
MoveToLevel(chip::EndpointId endpointId,
5457
const chip::app::Clusters::LevelControl::Commands::MoveToLevel::DecodableType & commandData);
5558

59+
#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
5660
chip::scenes::SceneHandler * GetSceneHandler();
61+
#endif
5762

5863
} // namespace LevelControlServer

‎src/app/clusters/on-off-server/on-off-server.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
* limitations under the License.
1616
*/
1717

18+
#include <app/util/config.h>
19+
1820
#include "on-off-server.h"
1921

2022
#include <app-common/zap-generated/attributes/Accessors.h>
@@ -299,15 +301,16 @@ OnOffServer & OnOffServer::Instance()
299301
return instance;
300302
}
301303

304+
#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
302305
chip::scenes::SceneHandler * OnOffServer::GetSceneHandler()
303306
{
304-
305-
#if defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
307+
#if CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
306308
return &sOnOffSceneHandler;
307309
#else
308310
return nullptr;
309-
#endif // defined(MATTER_DM_PLUGIN_SCENES_MANAGEMENT) && CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
311+
#endif // CHIP_CONFIG_SCENES_USE_DEFAULT_HANDLERS
310312
}
313+
#endif // ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
311314

312315
bool OnOffServer::HasFeature(chip::EndpointId endpoint, Feature feature)
313316
{

‎src/app/clusters/on-off-server/on-off-server.h

+8-1
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,15 @@
2020
#include <app-common/zap-generated/cluster-objects.h>
2121
#include <app/CommandHandler.h>
2222
#include <app/ConcreteCommandPath.h>
23-
#include <app/clusters/scenes-server/SceneTable.h>
2423
#include <app/util/af-types.h>
2524
#include <app/util/basic-types.h>
2625
#include <platform/CHIPDeviceConfig.h>
2726
#include <protocols/interaction_model/StatusCode.h>
2827

28+
#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
29+
#include <app/clusters/scenes-server/SceneTable.h>
30+
#endif
31+
2932
/**********************************************************
3033
* Defines and Macros
3134
*********************************************************/
@@ -50,7 +53,9 @@ class OnOffServer
5053

5154
static OnOffServer & Instance();
5255

56+
#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
5357
chip::scenes::SceneHandler * GetSceneHandler();
58+
#endif
5459

5560
bool offCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath);
5661
bool onCommand(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath);
@@ -97,7 +102,9 @@ class OnOffServer
97102
static OnOffServer instance;
98103
chip::System::Clock::Timestamp nextDesiredOnWithTimedOffTimestamp;
99104

105+
#ifdef MATTER_DM_PLUGIN_SCENES_MANAGEMENT
100106
friend class DefaultOnOffSceneHandler;
107+
#endif
101108
};
102109

103110
struct OnOffEffect

‎src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ tests:
186186
187187
[1663841939.843550][13897:13897] CHIP:DL: NVS set: chip-counters/total-operational-hours = 0 (0x0)
188188
[1663841939.843617][13897:13897] CHIP:DL: Inet Layer shutdown
189-
[1663841939.843673][13897:13897] CHIP:DL: BLE shutdown
189+
[1663841939.843673][13897:13897] CHIP:DL: BLE Layer shutdown
190190
[1663841939.843727][13897:13897] CHIP:DL: System Layer shutdown
191191
[1663841939.844009][13897:13897] CHIP:TOO: Run command failure: ../../examples/chip-tool/commands/pairing/PairingCommand.cpp:151: CHIP Error 0x00000003: Incorrect state
192192
cluster: "LogCommands"

‎src/app/tests/suites/certification/Test_TC_CADMIN_1_7.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ tests:
102102
103103
[1663841939.843550][13897:13897] CHIP:DL: NVS set: chip-counters/total-operational-hours = 0 (0x0)
104104
[1663841939.843617][13897:13897] CHIP:DL: Inet Layer shutdown
105-
[1663841939.843673][13897:13897] CHIP:DL: BLE shutdown
105+
[1663841939.843673][13897:13897] CHIP:DL: BLE Layer shutdown
106106
[1663841939.843727][13897:13897] CHIP:DL: System Layer shutdown
107107
[1663841939.844009][13897:13897] CHIP:TOO: Run command failure: ../../examples/chip-tool/commands/pairing/PairingCommand.cpp:151: CHIP Error 0x00000003: Incorrect state
108108
disabled: true
@@ -161,7 +161,7 @@ tests:
161161
[1665481996.786704][4913:4913] CHIP:DL: renamed tmp file to file (/tmp/chip_counters.ini)
162162
[1665481996.786930][4913:4913] CHIP:DL: NVS set: chip-counters/total-operational-hours = 0 (0x0)
163163
[1665481996.786999][4913:4913] CHIP:DL: Inet Layer shutdown
164-
[1665481996.787065][4913:4913] CHIP:DL: BLE shutdown
164+
[1665481996.787065][4913:4913] CHIP:DL: BLE Layer shutdown
165165
[1665481996.787123][4913:4913] CHIP:DL: System Layer shutdown
166166
[1665481996.787363][4913:4913] CHIP:TOO: Run command failure: ../../commands/pairing/PairingCommand.cpp:164: CHIP Error 0x00000003: Incorrect state
167167
disabled: true
@@ -284,7 +284,7 @@ tests:
284284
285285
[1678796869.645576][648903:648903] CHIP:DL: NVS set: chip-counters/total-operational-hours = 0 (0x0)
286286
[1678796869.645584][648903:648903] CHIP:DL: Inet Layer shutdown
287-
[1678796869.645589][648903:648903] CHIP:DL: BLE shutdown
287+
[1678796869.645589][648903:648903] CHIP:DL: BLE Layer shutdown
288288
[1678796869.645596][648903:648903] CHIP:DL: System Layer shutdown
289289
[1678796869.645693][648903:648903] CHIP:TOO: Run command failure: ../../commands/pairing/PairingCommand.cpp:215: CHIP Error 0x00000003: Incorrect state
290290
disabled: true

‎src/app/tests/suites/certification/Test_TC_CADMIN_1_8.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ tests:
100100
101101
[1663842366.887733][13938:13938] CHIP:DL: NVS set: chip-counters/total-operational-hours = 0 (0x0)
102102
[1663842366.887797][13938:13938] CHIP:DL: Inet Layer shutdown
103-
[1663842366.887851][13938:13938] CHIP:DL: BLE shutdown
103+
[1663842366.887851][13938:13938] CHIP:DL: BLE Layer shutdown
104104
[1663842366.887905][13938:13938] CHIP:DL: System Layer shutdown
105105
[1663842366.888154][13938:13938] CHIP:TOO: Run command failure: ../../examples/chip-tool/commands/common/CHIPCommand.cpp:454: CHIP Error 0x00000032: Timeout
106106
disabled: true
@@ -154,7 +154,7 @@ tests:
154154
verify you got the following message in the TH_CR2(CHIP-TOOL) log
155155
156156
[1700552012.724377][27528:27528] CHIP:DL: Inet Layer shutdown
157-
[1700552012.724405][27528:27528] CHIP:DL: BLE shutdown
157+
[1700552012.724405][27528:27528] CHIP:DL: BLE Layer shutdown
158158
[1700552012.724445][27528:27528] CHIP:DL: System Layer shutdown
159159
[1700552012.725294][27528:27528] CHIP:TOO: Run command failure: ../../examples/chip-tool/commands/common/CHIPCommand.cpp:589: CHIP Error 0x00000032: Timeout
160160
disabled: true
@@ -276,7 +276,7 @@ tests:
276276
Verify you got the following message in the TH_CR3(Chip-tool) log
277277
278278
[1700552012.724377][27528:27528] CHIP:DL: Inet Layer shutdown
279-
[1700552012.724405][27528:27528] CHIP:DL: BLE shutdown
279+
[1700552012.724405][27528:27528] CHIP:DL: BLE Layer shutdown
280280
[1700552012.724445][27528:27528] CHIP:DL: System Layer shutdown
281281
[1700552012.725294][27528:27528] CHIP:TOO: Run command failure: ../../examples/chip-tool/commands/common/CHIPCommand.cpp:589: CHIP Error 0x00000032: Timeout
282282
disabled: true

‎src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ tests:
551551
[1665484807.015876][5399:5399] CHIP:DL: renamed tmp file to file (/tmp/chip_counters.ini)
552552
[1665484807.016042][5399:5399] CHIP:DL: NVS set: chip-counters/total-operational-hours = 0 (0x0)
553553
[1665484807.016108][5399:5399] CHIP:DL: Inet Layer shutdown
554-
[1665484807.016163][5399:5399] CHIP:DL: BLE shutdown
554+
[1665484807.016163][5399:5399] CHIP:DL: BLE Layer shutdown
555555
[1665484807.016215][5399:5399] CHIP:DL: System Layer shutdown
556556
[1665484807.016460][5399:5399] CHIP:TOO: Run command failure: ../../commands/pairing/PairingCommand.cpp:164: CHIP Error 0x00000003: Incorrect state
557557
cluster: "LogCommands"
@@ -589,7 +589,7 @@ tests:
589589
[1665484807.015876][5399:5399] CHIP:DL: renamed tmp file to file (/tmp/chip_counters.ini)
590590
[1665484807.016042][5399:5399] CHIP:DL: NVS set: chip-counters/total-operational-hours = 0 (0x0)
591591
[1665484807.016108][5399:5399] CHIP:DL: Inet Layer shutdown
592-
[1665484807.016163][5399:5399] CHIP:DL: BLE shutdown
592+
[1665484807.016163][5399:5399] CHIP:DL: BLE Layer shutdown
593593
[1665484807.016215][5399:5399] CHIP:DL: System Layer shutdown
594594
[1665484807.016460][5399:5399] CHIP:TOO: Run command failure: ../../commands/pairing/PairingCommand.cpp:164: CHIP Error 0x00000003: Incorrect state
595595
cluster: "LogCommands"

‎src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ limitations under the License.
1818
<domain name="CHIP"/>
1919

2020

21-
<cluster apiMaturity="provisional">
21+
<cluster>
2222
<name>Microwave Oven Control</name>
2323
<domain>Appliances</domain>
2424
<description>Attributes and commands for configuring the microwave oven control, and reporting cooking stats.</description>
@@ -47,8 +47,8 @@ limitations under the License.
4747
<attribute side="server" code="0x0003" define="MIN_POWER" type="int8u" default="10" writable="false" optional="true">MinPower</attribute>
4848
<attribute side="server" code="0x0004" define="MAX_POWER" type="int8u" default="100" writable="false" optional="true">MaxPower</attribute>
4949
<attribute side="server" code="0x0005" define="POWER_STEP" type="int8u" default="10" writable="false" optional="true">PowerStep</attribute>
50-
<attribute side="server" code="0x0006" define="SUPPORTED_WATTS" type="array" entryType="int16u" writable="false" optional="true">SupportedWatts</attribute>
51-
<attribute side="server" code="0x0007" define="SELECTED_WATT_INDEX" type="int8u" writable="false" optional="true">SelectedWattIndex</attribute>
50+
<attribute apiMaturity="provisional" side="server" code="0x0006" define="SUPPORTED_WATTS" type="array" entryType="int16u" writable="false" optional="true">SupportedWatts</attribute>
51+
<attribute apiMaturity="provisional" side="server" code="0x0007" define="SELECTED_WATT_INDEX" type="int8u" writable="false" optional="true">SelectedWattIndex</attribute>
5252
<attribute side="server" code="0x0008" define="WATT_RATING" type="int16u" writable="false" optional="true">WattRating</attribute>
5353

5454
<command source="client" code="0x00" name="SetCookingParameters" optional="false">

‎src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ limitations under the License.
2323
<item value="0x4001" name="Defrost"/>
2424
</enum>
2525

26-
<cluster apiMaturity="provisional">
26+
<cluster>
2727
<domain>General</domain>
2828
<name>Microwave Oven Mode</name>
2929
<code>0x005E</code>

‎src/controller/data_model/controller-clusters.matter

+2-2
Original file line numberDiff line numberDiff line change
@@ -3526,7 +3526,7 @@ cluster DishwasherAlarm = 93 {
35263526
}
35273527

35283528
/** Attributes and commands for selecting a mode from a list of supported options. */
3529-
provisional cluster MicrowaveOvenMode = 94 {
3529+
cluster MicrowaveOvenMode = 94 {
35303530
revision 1;
35313531

35323532
enum ModeTag : enum16 {
@@ -3560,7 +3560,7 @@ provisional cluster MicrowaveOvenMode = 94 {
35603560
}
35613561

35623562
/** Attributes and commands for configuring the microwave oven control, and reporting cooking stats. */
3563-
provisional cluster MicrowaveOvenControl = 95 {
3563+
cluster MicrowaveOvenControl = 95 {
35643564
revision 1; // NOTE: Default/not specifically set
35653565

35663566
bitmap Feature : bitmap32 {

‎src/controller/java/BUILD.gn

+19-3
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,11 @@ kotlin_library("tlv") {
262262
"src/matter/tlv/values.kt",
263263
]
264264

265-
kotlinc_flags = [ "-Xlint:deprecation" ]
265+
kotlinc_flags = [
266+
"-Xlint:deprecation",
267+
"-module-name",
268+
"com.matter.tlv",
269+
]
266270
}
267271

268272
kotlin_library("tlv_reader_test") {
@@ -323,7 +327,11 @@ kotlin_library("jsontlv") {
323327
"src/matter/jsontlv/types.kt",
324328
]
325329

326-
kotlinc_flags = [ "-Xlint:deprecation" ]
330+
kotlinc_flags = [
331+
"-Xlint:deprecation",
332+
"-module-name",
333+
"com.matter.matterjson",
334+
]
327335
}
328336

329337
kotlin_library("json_to_tlv_to_json_test") {
@@ -363,6 +371,10 @@ kotlin_library("onboarding_payload") {
363371
"src/matter/onboardingpayload/Verhoeff.kt",
364372
"src/matter/onboardingpayload/Verhoeff10.kt",
365373
]
374+
kotlinc_flags = [
375+
"-module-name",
376+
"com.matter.onboarding",
377+
]
366378
}
367379

368380
kotlin_library("onboardingpayload_manual_code_test") {
@@ -404,7 +416,11 @@ kotlin_library("chipcluster") {
404416
sources = structs_sources
405417
sources += eventstructs_sources
406418

407-
kotlinc_flags = [ "-Xlint:deprecation" ]
419+
kotlinc_flags = [
420+
"-Xlint:deprecation",
421+
"-module-name",
422+
"com.matter.chipcluster",
423+
]
408424
}
409425

410426
kotlin_library("chipcluster_test") {

0 commit comments

Comments
 (0)