Skip to content

Commit 6af7028

Browse files
authored
Merge branch 'master' into esp32_use_heap_for_pool
2 parents ec0f488 + bbef51a commit 6af7028

File tree

191 files changed

+21333
-3135
lines changed

Some content is hidden

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

191 files changed

+21333
-3135
lines changed

.github/labeler.yml

+9
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,15 @@ test driver:
119119
- src/test_driver/*
120120
- src/test_driver/**/*
121121

122+
# Cert tests touched: add current milestone delta-tracking label.
123+
# TODO: Change after Aug 15, 2024
124+
matter-1.4-te2-script-change:
125+
- changed-files:
126+
- any-glob-to-any-file:
127+
- src/python_testing/*
128+
- src/python_testing/**/*
129+
- src/app/tests/suites/certification/*
130+
122131
############################################################
123132
# Source Code
124133
############################################################

.github/workflows/qemu.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,12 @@ jobs:
7575
name: Tizen
7676

7777
runs-on: ubuntu-latest
78-
if: github.actor != 'restyled-io[bot]'
78+
# NOTE: job temporarely disabled as it seems flaky. The flake does not result in usable
79+
# logs so the current theory is that we run out of space. This is unusual as
80+
# larger docker images succeed at bootstrap, however it needs more investigation
81+
# to detect an exact/real root cause.
82+
if: false
83+
# if: github.actor != 'restyled-io[bot]'
7984

8085
container:
8186
image: ghcr.io/project-chip/chip-build-tizen-qemu:54

.github/workflows/tests.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,7 @@ jobs:
511511
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_AccessChecker.py'
512512
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_CC_2_2.py'
513513
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_CC_10_1.py'
514+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_CADMIN_1_9.py'
514515
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_CGEN_2_4.py'
515516
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_CNET_1_4.py'
516517
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_DA_1_2.py'
@@ -548,6 +549,7 @@ jobs:
548549
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_FAN_3_5.py'
549550
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_ICDM_2_1.py'
550551
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_ICDM_3_1.py'
552+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_ICDM_3_3.py'
551553
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_ICDManagementCluster.py'
552554
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_IDM_1_2.py'
553555
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_IDM_1_4.py'

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

+202
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,202 @@
11
// This IDL was generated automatically by ZAP.
22
// It is for view/code review purposes only.
33

4+
enum AreaTypeTag : enum8 {
5+
kAisle = 0;
6+
kAttic = 1;
7+
kBackDoor = 2;
8+
kBackYard = 3;
9+
kBalcony = 4;
10+
kBallroom = 5;
11+
kBathroom = 6;
12+
kBedroom = 7;
13+
kBorder = 8;
14+
kBoxroom = 9;
15+
kBreakfastRoom = 10;
16+
kCarport = 11;
17+
kCellar = 12;
18+
kCloakroom = 13;
19+
kCloset = 14;
20+
kConservatory = 15;
21+
kCorridor = 16;
22+
kCraftRoom = 17;
23+
kCupboard = 18;
24+
kDeck = 19;
25+
kDen = 20;
26+
kDining = 21;
27+
kDrawingRoom = 22;
28+
kDressingRoom = 23;
29+
kDriveway = 24;
30+
kElevator = 25;
31+
kEnsuite = 26;
32+
kEntrance = 27;
33+
kEntryway = 28;
34+
kFamilyRoom = 29;
35+
kFoyer = 30;
36+
kFrontDoor = 31;
37+
kFrontYard = 32;
38+
kGameRoom = 33;
39+
kGarage = 34;
40+
kGarageDoor = 35;
41+
kGarden = 36;
42+
kGardenDoor = 37;
43+
kGuestBathroom = 38;
44+
kGuestBedroom = 39;
45+
kGuestRestroom = 40;
46+
kGuestRoom = 41;
47+
kGym = 42;
48+
kHallway = 43;
49+
kHearthRoom = 44;
50+
kKidsRoom = 45;
51+
kKidsBedroom = 46;
52+
kKitchen = 47;
53+
kLarder = 48;
54+
kLaundryRoom = 49;
55+
kLawn = 50;
56+
kLibrary = 51;
57+
kLivingRoom = 52;
58+
kLounge = 53;
59+
kMediaTVRoom = 54;
60+
kMudRoom = 55;
61+
kMusicRoom = 56;
62+
kNursery = 57;
63+
kOffice = 58;
64+
kOutdoorKitchen = 59;
65+
kOutside = 60;
66+
kPantry = 61;
67+
kParkingLot = 62;
68+
kParlor = 63;
69+
kPatio = 64;
70+
kPlayRoom = 65;
71+
kPoolRoom = 66;
72+
kPorch = 67;
73+
kPrimaryBathroom = 68;
74+
kPrimaryBedroom = 69;
75+
kRamp = 70;
76+
kReceptionRoom = 71;
77+
kRecreationRoom = 72;
78+
kRestroom = 73;
79+
kRoof = 74;
80+
kSauna = 75;
81+
kScullery = 76;
82+
kSewingRoom = 77;
83+
kShed = 78;
84+
kSideDoor = 79;
85+
kSideYard = 80;
86+
kSittingRoom = 81;
87+
kSnug = 82;
88+
kSpa = 83;
89+
kStaircase = 84;
90+
kSteamRoom = 85;
91+
kStorageRoom = 86;
92+
kStudio = 87;
93+
kStudy = 88;
94+
kSunRoom = 89;
95+
kSwimmingPool = 90;
96+
kTerrace = 91;
97+
kUtilityRoom = 92;
98+
kWard = 93;
99+
kWorkshop = 94;
100+
}
101+
102+
enum FloorSurfaceTag : enum8 {
103+
kCarpet = 0;
104+
kCeramic = 1;
105+
kConcrete = 2;
106+
kCork = 3;
107+
kDeepCarpet = 4;
108+
kDirt = 5;
109+
kEngineeredWood = 6;
110+
kGlass = 7;
111+
kGrass = 8;
112+
kHardwood = 9;
113+
kLaminate = 10;
114+
kLinoleum = 11;
115+
kMat = 12;
116+
kMetal = 13;
117+
kPlastic = 14;
118+
kPolishedConcrete = 15;
119+
kRubber = 16;
120+
kRug = 17;
121+
kSand = 18;
122+
kStone = 19;
123+
kTatami = 20;
124+
kTerrazzo = 21;
125+
kTile = 22;
126+
kVinyl = 23;
127+
}
128+
129+
enum LandmarkTag : enum8 {
130+
kAirConditioner = 0;
131+
kAirPurifier = 1;
132+
kBackDoor = 2;
133+
kBarStool = 3;
134+
kBathMat = 4;
135+
kBathtub = 5;
136+
kBed = 6;
137+
kBookshelf = 7;
138+
kChair = 8;
139+
kChristmasTree = 9;
140+
kCoatRack = 10;
141+
kCoffeeTable = 11;
142+
kCookingRange = 12;
143+
kCouch = 13;
144+
kCountertop = 14;
145+
kCradle = 15;
146+
kCrib = 16;
147+
kDesk = 17;
148+
kDiningTable = 18;
149+
kDishwasher = 19;
150+
kDoor = 20;
151+
kDresser = 21;
152+
kLaundryDryer = 22;
153+
kFan = 23;
154+
kFireplace = 24;
155+
kFreezer = 25;
156+
kFrontDoor = 26;
157+
kHighChair = 27;
158+
kKitchenIsland = 28;
159+
kLamp = 29;
160+
kLitterBox = 30;
161+
kMirror = 31;
162+
kNightstand = 32;
163+
kOven = 33;
164+
kPetBed = 34;
165+
kPetBowl = 35;
166+
kPetCrate = 36;
167+
kRefrigerator = 37;
168+
kScratchingPost = 38;
169+
kShoeRack = 39;
170+
kShower = 40;
171+
kSideDoor = 41;
172+
kSink = 42;
173+
kSofa = 43;
174+
kStove = 44;
175+
kTable = 45;
176+
kToilet = 46;
177+
kTrashCan = 47;
178+
kLaundryWasher = 48;
179+
kWindow = 49;
180+
kWineCooler = 50;
181+
}
182+
183+
enum PositionTag : enum8 {
184+
kLeft = 0;
185+
kRight = 1;
186+
kTop = 2;
187+
kBottom = 3;
188+
kMiddle = 4;
189+
kRow = 5;
190+
kColumn = 6;
191+
kUnder = 7;
192+
kNextTo = 8;
193+
kAround = 9;
194+
kOn = 10;
195+
kAbove = 11;
196+
kFrontOf = 12;
197+
kBehind = 13;
198+
}
199+
4200
enum TestGlobalEnum : enum8 {
5201
kSomeValue = 0;
6202
kSomeOtherValue = 1;
@@ -18,6 +214,12 @@ struct TestGlobalStruct {
18214
optional nullable TestGlobalEnum myEnum = 2;
19215
}
20216

217+
struct LocationDescriptorStruct {
218+
char_string<128> locationName = 0;
219+
nullable int16s floorNumber = 1;
220+
nullable AreaTypeTag areaType = 2;
221+
}
222+
21223
/** Attributes and commands for putting a device into Identification mode (e.g. flashing a light). */
22224
cluster Identify = 3 {
23225
revision 4;

0 commit comments

Comments
 (0)