Skip to content

Commit 9fc8882

Browse files
hastyhasty
authored
Merge branch 'master' into granbery/preset_atomic_write_fabric_index
2 parents c09f01e + 7d9a332 commit 9fc8882

File tree

108 files changed

+1060
-755
lines changed

Some content is hidden

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

108 files changed

+1060
-755
lines changed

‎build/config/compiler/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ config("libfuzzer_fuzzing") {
489489

490490
config("oss_fuzz") {
491491
cflags = string_split(getenv("CFLAGS"))
492+
cflags_cc = string_split(getenv("CXXFLAGS"))
492493
ldflags = string_split(getenv("CXXFLAGS"))
493494
ldflags += [ getenv("LIB_FUZZING_ENGINE") ]
494495
}

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.matter

+10-7
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,16 @@ enum PositionTag : enum8 {
194194
kMiddle = 4;
195195
kRow = 5;
196196
kColumn = 6;
197-
kUnder = 7;
198-
kNextTo = 8;
199-
kAround = 9;
200-
kOn = 10;
201-
kAbove = 11;
202-
kFrontOf = 12;
203-
kBehind = 13;
197+
}
198+
199+
enum RelativePositionTag : enum8 {
200+
kUnder = 0;
201+
kNextTo = 1;
202+
kAround = 2;
203+
kOn = 3;
204+
kAbove = 4;
205+
kFrontOf = 5;
206+
kBehind = 6;
204207
}
205208

206209
enum TestGlobalEnum : enum8 {

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter

+10-7
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,16 @@ enum PositionTag : enum8 {
194194
kMiddle = 4;
195195
kRow = 5;
196196
kColumn = 6;
197-
kUnder = 7;
198-
kNextTo = 8;
199-
kAround = 9;
200-
kOn = 10;
201-
kAbove = 11;
202-
kFrontOf = 12;
203-
kBehind = 13;
197+
}
198+
199+
enum RelativePositionTag : enum8 {
200+
kUnder = 0;
201+
kNextTo = 1;
202+
kAround = 2;
203+
kOn = 3;
204+
kAbove = 4;
205+
kFrontOf = 5;
206+
kBehind = 6;
204207
}
205208

206209
enum TestGlobalEnum : enum8 {

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

+10-7
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,16 @@ enum PositionTag : enum8 {
194194
kMiddle = 4;
195195
kRow = 5;
196196
kColumn = 6;
197-
kUnder = 7;
198-
kNextTo = 8;
199-
kAround = 9;
200-
kOn = 10;
201-
kAbove = 11;
202-
kFrontOf = 12;
203-
kBehind = 13;
197+
}
198+
199+
enum RelativePositionTag : enum8 {
200+
kUnder = 0;
201+
kNextTo = 1;
202+
kAround = 2;
203+
kOn = 3;
204+
kAbove = 4;
205+
kFrontOf = 5;
206+
kBehind = 6;
204207
}
205208

206209
enum TestGlobalEnum : enum8 {

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

+10-7
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,16 @@ enum PositionTag : enum8 {
194194
kMiddle = 4;
195195
kRow = 5;
196196
kColumn = 6;
197-
kUnder = 7;
198-
kNextTo = 8;
199-
kAround = 9;
200-
kOn = 10;
201-
kAbove = 11;
202-
kFrontOf = 12;
203-
kBehind = 13;
197+
}
198+
199+
enum RelativePositionTag : enum8 {
200+
kUnder = 0;
201+
kNextTo = 1;
202+
kAround = 2;
203+
kOn = 3;
204+
kAbove = 4;
205+
kFrontOf = 5;
206+
kBehind = 6;
204207
}
205208

206209
enum TestGlobalEnum : enum8 {

‎examples/bridge-app/bridge-common/bridge-app.matter

+10-7
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,16 @@ enum PositionTag : enum8 {
194194
kMiddle = 4;
195195
kRow = 5;
196196
kColumn = 6;
197-
kUnder = 7;
198-
kNextTo = 8;
199-
kAround = 9;
200-
kOn = 10;
201-
kAbove = 11;
202-
kFrontOf = 12;
203-
kBehind = 13;
197+
}
198+
199+
enum RelativePositionTag : enum8 {
200+
kUnder = 0;
201+
kNextTo = 1;
202+
kAround = 2;
203+
kOn = 3;
204+
kAbove = 4;
205+
kFrontOf = 5;
206+
kBehind = 6;
204207
}
205208

206209
enum TestGlobalEnum : enum8 {

‎examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter

+10-7
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,16 @@ enum PositionTag : enum8 {
194194
kMiddle = 4;
195195
kRow = 5;
196196
kColumn = 6;
197-
kUnder = 7;
198-
kNextTo = 8;
199-
kAround = 9;
200-
kOn = 10;
201-
kAbove = 11;
202-
kFrontOf = 12;
203-
kBehind = 13;
197+
}
198+
199+
enum RelativePositionTag : enum8 {
200+
kUnder = 0;
201+
kNextTo = 1;
202+
kAround = 2;
203+
kOn = 3;
204+
kAbove = 4;
205+
kFrontOf = 5;
206+
kBehind = 6;
204207
}
205208

206209
enum TestGlobalEnum : enum8 {

‎examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter

+10-7
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,16 @@ enum PositionTag : enum8 {
194194
kMiddle = 4;
195195
kRow = 5;
196196
kColumn = 6;
197-
kUnder = 7;
198-
kNextTo = 8;
199-
kAround = 9;
200-
kOn = 10;
201-
kAbove = 11;
202-
kFrontOf = 12;
203-
kBehind = 13;
197+
}
198+
199+
enum RelativePositionTag : enum8 {
200+
kUnder = 0;
201+
kNextTo = 1;
202+
kAround = 2;
203+
kOn = 3;
204+
kAbove = 4;
205+
kFrontOf = 5;
206+
kBehind = 6;
204207
}
205208

206209
enum TestGlobalEnum : enum8 {

‎examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter

+10-7
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,16 @@ enum PositionTag : enum8 {
194194
kMiddle = 4;
195195
kRow = 5;
196196
kColumn = 6;
197-
kUnder = 7;
198-
kNextTo = 8;
199-
kAround = 9;
200-
kOn = 10;
201-
kAbove = 11;
202-
kFrontOf = 12;
203-
kBehind = 13;
197+
}
198+
199+
enum RelativePositionTag : enum8 {
200+
kUnder = 0;
201+
kNextTo = 1;
202+
kAround = 2;
203+
kOn = 3;
204+
kAbove = 4;
205+
kFrontOf = 5;
206+
kBehind = 6;
204207
}
205208

206209
enum TestGlobalEnum : enum8 {

‎examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter

+10-7
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,16 @@ enum PositionTag : enum8 {
194194
kMiddle = 4;
195195
kRow = 5;
196196
kColumn = 6;
197-
kUnder = 7;
198-
kNextTo = 8;
199-
kAround = 9;
200-
kOn = 10;
201-
kAbove = 11;
202-
kFrontOf = 12;
203-
kBehind = 13;
197+
}
198+
199+
enum RelativePositionTag : enum8 {
200+
kUnder = 0;
201+
kNextTo = 1;
202+
kAround = 2;
203+
kOn = 3;
204+
kAbove = 4;
205+
kFrontOf = 5;
206+
kBehind = 6;
204207
}
205208

206209
enum TestGlobalEnum : enum8 {

‎examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter

+10-7
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,16 @@ enum PositionTag : enum8 {
194194
kMiddle = 4;
195195
kRow = 5;
196196
kColumn = 6;
197-
kUnder = 7;
198-
kNextTo = 8;
199-
kAround = 9;
200-
kOn = 10;
201-
kAbove = 11;
202-
kFrontOf = 12;
203-
kBehind = 13;
197+
}
198+
199+
enum RelativePositionTag : enum8 {
200+
kUnder = 0;
201+
kNextTo = 1;
202+
kAround = 2;
203+
kOn = 3;
204+
kAbove = 4;
205+
kFrontOf = 5;
206+
kBehind = 6;
204207
}
205208

206209
enum TestGlobalEnum : enum8 {

‎examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter

+10-7
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,16 @@ enum PositionTag : enum8 {
194194
kMiddle = 4;
195195
kRow = 5;
196196
kColumn = 6;
197-
kUnder = 7;
198-
kNextTo = 8;
199-
kAround = 9;
200-
kOn = 10;
201-
kAbove = 11;
202-
kFrontOf = 12;
203-
kBehind = 13;
197+
}
198+
199+
enum RelativePositionTag : enum8 {
200+
kUnder = 0;
201+
kNextTo = 1;
202+
kAround = 2;
203+
kOn = 3;
204+
kAbove = 4;
205+
kFrontOf = 5;
206+
kBehind = 6;
204207
}
205208

206209
enum TestGlobalEnum : enum8 {

‎examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter

+10-7
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,16 @@ enum PositionTag : enum8 {
194194
kMiddle = 4;
195195
kRow = 5;
196196
kColumn = 6;
197-
kUnder = 7;
198-
kNextTo = 8;
199-
kAround = 9;
200-
kOn = 10;
201-
kAbove = 11;
202-
kFrontOf = 12;
203-
kBehind = 13;
197+
}
198+
199+
enum RelativePositionTag : enum8 {
200+
kUnder = 0;
201+
kNextTo = 1;
202+
kAround = 2;
203+
kOn = 3;
204+
kAbove = 4;
205+
kFrontOf = 5;
206+
kBehind = 6;
204207
}
205208

206209
enum TestGlobalEnum : enum8 {

‎examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter

+10-7
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,16 @@ enum PositionTag : enum8 {
194194
kMiddle = 4;
195195
kRow = 5;
196196
kColumn = 6;
197-
kUnder = 7;
198-
kNextTo = 8;
199-
kAround = 9;
200-
kOn = 10;
201-
kAbove = 11;
202-
kFrontOf = 12;
203-
kBehind = 13;
197+
}
198+
199+
enum RelativePositionTag : enum8 {
200+
kUnder = 0;
201+
kNextTo = 1;
202+
kAround = 2;
203+
kOn = 3;
204+
kAbove = 4;
205+
kFrontOf = 5;
206+
kBehind = 6;
204207
}
205208

206209
enum TestGlobalEnum : enum8 {

‎examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter

+10-7
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,16 @@ enum PositionTag : enum8 {
194194
kMiddle = 4;
195195
kRow = 5;
196196
kColumn = 6;
197-
kUnder = 7;
198-
kNextTo = 8;
199-
kAround = 9;
200-
kOn = 10;
201-
kAbove = 11;
202-
kFrontOf = 12;
203-
kBehind = 13;
197+
}
198+
199+
enum RelativePositionTag : enum8 {
200+
kUnder = 0;
201+
kNextTo = 1;
202+
kAround = 2;
203+
kOn = 3;
204+
kAbove = 4;
205+
kFrontOf = 5;
206+
kBehind = 6;
204207
}
205208

206209
enum TestGlobalEnum : enum8 {

‎examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter

+10-7
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,16 @@ enum PositionTag : enum8 {
194194
kMiddle = 4;
195195
kRow = 5;
196196
kColumn = 6;
197-
kUnder = 7;
198-
kNextTo = 8;
199-
kAround = 9;
200-
kOn = 10;
201-
kAbove = 11;
202-
kFrontOf = 12;
203-
kBehind = 13;
197+
}
198+
199+
enum RelativePositionTag : enum8 {
200+
kUnder = 0;
201+
kNextTo = 1;
202+
kAround = 2;
203+
kOn = 3;
204+
kAbove = 4;
205+
kFrontOf = 5;
206+
kBehind = 6;
204207
}
205208

206209
enum TestGlobalEnum : enum8 {

‎examples/chef/devices/rootnode_dishwasher_cc105034fe.matter

+10-7
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,16 @@ enum PositionTag : enum8 {
194194
kMiddle = 4;
195195
kRow = 5;
196196
kColumn = 6;
197-
kUnder = 7;
198-
kNextTo = 8;
199-
kAround = 9;
200-
kOn = 10;
201-
kAbove = 11;
202-
kFrontOf = 12;
203-
kBehind = 13;
197+
}
198+
199+
enum RelativePositionTag : enum8 {
200+
kUnder = 0;
201+
kNextTo = 1;
202+
kAround = 2;
203+
kOn = 3;
204+
kAbove = 4;
205+
kFrontOf = 5;
206+
kBehind = 6;
204207
}
205208

206209
enum TestGlobalEnum : enum8 {

0 commit comments

Comments
 (0)