Merge branch 'master' of github.com:project-chip/connectedhomeip into…

… add_presets_to_Sdk # Conflicts: # examples/air-purifier-app/air-purifier-common/air-purifier-app.matter # examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter # examples/all-clusters-app/all-clusters-common/all-clusters-app.matter # examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter # examples/bridge-app/bridge-common/bridge-app.matter # examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter # examples/chef/devices/rootnode_airpurifier_73a6fe2651.matter # examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.matter # examples/chef/devices/rootnode_airqualitysensor_e63187f6c9.matter # examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter # examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter # examples/chef/devices/rootnode_contactsensor_27f76aeaf5.matter # examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter # examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter # examples/chef/devices/rootnode_dimmablepluginunit_f8a9a0b9d4.matter # examples/chef/devices/rootnode_dishwasher_cc105034fe.matter # examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter # examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter # examples/chef/devices/rootnode_fan_7N2TobIlOX.matter # examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter # examples/chef/devices/rootnode_genericswitch_2dfff6e516.matter # examples/chef/devices/rootnode_genericswitch_9866e35d0b.matter # examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter # examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter # examples/chef/devices/rootnode_laundrywasher_fb10d238c8.matter # examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter # examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter # examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter # examples/chef/devices/rootnode_onofflight_samplemei.matter # examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter # examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter # examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter # examples/chef/devices/rootnode_pump_5f904818cc.matter # examples/chef/devices/rootnode_pump_a811bb33a0.matter # examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.matter # examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.matter # examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter # examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.matter # examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter # examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter # examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter # examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter # examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter # examples/contact-sensor-app/nxp/zap-lit/contact-sensor-app.matter # examples/contact-sensor-app/nxp/zap-sit/contact-sensor-app.matter # examples/dishwasher-app/dishwasher-common/dishwasher-app.matter # examples/energy-management-app/energy-management-common/energy-management-app.matter # examples/fabric-bridge-app/fabric-bridge-common/fabric-bridge-app.matter # examples/laundry-washer-app/nxp/zap/laundry-washer-app.matter # examples/light-switch-app/light-switch-common/light-switch-app.matter # examples/light-switch-app/qpg/zap/switch.matter # examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter # examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter # examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter # examples/lighting-app/lighting-common/lighting-app.matter # examples/lighting-app/nxp/zap/lighting-on-off.matter # examples/lighting-app/qpg/zap/light.matter # examples/lighting-app/silabs/data_model/lighting-thread-app.matter # examples/lighting-app/silabs/data_model/lighting-wifi-app.matter # examples/lit-icd-app/lit-icd-common/lit-icd-server-app.matter # examples/lock-app/lock-common/lock-app.matter # examples/lock-app/nxp/zap/lock-app.matter # examples/lock-app/qpg/zap/lock.matter # examples/log-source-app/log-source-common/log-source-app.matter # examples/microwave-oven-app/microwave-oven-common/microwave-oven-app.matter # examples/network-manager-app/network-manager-common/network-manager-app.matter # examples/ota-provider-app/ota-provider-common/ota-provider-app.matter # examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter # examples/placeholder/linux/apps/app1/config.matter # examples/placeholder/linux/apps/app2/config.matter # examples/pump-app/pump-common/pump-app.matter # examples/pump-app/silabs/data_model/pump-thread-app.matter # examples/pump-app/silabs/data_model/pump-wifi-app.matter # examples/pump-controller-app/pump-controller-common/pump-controller-app.matter # examples/refrigerator-app/refrigerator-common/refrigerator-app.matter # examples/rvc-app/rvc-common/rvc-app.matter # examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter # examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter # examples/thermostat/nxp/zap/thermostat_matter_thread.matter # examples/thermostat/nxp/zap/thermostat_matter_wifi.matter # examples/thermostat/qpg/zap/thermostaticRadiatorValve.matter # examples/thermostat/thermostat-common/thermostat.matter # examples/tv-app/tv-common/tv-app.matter # examples/tv-casting-app/tv-casting-common/tv-casting-app.matter # examples/virtual-device-app/virtual-device-common/virtual-device-app.matter # examples/window-app/common/window-app.matter # src/controller/data_model/controller-clusters.matter # src/controller/python/chip/clusters/Objects.py # src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h # src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h # src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm # zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h # zzz_generated/app-common/app-common/zap-generated/cluster-enums.h # zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp # zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
project-chip · Aug 4, 2024 · 627e3f6 · 627e3f6
2 parents ed59a01 + 44afdd2
commit 627e3f6
Show file tree

Hide file tree

Showing 179 changed files with 20,565 additions and 2,517 deletions.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -119,6 +119,15 @@ test driver:
       - src/test_driver/*
       - src/test_driver/**/*
 
+# Cert tests touched: add current milestone delta-tracking label.
+# TODO: Change after Aug 15, 2024
+matter-1.4-te2-script-change:
+  - changed-files:
+    - any-glob-to-any-file:
+      - src/python_testing/*
+      - src/python_testing/**/*
+      - src/app/tests/suites/certification/*
+
 ############################################################
 #  Source Code
 ############################################################

diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
@@ -75,7 +75,12 @@ jobs:
         name: Tizen
 
         runs-on: ubuntu-latest
-        if: github.actor != 'restyled-io[bot]'
+        # NOTE: job temporarely disabled as it seems flaky. The flake does not result in usable
+        #       logs so the current theory is that we run out of space. This is unusual as
+        #       larger docker images succeed at bootstrap, however it needs more investigation
+        #       to detect an exact/real root cause.
+        if: false
+        # if: github.actor != 'restyled-io[bot]'
 
         container:
             image: ghcr.io/project-chip/chip-build-tizen-qemu:54

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -513,6 +513,7 @@ jobs:
                   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'
                   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'
                   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'
+                  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'
                   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'
                   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'
                   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'

diff --git a/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter b/examples/air-purifier-app/air-purifier-common/air-purifier-app.matter
@@ -1,12 +1,208 @@
 // This IDL was generated automatically by ZAP.
 // It is for view/code review purposes only.
 
+enum AreaTypeTag : enum8 {
+  kAisle = 0;
+  kAttic = 1;
+  kBackDoor = 2;
+  kBackYard = 3;
+  kBalcony = 4;
+  kBallroom = 5;
+  kBathroom = 6;
+  kBedroom = 7;
+  kBorder = 8;
+  kBoxroom = 9;
+  kBreakfastRoom = 10;
+  kCarport = 11;
+  kCellar = 12;
+  kCloakroom = 13;
+  kCloset = 14;
+  kConservatory = 15;
+  kCorridor = 16;
+  kCraftRoom = 17;
+  kCupboard = 18;
+  kDeck = 19;
+  kDen = 20;
+  kDining = 21;
+  kDrawingRoom = 22;
+  kDressingRoom = 23;
+  kDriveway = 24;
+  kElevator = 25;
+  kEnsuite = 26;
+  kEntrance = 27;
+  kEntryway = 28;
+  kFamilyRoom = 29;
+  kFoyer = 30;
+  kFrontDoor = 31;
+  kFrontYard = 32;
+  kGameRoom = 33;
+  kGarage = 34;
+  kGarageDoor = 35;
+  kGarden = 36;
+  kGardenDoor = 37;
+  kGuestBathroom = 38;
+  kGuestBedroom = 39;
+  kGuestRestroom = 40;
+  kGuestRoom = 41;
+  kGym = 42;
+  kHallway = 43;
+  kHearthRoom = 44;
+  kKidsRoom = 45;
+  kKidsBedroom = 46;
+  kKitchen = 47;
+  kLarder = 48;
+  kLaundryRoom = 49;
+  kLawn = 50;
+  kLibrary = 51;
+  kLivingRoom = 52;
+  kLounge = 53;
+  kMediaTVRoom = 54;
+  kMudRoom = 55;
+  kMusicRoom = 56;
+  kNursery = 57;
+  kOffice = 58;
+  kOutdoorKitchen = 59;
+  kOutside = 60;
+  kPantry = 61;
+  kParkingLot = 62;
+  kParlor = 63;
+  kPatio = 64;
+  kPlayRoom = 65;
+  kPoolRoom = 66;
+  kPorch = 67;
+  kPrimaryBathroom = 68;
+  kPrimaryBedroom = 69;
+  kRamp = 70;
+  kReceptionRoom = 71;
+  kRecreationRoom = 72;
+  kRestroom = 73;
+  kRoof = 74;
+  kSauna = 75;
+  kScullery = 76;
+  kSewingRoom = 77;
+  kShed = 78;
+  kSideDoor = 79;
+  kSideYard = 80;
+  kSittingRoom = 81;
+  kSnug = 82;
+  kSpa = 83;
+  kStaircase = 84;
+  kSteamRoom = 85;
+  kStorageRoom = 86;
+  kStudio = 87;
+  kStudy = 88;
+  kSunRoom = 89;
+  kSwimmingPool = 90;
+  kTerrace = 91;
+  kUtilityRoom = 92;
+  kWard = 93;
+  kWorkshop = 94;
+}
+
 enum AtomicRequestTypeEnum : enum8 {
   kBeginWrite = 0;
   kCommitWrite = 1;
   kRollbackWrite = 2;
 }
 
+enum FloorSurfaceTag : enum8 {
+  kCarpet = 0;
+  kCeramic = 1;
+  kConcrete = 2;
+  kCork = 3;
+  kDeepCarpet = 4;
+  kDirt = 5;
+  kEngineeredWood = 6;
+  kGlass = 7;
+  kGrass = 8;
+  kHardwood = 9;
+  kLaminate = 10;
+  kLinoleum = 11;
+  kMat = 12;
+  kMetal = 13;
+  kPlastic = 14;
+  kPolishedConcrete = 15;
+  kRubber = 16;
+  kRug = 17;
+  kSand = 18;
+  kStone = 19;
+  kTatami = 20;
+  kTerrazzo = 21;
+  kTile = 22;
+  kVinyl = 23;
+}
+
+enum LandmarkTag : enum8 {
+  kAirConditioner = 0;
+  kAirPurifier = 1;
+  kBackDoor = 2;
+  kBarStool = 3;
+  kBathMat = 4;
+  kBathtub = 5;
+  kBed = 6;
+  kBookshelf = 7;
+  kChair = 8;
+  kChristmasTree = 9;
+  kCoatRack = 10;
+  kCoffeeTable = 11;
+  kCookingRange = 12;
+  kCouch = 13;
+  kCountertop = 14;
+  kCradle = 15;
+  kCrib = 16;
+  kDesk = 17;
+  kDiningTable = 18;
+  kDishwasher = 19;
+  kDoor = 20;
+  kDresser = 21;
+  kLaundryDryer = 22;
+  kFan = 23;
+  kFireplace = 24;
+  kFreezer = 25;
+  kFrontDoor = 26;
+  kHighChair = 27;
+  kKitchenIsland = 28;
+  kLamp = 29;
+  kLitterBox = 30;
+  kMirror = 31;
+  kNightstand = 32;
+  kOven = 33;
+  kPetBed = 34;
+  kPetBowl = 35;
+  kPetCrate = 36;
+  kRefrigerator = 37;
+  kScratchingPost = 38;
+  kShoeRack = 39;
+  kShower = 40;
+  kSideDoor = 41;
+  kSink = 42;
+  kSofa = 43;
+  kStove = 44;
+  kTable = 45;
+  kToilet = 46;
+  kTrashCan = 47;
+  kLaundryWasher = 48;
+  kWindow = 49;
+  kWineCooler = 50;
+}
+
+enum PositionTag : enum8 {
+  kLeft = 0;
+  kRight = 1;
+  kTop = 2;
+  kBottom = 3;
+  kMiddle = 4;
+  kRow = 5;
+  kColumn = 6;
+  kUnder = 7;
+  kNextTo = 8;
+  kAround = 9;
+  kOn = 10;
+  kAbove = 11;
+  kFrontOf = 12;
+  kBehind = 13;
+}
+
 enum TestGlobalEnum : enum8 {
   kSomeValue = 0;
   kSomeOtherValue = 1;
@@ -24,6 +220,12 @@ struct TestGlobalStruct {
   optional nullable TestGlobalEnum myEnum = 2;
 }
 
+struct LocationDescriptorStruct {
+  char_string<128> locationName = 0;
+  nullable int16s floorNumber = 1;
+  nullable AreaTypeTag areaType = 2;
+}
+
 struct AtomicAttributeStatusStruct {
   attrib_id attributeID = 0;
   status statusCode = 1;