diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index 840f51d0ad993a..0140d4b58d21ef 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -9396,7 +9396,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -9422,7 +9422,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 1, "attributes": [ @@ -18314,7 +18314,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -18358,7 +18358,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index 6c11faf288ccdf..832fc013e383b2 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -9246,7 +9246,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -9272,7 +9272,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ @@ -18038,7 +18038,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -18082,7 +18082,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index c6af5d2d61d576..05b052ad189bc4 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index 03bcb20727a142..ffc5b4c51fb2b6 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap index b572d759fea2c9..9d842d7dba156b 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index f1497f6b2acf2b..f74ee13e3fb4e0 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index 6b0545f1d77be0..11c414f8496549 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index ad7c81e022cd17..4e3bed18bf5d75 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap index 88591d3dc7dd48..be9a797d365be4 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap index 5f8092a340a146..50034a6b4ecc0c 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index 60a68506984842..a20354fe356e72 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap index abbfe4738974d0..68fc189598403a 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap index 17290e4f3e192d..d4529a04067c37 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap index 7b43a9ef2e7872..78a4c755f4dad2 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index 3626cfba2bea60..69e419b5e530a8 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap index cc3f687a23c3ea..2c015a89e1d062 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap index 168215c77c4b14..a18f44be2230ca 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap index f77fd0771ad598..c376a192c5c698 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap index 8e548fc86c9fa5..23218a3e8896a9 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap index 6a4c36b6d0c9c1..c2b6b7edfea0c3 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap index 5b3d8c915d1994..bb182f85f4a275 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap index 9f5b8f4c22418d..7ee8f412306dfd 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/sample_app_util/test_files/sample_zap_file.zap b/examples/chef/sample_app_util/test_files/sample_zap_file.zap index 21388735e19ca9..931a2737f92d81 100644 --- a/examples/chef/sample_app_util/test_files/sample_zap_file.zap +++ b/examples/chef/sample_app_util/test_files/sample_zap_file.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "commands": [], @@ -649,7 +649,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "commands": [], diff --git a/examples/common/pigweed/protos/attributes_service.proto b/examples/common/pigweed/protos/attributes_service.proto index 8eff6cb079be42..6aa352055f7d46 100644 --- a/examples/common/pigweed/protos/attributes_service.proto +++ b/examples/common/pigweed/protos/attributes_service.proto @@ -78,7 +78,7 @@ enum ClusterType { ZCL_GROUPS_CLUSTER_ID = 0x0004; ZCL_SCENES_CLUSTER_ID = 0x0005; ZCL_ON_OFF_CLUSTER_ID = 0x0006; - ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID = 0x0007; + ZCL_ON_OFF_SWITCH_CONFIGURATION_CLUSTER_ID = 0x0007; ZCL_LEVEL_CONTROL_CLUSTER_ID = 0x0008; ZCL_ALARM_CLUSTER_ID = 0x0009; ZCL_TIME_CLUSTER_ID = 0x000A; @@ -164,7 +164,7 @@ enum ClusterType { ZCL_MEDIA_INPUT_CLUSTER_ID = 0x0507; ZCL_LOW_POWER_CLUSTER_ID = 0x0508; ZCL_KEYPAD_INPUT_CLUSTER_ID = 0x0509; - ZCL_CONTENT_LAUNCH_CLUSTER_ID = 0x050A; + ZCL_CONTENT_LAUNCHER_CLUSTER_ID = 0x050A; ZCL_AUDIO_OUTPUT_CLUSTER_ID = 0x050B; ZCL_APPLICATION_LAUNCHER_CLUSTER_ID = 0x050C; ZCL_APPLICATION_BASIC_CLUSTER_ID = 0x050D; diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap index 7ea8d4598f6a4d..a8c1dd670ecf12 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap index 4764e6a4b93051..e13877a7027bed 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.zap +++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap @@ -606,7 +606,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -632,7 +632,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index 20746bbfe448be..949a988b2c72c7 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index 051d0813981acd..e2dc209a3ad1e0 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -622,7 +622,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -648,7 +648,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 2eaf87aedaa77e..29b52671f80a8f 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -5986,7 +5986,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -6012,7 +6012,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index 71a65d7dae46c5..00641abcbd47d9 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -6408,7 +6408,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -6452,7 +6452,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "server", "enabled": 1, "commands": [ diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index 71a65d7dae46c5..00641abcbd47d9 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -6408,7 +6408,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -6452,7 +6452,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "server", "enabled": 1, "commands": [ diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 09ff97f34ef732..b9fe393b9dafc5 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -13460,7 +13460,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -13504,7 +13504,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp index 801dfe7698b4fd..d52b014b82e303 100644 --- a/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp +++ b/examples/tv-app/android/include/content-launcher/AppContentLauncherManager.cpp @@ -151,7 +151,7 @@ uint32_t AppContentLauncherManager::HandleGetSupportedStreamingProtocols() uint32_t AppContentLauncherManager::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint >= EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp index 8e47b3126fa7de..aae9ea1d8f609d 100644 --- a/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp +++ b/examples/tv-app/android/include/media-playback/AppMediaPlaybackManager.cpp @@ -210,7 +210,7 @@ CHIP_ERROR AppMediaPlaybackManager::HandleGetSampledPosition(AttributeValueEncod uint32_t AppMediaPlaybackManager::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint >= EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/android/java/AppImpl.cpp b/examples/tv-app/android/java/AppImpl.cpp index 57418ebeb6c724..8139dba7a8c912 100644 --- a/examples/tv-app/android/java/AppImpl.cpp +++ b/examples/tv-app/android/java/AppImpl.cpp @@ -235,7 +235,7 @@ DECLARE_DYNAMIC_CLUSTER(ZCL_DESCRIPTOR_CLUSTER_ID, descriptorAttrs, nullptr, nul applicationLauncherOutgoingCommands), DECLARE_DYNAMIC_CLUSTER(ZCL_ACCOUNT_LOGIN_CLUSTER_ID, accountLoginAttrs, accountLoginIncomingCommands, accountLoginOutgoingCommands), - DECLARE_DYNAMIC_CLUSTER(ZCL_CONTENT_LAUNCH_CLUSTER_ID, contentLauncherAttrs, contentLauncherIncomingCommands, + DECLARE_DYNAMIC_CLUSTER(ZCL_CONTENT_LAUNCHER_CLUSTER_ID, contentLauncherAttrs, contentLauncherIncomingCommands, contentLauncherOutgoingCommands), DECLARE_DYNAMIC_CLUSTER(ZCL_MEDIA_PLAYBACK_CLUSTER_ID, mediaPlaybackAttrs, mediaPlaybackIncomingCommands, mediaPlaybackOutgoingCommands), diff --git a/examples/tv-app/android/java/ChannelManager.cpp b/examples/tv-app/android/java/ChannelManager.cpp index fb8a4d8d2ab558..3781b2587bf837 100644 --- a/examples/tv-app/android/java/ChannelManager.cpp +++ b/examples/tv-app/android/java/ChannelManager.cpp @@ -411,7 +411,7 @@ void ChannelManager::InitializeWithObjects(jobject managerObject) uint32_t ChannelManager::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint >= EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/android/java/KeypadInputManager.cpp b/examples/tv-app/android/java/KeypadInputManager.cpp index e4cfdada55413d..f2e5a07979225c 100644 --- a/examples/tv-app/android/java/KeypadInputManager.cpp +++ b/examples/tv-app/android/java/KeypadInputManager.cpp @@ -90,7 +90,7 @@ void KeypadInputManager::InitializeWithObjects(jobject managerObject) uint32_t KeypadInputManager::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint >= EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/android/java/MediaPlaybackManager.cpp b/examples/tv-app/android/java/MediaPlaybackManager.cpp index 78b0bd308c6796..49c5fb0024807b 100644 --- a/examples/tv-app/android/java/MediaPlaybackManager.cpp +++ b/examples/tv-app/android/java/MediaPlaybackManager.cpp @@ -334,7 +334,7 @@ CHIP_ERROR MediaPlaybackManager::HandleGetSampledPosition(AttributeValueEncoder uint32_t MediaPlaybackManager::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint >= EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/linux/AppImpl.cpp b/examples/tv-app/linux/AppImpl.cpp index ddfa2dff130bfe..24231e5882ab33 100644 --- a/examples/tv-app/linux/AppImpl.cpp +++ b/examples/tv-app/linux/AppImpl.cpp @@ -303,7 +303,7 @@ DECLARE_DYNAMIC_CLUSTER(ZCL_DESCRIPTOR_CLUSTER_ID, descriptorAttrs, nullptr, nul applicationLauncherOutgoingCommands), DECLARE_DYNAMIC_CLUSTER(ZCL_ACCOUNT_LOGIN_CLUSTER_ID, accountLoginAttrs, accountLoginIncomingCommands, accountLoginOutgoingCommands), - DECLARE_DYNAMIC_CLUSTER(ZCL_CONTENT_LAUNCH_CLUSTER_ID, contentLauncherAttrs, contentLauncherIncomingCommands, + DECLARE_DYNAMIC_CLUSTER(ZCL_CONTENT_LAUNCHER_CLUSTER_ID, contentLauncherAttrs, contentLauncherIncomingCommands, contentLauncherOutgoingCommands), DECLARE_DYNAMIC_CLUSTER(ZCL_MEDIA_PLAYBACK_CLUSTER_ID, mediaPlaybackAttrs, mediaPlaybackIncomingCommands, mediaPlaybackOutgoingCommands), diff --git a/examples/tv-app/linux/include/channel/ChannelManager.cpp b/examples/tv-app/linux/include/channel/ChannelManager.cpp index 53c83a287b3294..d80267fb72b211 100644 --- a/examples/tv-app/linux/include/channel/ChannelManager.cpp +++ b/examples/tv-app/linux/include/channel/ChannelManager.cpp @@ -176,7 +176,7 @@ bool ChannelManager::HandleSkipChannel(const uint16_t & count) uint32_t ChannelManager::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint >= EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp index ceb37ec3b2cdd3..07e905cc60519a 100644 --- a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp +++ b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp @@ -190,7 +190,7 @@ uint32_t ContentLauncherManager::HandleGetSupportedStreamingProtocols() uint32_t ContentLauncherManager::GetFeatureMap(chip::EndpointId endpoint) { - if (endpoint >= EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/linux/include/keypad-input/KeypadInputManager.cpp b/examples/tv-app/linux/include/keypad-input/KeypadInputManager.cpp index 84bae2833554e4..22b62db9496f91 100644 --- a/examples/tv-app/linux/include/keypad-input/KeypadInputManager.cpp +++ b/examples/tv-app/linux/include/keypad-input/KeypadInputManager.cpp @@ -98,7 +98,7 @@ void KeypadInputManager::HandleSendKey(CommandResponseHelper= EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp b/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp index d080b9e395ab13..605345621eb000 100644 --- a/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp +++ b/examples/tv-app/linux/include/media-playback/MediaPlaybackManager.cpp @@ -240,7 +240,7 @@ void MediaPlaybackManager::HandleStartOver(CommandResponseHelper= EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT) + if (endpoint >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { return mDynamicEndpointFeatureMap; } diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index f8af4ebe857faf..7c75cb7d7e4156 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -8714,7 +8714,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -8758,7 +8758,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "server", "enabled": 1, "commands": [ @@ -11588,7 +11588,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -11632,7 +11632,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "server", "enabled": 1, "commands": [ diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index 33e9fa246b2d6d..a75c0929aef1fe 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -12906,7 +12906,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -12966,7 +12966,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/src/app/clusters/content-launch-server/content-launch-server.cpp b/src/app/clusters/content-launch-server/content-launch-server.cpp index 26406ca14aa8c9..f248a3d37adda9 100644 --- a/src/app/clusters/content-launch-server/content-launch-server.cpp +++ b/src/app/clusters/content-launch-server/content-launch-server.cpp @@ -41,7 +41,7 @@ using namespace chip::AppPlatform; #endif // CHIP_DEVICE_CONFIG_APP_PLATFORM_ENABLED static constexpr size_t kContentLaunchDelegateTableSize = - EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; // ----------------------------------------------------------------------------- // Delegate Implementation @@ -65,7 +65,7 @@ Delegate * GetDelegate(EndpointId endpoint) ChipLogProgress(Zcl, "Content Launcher NOT returning ContentApp delegate for endpoint:%u", endpoint); uint16_t ep = emberAfFindClusterServerEndpointIndex(endpoint, ContentLauncher::Id); - return ((ep == 0xFFFF || ep >= EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT) ? nullptr : gDelegateTable[ep]); + return ((ep == 0xFFFF || ep >= EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) ? nullptr : gDelegateTable[ep]); } bool isDelegateNull(Delegate * delegate, EndpointId endpoint) @@ -88,7 +88,7 @@ void SetDefaultDelegate(EndpointId endpoint, Delegate * delegate) { uint16_t ep = emberAfFindClusterServerEndpointIndex(endpoint, ContentLauncher::Id); // if endpoint is found and is not a dynamic endpoint - if (ep != 0xFFFF && ep < EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT) + if (ep != 0xFFFF && ep < EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT) { gDelegateTable[ep] = delegate; } diff --git a/src/app/util/debug-printing-test.h b/src/app/util/debug-printing-test.h index 59df8dbdffda07..75d106cd3737d5 100644 --- a/src/app/util/debug-printing-test.h +++ b/src/app/util/debug-printing-test.h @@ -32,7 +32,7 @@ #define EMBER_AF_PRINT_GROUPS_CLUSTER 0x0010 #define EMBER_AF_PRINT_SCENES_CLUSTER 0x0020 #define EMBER_AF_PRINT_ON_OFF_CLUSTER 0x0040 -#define EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIG_CLUSTER 0x0080 +#define EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIGURATION_CLUSTER 0x0080 #define EMBER_AF_PRINT_LEVEL_CONTROL_CLUSTER 0x0101 #define EMBER_AF_PRINT_ALARM_CLUSTER 0x0102 #define EMBER_AF_PRINT_TIME_CLUSTER 0x0104 diff --git a/src/app/util/debug-printing.h b/src/app/util/debug-printing.h index e830508c86f0ad..e621d19a1e41d3 100644 --- a/src/app/util/debug-printing.h +++ b/src/app/util/debug-printing.h @@ -185,19 +185,20 @@ #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ON_OFF_CLUSTER) // Printing macros for cluster: On/off Switch Configuration -#if defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIG_CLUSTER) -#define emberAfOnOffSwitchConfigClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIG_CLUSTER, __VA_ARGS__) -#define emberAfOnOffSwitchConfigClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIG_CLUSTER, __VA_ARGS__) +#if defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIGURATION_CLUSTER) +#define emberAfOnOffSwitchConfigClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIGURATION_CLUSTER, __VA_ARGS__) +#define emberAfOnOffSwitchConfigClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIGURATION_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. #define emberAfOnOffSwitchConfigClusterFlush() #define emberAfOnOffSwitchConfigClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIG_CLUSTER)) \ + if (emberAfPrintEnabled(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIGURATION_CLUSTER)) \ { \ x; \ } #define emberAfOnOffSwitchConfigClusterPrintBuffer(buffer, len, withSpace) \ - emberAfPrintBuffer(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIG_CLUSTER, (buffer), (len), (withSpace)) -#define emberAfOnOffSwitchConfigClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIG_CLUSTER, (buffer)) + emberAfPrintBuffer(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIGURATION_CLUSTER, (buffer), (len), (withSpace)) +#define emberAfOnOffSwitchConfigClusterPrintString(buffer) \ + emberAfPrintString(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIGURATION_CLUSTER, (buffer)) #else #define emberAfOnOffSwitchConfigClusterPrint(...) #define emberAfOnOffSwitchConfigClusterPrintln(...) @@ -205,7 +206,7 @@ #define emberAfOnOffSwitchConfigClusterDebugExec(x) #define emberAfOnOffSwitchConfigClusterPrintBuffer(buffer, len, withSpace) #define emberAfOnOffSwitchConfigClusterPrintString(buffer) -#endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIG_CLUSTER) +#endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ON_OFF_SWITCH_CONFIGURATION_CLUSTER) // Printing macros for cluster: Level Control #if defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_LEVEL_CONTROL_CLUSTER) diff --git a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml index f5c06e42cc308a..b6462ade457644 100644 --- a/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml @@ -20,7 +20,7 @@ limitations under the License. Media Content Launcher 0x050a - CONTENT_LAUNCH_CLUSTER + CONTENT_LAUNCHER_CLUSTER true true This cluster provides an interface for launching content on a media player device such as a TV or Speaker. diff --git a/src/app/zap-templates/zcl/data-model/silabs/general.xml b/src/app/zap-templates/zcl/data-model/silabs/general.xml index fd31fc7f761e35..ae60b4b869d559 100644 --- a/src/app/zap-templates/zcl/data-model/silabs/general.xml +++ b/src/app/zap-templates/zcl/data-model/silabs/general.xml @@ -176,7 +176,7 @@ limitations under the License. General Attributes and commands for configuring On/Off switching devices. 0x0007 - ON_OFF_SWITCH_CONFIG_CLUSTER + ON_OFF_SWITCH_CONFIGURATION_CLUSTER true true switch type diff --git a/src/app/zap_cluster_list.py b/src/app/zap_cluster_list.py index 8076186eb14566..6a4380749d6dd8 100755 --- a/src/app/zap_cluster_list.py +++ b/src/app/zap_cluster_list.py @@ -27,7 +27,7 @@ 'CHANNEL_CLUSTER': ['channel-server'], 'COLOR_CONTROL_CLUSTER': ['color-control-server'], 'COMMISSIONING_CLUSTER': [], - 'CONTENT_LAUNCH_CLUSTER': ['content-launch-server'], + 'CONTENT_LAUNCHER_CLUSTER': ['content-launch-server'], 'DESCRIPTOR_CLUSTER': ['descriptor'], 'DEVICE_TEMP_CLUSTER': [], 'DIAGNOSTIC_LOGS_CLUSTER': ['diagnostic-logs-server'], @@ -55,7 +55,7 @@ 'NETWORK_COMMISSIONING_CLUSTER': ['network-commissioning'], 'OCCUPANCY_SENSING_CLUSTER': ['occupancy-sensor-server'], 'ON_OFF_CLUSTER': ['on-off-server'], - 'ON_OFF_SWITCH_CONFIG_CLUSTER': [], + 'ON_OFF_SWITCH_CONFIGURATION_CLUSTER': [], 'OPERATIONAL_CREDENTIALS_CLUSTER': ['operational-credentials-server'], 'OTA_BOOTLOAD_CLUSTER': [], 'OTA_PROVIDER_CLUSTER': ['ota-provider'], @@ -112,7 +112,7 @@ 'CHANNEL_CLUSTER': [], 'COLOR_CONTROL_CLUSTER': [], 'COMMISSIONING_CLUSTER': [], - 'CONTENT_LAUNCH_CLUSTER': [], + 'CONTENT_LAUNCHER_CLUSTER': [], 'DESCRIPTOR_CLUSTER': [], 'DEVICE_TEMP_CLUSTER': [], 'DIAGNOSTIC_LOGS_CLUSTER': [], @@ -140,7 +140,7 @@ 'NETWORK_COMMISSIONING_CLUSTER': [], 'OCCUPANCY_SENSING_CLUSTER': ['occupancy-sensor-server'], 'ON_OFF_CLUSTER': [], - 'ON_OFF_SWITCH_CONFIG_CLUSTER': [], + 'ON_OFF_SWITCH_CONFIGURATION_CLUSTER': [], 'OPERATIONAL_CREDENTIALS_CLUSTER': [], 'OTA_BOOTLOAD_CLUSTER': [], 'OTA_PROVIDER_CLUSTER': [], diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index 8d54dc8503c86c..f098507e6d168c 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -1006,7 +1006,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "client", "enabled": 1, "attributes": [ @@ -1032,7 +1032,7 @@ "name": "On/off Switch Configuration", "code": 7, "mfgCode": null, - "define": "ON_OFF_SWITCH_CONFIG_CLUSTER", + "define": "ON_OFF_SWITCH_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ @@ -16472,7 +16472,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -16532,7 +16532,7 @@ "name": "Content Launcher", "code": 1290, "mfgCode": null, - "define": "CONTENT_LAUNCH_CLUSTER", + "define": "CONTENT_LAUNCHER_CLUSTER", "side": "server", "enabled": 0, "commands": [ diff --git a/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp b/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp index ee97baced1ec26..18e461541df60b 100644 --- a/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp @@ -71,7 +71,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_COLOR_CONTROL_CLUSTER_ID: emberAfColorControlClusterInitCallback(endpoint); break; - case ZCL_CONTENT_LAUNCH_CLUSTER_ID: + case ZCL_CONTENT_LAUNCHER_CLUSTER_ID: emberAfContentLauncherClusterInitCallback(endpoint); break; case ZCL_DESCRIPTOR_CLUSTER_ID: @@ -155,7 +155,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_ON_OFF_CLUSTER_ID: emberAfOnOffClusterInitCallback(endpoint); break; - case ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID: + case ZCL_ON_OFF_SWITCH_CONFIGURATION_CLUSTER_ID: emberAfOnOffSwitchConfigurationClusterInitCallback(endpoint); break; case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID: diff --git a/zzz_generated/all-clusters-app/zap-generated/gen_config.h b/zzz_generated/all-clusters-app/zap-generated/gen_config.h index a80439e03c9b04..cc74990add77da 100644 --- a/zzz_generated/all-clusters-app/zap-generated/gen_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/gen_config.h @@ -33,7 +33,7 @@ #define EMBER_AF_GROUPS_CLUSTER_SERVER_ENDPOINT_COUNT (3) #define EMBER_AF_SCENES_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_ON_OFF_CLUSTER_SERVER_ENDPOINT_COUNT (2) -#define EMBER_AF_ON_OFF_SWITCH_CONFIG_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_ON_OFF_SWITCH_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LEVEL_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BINARY_INPUT_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (3) @@ -85,7 +85,7 @@ #define EMBER_AF_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -129,7 +129,7 @@ #define EMBER_AF_PLUGIN_ON_OFF // Use this macro to check if the server side of the On/off Switch Configuration cluster is included -#define ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_SERVER +#define ZCL_USING_ON_OFF_SWITCH_CONFIGURATION_CLUSTER_SERVER #define EMBER_AF_PLUGIN_ON_OFF_SWITCH_CONFIGURATION_SERVER #define EMBER_AF_PLUGIN_ON_OFF_SWITCH_CONFIGURATION @@ -396,7 +396,7 @@ #define EMBER_AF_PLUGIN_KEYPAD_INPUT // Use this macro to check if the server side of the Content Launcher cluster is included -#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER +#define ZCL_USING_CONTENT_LAUNCHER_CLUSTER_SERVER #define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_SERVER #define EMBER_AF_PLUGIN_CONTENT_LAUNCHER diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp b/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp index 17554fc88db6d8..1d2e00ad271239 100644 --- a/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp @@ -65,7 +65,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_COLOR_CONTROL_CLUSTER_ID: emberAfColorControlClusterInitCallback(endpoint); break; - case ZCL_CONTENT_LAUNCH_CLUSTER_ID: + case ZCL_CONTENT_LAUNCHER_CLUSTER_ID: emberAfContentLauncherClusterInitCallback(endpoint); break; case ZCL_DESCRIPTOR_CLUSTER_ID: diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/gen_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/gen_config.h index 39eb9111d0ddf6..3fb4f9afdf657a 100644 --- a/zzz_generated/all-clusters-minimal-app/zap-generated/gen_config.h +++ b/zzz_generated/all-clusters-minimal-app/zap-generated/gen_config.h @@ -82,7 +82,7 @@ #define EMBER_AF_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -376,7 +376,7 @@ #define EMBER_AF_PLUGIN_KEYPAD_INPUT // Use this macro to check if the server side of the Content Launcher cluster is included -#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER +#define ZCL_USING_CONTENT_LAUNCHER_CLUSTER_SERVER #define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_SERVER #define EMBER_AF_PLUGIN_CONTENT_LAUNCHER diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-id.h b/zzz_generated/app-common/app-common/zap-generated/cluster-id.h index c587107bd3b10f..22078f7162e8fe 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-id.h @@ -35,7 +35,7 @@ static constexpr chip::ClusterId ZCL_SCENES_CLUSTER_ID = 0x0005; static constexpr chip::ClusterId ZCL_ON_OFF_CLUSTER_ID = 0x0006; // Definitions for cluster: On/off Switch Configuration -static constexpr chip::ClusterId ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID = 0x0007; +static constexpr chip::ClusterId ZCL_ON_OFF_SWITCH_CONFIGURATION_CLUSTER_ID = 0x0007; // Definitions for cluster: Level Control static constexpr chip::ClusterId ZCL_LEVEL_CONTROL_CLUSTER_ID = 0x0008; @@ -212,7 +212,7 @@ static constexpr chip::ClusterId ZCL_LOW_POWER_CLUSTER_ID = 0x0508; static constexpr chip::ClusterId ZCL_KEYPAD_INPUT_CLUSTER_ID = 0x0509; // Definitions for cluster: Content Launcher -static constexpr chip::ClusterId ZCL_CONTENT_LAUNCH_CLUSTER_ID = 0x050A; +static constexpr chip::ClusterId ZCL_CONTENT_LAUNCHER_CLUSTER_ID = 0x050A; // Definitions for cluster: Audio Output static constexpr chip::ClusterId ZCL_AUDIO_OUTPUT_CLUSTER_ID = 0x050B; diff --git a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h index 89aa6ee258eb45..77103d14f33b38 100644 --- a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h +++ b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h @@ -48,10 +48,11 @@ #define CHIP_PRINTCLUSTER_ON_OFF_CLUSTER #endif -#if defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER { ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID, "On/off Switch Configuration" }, +#if defined(ZCL_USING_ON_OFF_SWITCH_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_ON_OFF_SWITCH_CONFIGURATION_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIGURATION_CLUSTER \ + { ZCL_ON_OFF_SWITCH_CONFIGURATION_CLUSTER_ID, "On/off Switch Configuration" }, #else -#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER +#define CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIGURATION_CLUSTER #endif #if defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_LEVEL_CONTROL_CLUSTER_CLIENT) @@ -410,10 +411,10 @@ #define CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER #endif -#if defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER) || defined(ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER { ZCL_CONTENT_LAUNCH_CLUSTER_ID, "Content Launcher" }, +#if defined(ZCL_USING_CONTENT_LAUNCHER_CLUSTER_SERVER) || defined(ZCL_USING_CONTENT_LAUNCHER_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_CONTENT_LAUNCHER_CLUSTER { ZCL_CONTENT_LAUNCHER_CLUSTER_ID, "Content Launcher" }, #else -#define CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER +#define CHIP_PRINTCLUSTER_CONTENT_LAUNCHER_CLUSTER #endif #if defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_SERVER) || defined(ZCL_USING_AUDIO_OUTPUT_CLUSTER_CLIENT) @@ -463,7 +464,7 @@ CHIP_PRINTCLUSTER_GROUPS_CLUSTER \ CHIP_PRINTCLUSTER_SCENES_CLUSTER \ CHIP_PRINTCLUSTER_ON_OFF_CLUSTER \ - CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIG_CLUSTER \ + CHIP_PRINTCLUSTER_ON_OFF_SWITCH_CONFIGURATION_CLUSTER \ CHIP_PRINTCLUSTER_LEVEL_CONTROL_CLUSTER \ CHIP_PRINTCLUSTER_BINARY_INPUT_BASIC_CLUSTER \ CHIP_PRINTCLUSTER_PWM_CLUSTER \ @@ -522,7 +523,7 @@ CHIP_PRINTCLUSTER_MEDIA_INPUT_CLUSTER \ CHIP_PRINTCLUSTER_LOW_POWER_CLUSTER \ CHIP_PRINTCLUSTER_KEYPAD_INPUT_CLUSTER \ - CHIP_PRINTCLUSTER_CONTENT_LAUNCH_CLUSTER \ + CHIP_PRINTCLUSTER_CONTENT_LAUNCHER_CLUSTER \ CHIP_PRINTCLUSTER_AUDIO_OUTPUT_CLUSTER \ CHIP_PRINTCLUSTER_APPLICATION_LAUNCHER_CLUSTER \ CHIP_PRINTCLUSTER_APPLICATION_BASIC_CLUSTER \ diff --git a/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp b/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp index cd90806fcd6377..23725b2b38bad6 100644 --- a/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp +++ b/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp @@ -77,7 +77,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_COLOR_CONTROL_CLUSTER_ID: emberAfColorControlClusterInitCallback(endpoint); break; - case ZCL_CONTENT_LAUNCH_CLUSTER_ID: + case ZCL_CONTENT_LAUNCHER_CLUSTER_ID: emberAfContentLauncherClusterInitCallback(endpoint); break; case ZCL_DESCRIPTOR_CLUSTER_ID: @@ -158,7 +158,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_ON_OFF_CLUSTER_ID: emberAfOnOffClusterInitCallback(endpoint); break; - case ZCL_ON_OFF_SWITCH_CONFIG_CLUSTER_ID: + case ZCL_ON_OFF_SWITCH_CONFIGURATION_CLUSTER_ID: emberAfOnOffSwitchConfigurationClusterInitCallback(endpoint); break; case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID: diff --git a/zzz_generated/controller-clusters/zap-generated/gen_config.h b/zzz_generated/controller-clusters/zap-generated/gen_config.h index 0653ff31923019..9098f1d0820017 100644 --- a/zzz_generated/controller-clusters/zap-generated/gen_config.h +++ b/zzz_generated/controller-clusters/zap-generated/gen_config.h @@ -33,7 +33,7 @@ #define EMBER_AF_GROUPS_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_SCENES_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ON_OFF_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_ON_OFF_SWITCH_CONFIG_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_ON_OFF_SWITCH_CONFIGURATION_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_LEVEL_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_BINARY_INPUT_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_DESCRIPTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (1) @@ -87,7 +87,7 @@ #define EMBER_AF_MEDIA_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_LOW_POWER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_KEYPAD_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_CONTENT_LAUNCHER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_AUDIO_OUTPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_APPLICATION_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1) @@ -114,7 +114,7 @@ #define EMBER_AF_PLUGIN_ON_OFF_CLIENT // Use this macro to check if the client side of the On/off Switch Configuration cluster is included -#define ZCL_USING_ON_OFF_SWITCH_CONFIG_CLUSTER_CLIENT +#define ZCL_USING_ON_OFF_SWITCH_CONFIGURATION_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_ON_OFF_SWITCH_CONFIGURATION_CLIENT // Use this macro to check if the client side of the Level Control cluster is included @@ -330,7 +330,7 @@ #define EMBER_AF_PLUGIN_KEYPAD_INPUT_CLIENT // Use this macro to check if the client side of the Content Launcher cluster is included -#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT +#define ZCL_USING_CONTENT_LAUNCHER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_CLIENT // Use this macro to check if the client side of the Audio Output cluster is included diff --git a/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp b/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp index 31d13c46d803ed..eee13e235f2ef0 100644 --- a/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp +++ b/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp @@ -47,7 +47,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_COLOR_CONTROL_CLUSTER_ID: emberAfColorControlClusterInitCallback(endpoint); break; - case ZCL_CONTENT_LAUNCH_CLUSTER_ID: + case ZCL_CONTENT_LAUNCHER_CLUSTER_ID: emberAfContentLauncherClusterInitCallback(endpoint); break; case ZCL_DESCRIPTOR_CLUSTER_ID: diff --git a/zzz_generated/placeholder/app1/zap-generated/gen_config.h b/zzz_generated/placeholder/app1/zap-generated/gen_config.h index 9290aa4a2fdcd0..b242edf0306714 100644 --- a/zzz_generated/placeholder/app1/zap-generated/gen_config.h +++ b/zzz_generated/placeholder/app1/zap-generated/gen_config.h @@ -72,8 +72,8 @@ #define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_KEYPAD_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_CONTENT_LAUNCHER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_APPLICATION_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -305,11 +305,11 @@ #define EMBER_AF_PLUGIN_KEYPAD_INPUT // Use this macro to check if the client side of the Content Launcher cluster is included -#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT +#define ZCL_USING_CONTENT_LAUNCHER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_CLIENT // Use this macro to check if the server side of the Content Launcher cluster is included -#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER +#define ZCL_USING_CONTENT_LAUNCHER_CLUSTER_SERVER #define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_SERVER #define EMBER_AF_PLUGIN_CONTENT_LAUNCHER diff --git a/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp b/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp index 31d13c46d803ed..eee13e235f2ef0 100644 --- a/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp +++ b/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp @@ -47,7 +47,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_COLOR_CONTROL_CLUSTER_ID: emberAfColorControlClusterInitCallback(endpoint); break; - case ZCL_CONTENT_LAUNCH_CLUSTER_ID: + case ZCL_CONTENT_LAUNCHER_CLUSTER_ID: emberAfContentLauncherClusterInitCallback(endpoint); break; case ZCL_DESCRIPTOR_CLUSTER_ID: diff --git a/zzz_generated/placeholder/app2/zap-generated/gen_config.h b/zzz_generated/placeholder/app2/zap-generated/gen_config.h index 9290aa4a2fdcd0..b242edf0306714 100644 --- a/zzz_generated/placeholder/app2/zap-generated/gen_config.h +++ b/zzz_generated/placeholder/app2/zap-generated/gen_config.h @@ -72,8 +72,8 @@ #define EMBER_AF_TARGET_NAVIGATOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_KEYPAD_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_CONTENT_LAUNCHER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_APPLICATION_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -305,11 +305,11 @@ #define EMBER_AF_PLUGIN_KEYPAD_INPUT // Use this macro to check if the client side of the Content Launcher cluster is included -#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT +#define ZCL_USING_CONTENT_LAUNCHER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_CLIENT // Use this macro to check if the server side of the Content Launcher cluster is included -#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER +#define ZCL_USING_CONTENT_LAUNCHER_CLUSTER_SERVER #define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_SERVER #define EMBER_AF_PLUGIN_CONTENT_LAUNCHER diff --git a/zzz_generated/tv-app/zap-generated/callback-stub.cpp b/zzz_generated/tv-app/zap-generated/callback-stub.cpp index 359c98c79e4e51..1757c0912158b6 100644 --- a/zzz_generated/tv-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/tv-app/zap-generated/callback-stub.cpp @@ -56,7 +56,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_CHANNEL_CLUSTER_ID: emberAfChannelClusterInitCallback(endpoint); break; - case ZCL_CONTENT_LAUNCH_CLUSTER_ID: + case ZCL_CONTENT_LAUNCHER_CLUSTER_ID: emberAfContentLauncherClusterInitCallback(endpoint); break; case ZCL_DESCRIPTOR_CLUSTER_ID: diff --git a/zzz_generated/tv-app/zap-generated/gen_config.h b/zzz_generated/tv-app/zap-generated/gen_config.h index af106c59ddae0e..2a3143b7aec408 100644 --- a/zzz_generated/tv-app/zap-generated/gen_config.h +++ b/zzz_generated/tv-app/zap-generated/gen_config.h @@ -64,7 +64,7 @@ #define EMBER_AF_MEDIA_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOW_POWER_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_KEYPAD_INPUT_CLUSTER_SERVER_ENDPOINT_COUNT (2) -#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_SERVER_ENDPOINT_COUNT (2) +#define EMBER_AF_CONTENT_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_AUDIO_OUTPUT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_APPLICATION_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -248,7 +248,7 @@ #define EMBER_AF_PLUGIN_KEYPAD_INPUT // Use this macro to check if the server side of the Content Launcher cluster is included -#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_SERVER +#define ZCL_USING_CONTENT_LAUNCHER_CLUSTER_SERVER #define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_SERVER #define EMBER_AF_PLUGIN_CONTENT_LAUNCHER diff --git a/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp b/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp index d055ff984900be..d9abefdc94d533 100644 --- a/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp @@ -62,7 +62,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_CHANNEL_CLUSTER_ID: emberAfChannelClusterInitCallback(endpoint); break; - case ZCL_CONTENT_LAUNCH_CLUSTER_ID: + case ZCL_CONTENT_LAUNCHER_CLUSTER_ID: emberAfContentLauncherClusterInitCallback(endpoint); break; case ZCL_DESCRIPTOR_CLUSTER_ID: diff --git a/zzz_generated/tv-casting-app/zap-generated/gen_config.h b/zzz_generated/tv-casting-app/zap-generated/gen_config.h index 74c6a80ad83308..6e8cb5938bb2f4 100644 --- a/zzz_generated/tv-casting-app/zap-generated/gen_config.h +++ b/zzz_generated/tv-casting-app/zap-generated/gen_config.h @@ -67,7 +67,7 @@ #define EMBER_AF_MEDIA_PLAYBACK_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_MEDIA_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_KEYPAD_INPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_CONTENT_LAUNCH_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_CONTENT_LAUNCHER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_AUDIO_OUTPUT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_APPLICATION_LAUNCHER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_APPLICATION_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1) @@ -274,7 +274,7 @@ #define EMBER_AF_PLUGIN_KEYPAD_INPUT_CLIENT // Use this macro to check if the client side of the Content Launcher cluster is included -#define ZCL_USING_CONTENT_LAUNCH_CLUSTER_CLIENT +#define ZCL_USING_CONTENT_LAUNCHER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_CONTENT_LAUNCHER_CLIENT // Use this macro to check if the client side of the Audio Output cluster is included