From 1600421f824c9cad65f931464a293d1b67b4f262 Mon Sep 17 00:00:00 2001 From: Austin Bozowski Date: Thu, 30 Jun 2022 09:45:18 -0700 Subject: [PATCH] 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 --- examples/chef/chef.py | 5 +---- .../chef/devices}/rootnode_contactsensor_lFAGG1bfRO.matter | 0 .../chef/devices}/rootnode_dimmablelight_bCwGYSDpoe.matter | 0 .../chef/devices}/rootnode_flowsensor_1zVxHedlaV.matter | 0 .../devices}/rootnode_heatingcoolingunit_ncdGai1E5a.matter | 0 .../chef/devices}/rootnode_humiditysensor_Xyj4gda6Hb.matter | 0 .../chef/devices}/rootnode_occupancysensor_iHyVgifZuo.matter | 0 .../devices}/rootnode_onofflightswitch_FsPlMr090Q.matter | 0 .../chef/devices}/rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 0 .../chef/devices}/rootnode_pressuresensor_s0qC9wLH4k.matter | 0 .../chef/devices}/rootnode_speaker_RpzeXdimqA.matter | 0 .../devices}/rootnode_temperaturesensor_Qy1zkNW7c3.matter | 0 .../chef/devices}/rootnode_thermostat_bm3fb8dhYi.matter | 0 .../chef/devices}/rootnode_windowcovering_RLCxaGi9Yx.matter | 0 scripts/tools/zap_regen_all.py | 5 ++++- 15 files changed, 5 insertions(+), 5 deletions(-) rename {zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated => examples/chef/devices}/rootnode_contactsensor_lFAGG1bfRO.matter (100%) rename {zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated => examples/chef/devices}/rootnode_dimmablelight_bCwGYSDpoe.matter (100%) rename {zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated => examples/chef/devices}/rootnode_flowsensor_1zVxHedlaV.matter (100%) rename {zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated => examples/chef/devices}/rootnode_heatingcoolingunit_ncdGai1E5a.matter (100%) rename {zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated => examples/chef/devices}/rootnode_humiditysensor_Xyj4gda6Hb.matter (100%) rename {zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated => examples/chef/devices}/rootnode_occupancysensor_iHyVgifZuo.matter (100%) rename {zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated => examples/chef/devices}/rootnode_onofflightswitch_FsPlMr090Q.matter (100%) rename {zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated => examples/chef/devices}/rootnode_onoffpluginunit_Wtf8ss5EBY.matter (100%) rename {zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated => examples/chef/devices}/rootnode_pressuresensor_s0qC9wLH4k.matter (100%) rename {zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated => examples/chef/devices}/rootnode_speaker_RpzeXdimqA.matter (100%) rename {zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated => examples/chef/devices}/rootnode_temperaturesensor_Qy1zkNW7c3.matter (100%) rename {zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated => examples/chef/devices}/rootnode_thermostat_bm3fb8dhYi.matter (100%) rename {zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated => examples/chef/devices}/rootnode_windowcovering_RLCxaGi9Yx.matter (100%) diff --git a/examples/chef/chef.py b/examples/chef/chef.py index a14c92781f08cd..f570a95100b3cb 100755 --- 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/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter similarity index 100% rename from zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/rootnode_contactsensor_lFAGG1bfRO.matter rename to examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter diff --git a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter similarity index 100% rename from zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/rootnode_dimmablelight_bCwGYSDpoe.matter rename to examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter diff --git a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter similarity index 100% rename from zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/rootnode_flowsensor_1zVxHedlaV.matter rename to examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter diff --git a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter similarity index 100% rename from zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/rootnode_heatingcoolingunit_ncdGai1E5a.matter rename to examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter diff --git a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter similarity index 100% rename from zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/rootnode_humiditysensor_Xyj4gda6Hb.matter rename to examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter diff --git a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter similarity index 100% rename from zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/rootnode_occupancysensor_iHyVgifZuo.matter rename to examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter diff --git a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter similarity index 100% rename from zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/rootnode_onofflightswitch_FsPlMr090Q.matter rename to examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter diff --git a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter similarity index 100% rename from zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/rootnode_onoffpluginunit_Wtf8ss5EBY.matter rename to examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter diff --git a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter similarity index 100% rename from zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/rootnode_pressuresensor_s0qC9wLH4k.matter rename to examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter diff --git a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter similarity index 100% rename from zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/rootnode_speaker_RpzeXdimqA.matter rename to examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter diff --git a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter similarity index 100% rename from zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/rootnode_temperaturesensor_Qy1zkNW7c3.matter rename to examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter diff --git a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter similarity index 100% rename from zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/rootnode_thermostat_bm3fb8dhYi.matter rename to examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter diff --git a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter similarity index 100% rename from zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/rootnode_windowcovering_RLCxaGi9Yx.matter rename to examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter diff --git a/scripts/tools/zap_regen_all.py b/scripts/tools/zap_regen_all.py index 27fa08e6289224..23ead01804b0fa 100755 --- 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)