Merge branch 'master' into ci-cctrl

project-chip · Oct 3, 2024 · c10fe3b · c10fe3b
2 parents 1e16e75 + cc6c773
commit c10fe3b
Show file tree

Hide file tree

Showing 32 changed files with 19,483 additions and 42 deletions.
diff --git a/examples/chef/devices/rootnode_laundrydryer_01796fe396.matter b/examples/chef/devices/rootnode_laundrydryer_01796fe396.matter
diff --git a/examples/chef/devices/rootnode_laundrydryer_01796fe396.zap b/examples/chef/devices/rootnode_laundrydryer_01796fe396.zap
diff --git a/examples/chef/sample_app_util/matter_device_types.json b/examples/chef/sample_app_util/matter_device_types.json
@@ -46,6 +46,7 @@
     "Temperature Controlled Cabinet": 113,
     "Room Air Conditioner": 114,
     "Laundry Washer": 115,
+    "Laundry Dryer": 124,
     "Robotic Vacuum Cleaner": 116,
     "Dishwasher": 117,
     "Smoke CO Alarm": 118,

diff --git a/examples/lock-app/silabs/build_for_wifi_args.gni b/examples/lock-app/silabs/build_for_wifi_args.gni
@@ -19,7 +19,7 @@ chip_enable_openthread = false
 import("${chip_root}/src/platform/silabs/wifi_args.gni")
 
 chip_enable_ota_requestor = true
-app_data_model = "${chip_root}/examples/lock-app/lock-common"
+app_data_model = "${chip_root}/examples/lock-app/silabs/data_model:silabs-lock"
 
 sl_enable_test_event_trigger = true
 

diff --git a/examples/lock-app/silabs/data_model/BUILD.gn b/examples/lock-app/silabs/data_model/BUILD.gn
@@ -0,0 +1,8 @@
+import("//build_overrides/chip.gni")
+import("${chip_root}/src/app/chip_data_model.gni")
+import("${chip_root}/src/platform/device.gni")
+
+chip_data_model("silabs-lock") {
+  zap_file = "lock-app.zap"
+  is_server = true
+}