Move chef .matter files back to /chef/devices (#20142)

* Remove matter files from root zzz * Move .matter regen for chef * Update bundle for changed .matter location
project-chip · Jun 30, 2022 · d6c3519 · d6c3519
1 parent 31ddf98
commit d6c3519
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 5 deletions.
diff --git a/examples/chef/chef.py b/examples/chef/chef.py
@@ -150,10 +150,7 @@ def bundle(platform: str, device_name: str) -> None:
         flush_print(f"No bundle function for {platform}!")
         exit(1)
     flush_print(f"Copying {matter_file}")
-    src_item = os.path.join(_REPO_BASE_PATH,
-                            "zzz_generated",
-                            "chef-"+device_name,
-                            "zap-generated",
+    src_item = os.path.join(_DEVICE_FOLDER,
                             matter_file)
     dest_item = os.path.join(_CD_STAGING_DIR, matter_file)
     shutil.copy(src_item, dest_item)

diff --git a/.../rootnode_contactsensor_lFAGG1bfRO.matter → .../rootnode_contactsensor_lFAGG1bfRO.matter b/.../rootnode_contactsensor_lFAGG1bfRO.matter → .../rootnode_contactsensor_lFAGG1bfRO.matter
diff --git a/.../rootnode_dimmablelight_bCwGYSDpoe.matter → .../rootnode_dimmablelight_bCwGYSDpoe.matter b/.../rootnode_dimmablelight_bCwGYSDpoe.matter → .../rootnode_dimmablelight_bCwGYSDpoe.matter
diff --git a/...ted/rootnode_flowsensor_1zVxHedlaV.matter → ...ces/rootnode_flowsensor_1zVxHedlaV.matter b/...ted/rootnode_flowsensor_1zVxHedlaV.matter → ...ces/rootnode_flowsensor_1zVxHedlaV.matter
diff --git a/...node_heatingcoolingunit_ncdGai1E5a.matter → ...node_heatingcoolingunit_ncdGai1E5a.matter b/...node_heatingcoolingunit_ncdGai1E5a.matter → ...node_heatingcoolingunit_ncdGai1E5a.matter
diff --git a/...rootnode_humiditysensor_Xyj4gda6Hb.matter → ...rootnode_humiditysensor_Xyj4gda6Hb.matter b/...rootnode_humiditysensor_Xyj4gda6Hb.matter → ...rootnode_humiditysensor_Xyj4gda6Hb.matter
diff --git a/...ootnode_occupancysensor_iHyVgifZuo.matter → ...ootnode_occupancysensor_iHyVgifZuo.matter b/...ootnode_occupancysensor_iHyVgifZuo.matter → ...ootnode_occupancysensor_iHyVgifZuo.matter
diff --git a/...otnode_onofflightswitch_FsPlMr090Q.matter → ...otnode_onofflightswitch_FsPlMr090Q.matter b/...otnode_onofflightswitch_FsPlMr090Q.matter → ...otnode_onofflightswitch_FsPlMr090Q.matter
diff --git a/...ootnode_onoffpluginunit_Wtf8ss5EBY.matter → ...ootnode_onoffpluginunit_Wtf8ss5EBY.matter b/...ootnode_onoffpluginunit_Wtf8ss5EBY.matter → ...ootnode_onoffpluginunit_Wtf8ss5EBY.matter
diff --git a/...rootnode_pressuresensor_s0qC9wLH4k.matter → ...rootnode_pressuresensor_s0qC9wLH4k.matter b/...rootnode_pressuresensor_s0qC9wLH4k.matter → ...rootnode_pressuresensor_s0qC9wLH4k.matter
diff --git a/...erated/rootnode_speaker_RpzeXdimqA.matter → ...evices/rootnode_speaker_RpzeXdimqA.matter b/...erated/rootnode_speaker_RpzeXdimqA.matter → ...evices/rootnode_speaker_RpzeXdimqA.matter
diff --git a/...tnode_temperaturesensor_Qy1zkNW7c3.matter → ...tnode_temperaturesensor_Qy1zkNW7c3.matter b/...tnode_temperaturesensor_Qy1zkNW7c3.matter → ...tnode_temperaturesensor_Qy1zkNW7c3.matter
diff --git a/...ted/rootnode_thermostat_bm3fb8dhYi.matter → ...ces/rootnode_thermostat_bm3fb8dhYi.matter b/...ted/rootnode_thermostat_bm3fb8dhYi.matter → ...ces/rootnode_thermostat_bm3fb8dhYi.matter
diff --git a/...rootnode_windowcovering_RLCxaGi9Yx.matter → ...rootnode_windowcovering_RLCxaGi9Yx.matter b/...rootnode_windowcovering_RLCxaGi9Yx.matter → ...rootnode_windowcovering_RLCxaGi9Yx.matter
diff --git a/scripts/tools/zap_regen_all.py b/scripts/tools/zap_regen_all.py
@@ -71,7 +71,10 @@ def generate(self):
             with open(af_gen_event, "w+"):  # Empty file needed for linux
                 pass
             idl_path = self.zap_config.replace(".zap", ".matter")
-            target_path = os.path.join(self.output_dir, os.path.basename(idl_path))
+            target_path = os.path.join("examples",
+                                       "chef",
+                                       "devices",
+                                       os.path.basename(idl_path))
             os.rename(idl_path, target_path)