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 ff682be0830d2f..99d72eeea360c9 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 @@ -1530,7 +1530,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1582,7 +1582,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1658,7 +1658,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1694,7 +1694,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ @@ -10770,7 +10770,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -10814,7 +10814,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -10850,7 +10850,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -10876,7 +10876,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 0, "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 b6b357a25431b8..5897329987f088 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 @@ -1530,7 +1530,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1582,7 +1582,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1658,7 +1658,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1694,7 +1694,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ @@ -10620,7 +10620,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -10664,7 +10664,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -10700,7 +10700,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -10726,7 +10726,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index 05b052ad189bc4..47e37502acdfd5 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index ffc5b4c51fb2b6..dedd809170434a 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -1524,7 +1524,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1576,7 +1576,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1652,7 +1652,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1688,7 +1688,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap index 9d842d7dba156b..9e29e9eb5a799d 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index f74ee13e3fb4e0..bc11f60cb11b3a 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index 11c414f8496549..5d17b610e136c5 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index 4e3bed18bf5d75..6654567e585f41 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap index be9a797d365be4..b1ad6043e45780 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap @@ -1524,7 +1524,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1576,7 +1576,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1652,7 +1652,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1688,7 +1688,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap index 50034a6b4ecc0c..c02cddf8927e73 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index a20354fe356e72..5eed8a85a55e00 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap index 68fc189598403a..5401943fad938f 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap index d4529a04067c37..7a42a45b1352ad 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap index 78a4c755f4dad2..341342115cecfe 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index 69e419b5e530a8..2b9c4941f21145 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap index 2c015a89e1d062..ee7c5ffa63be10 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap index a18f44be2230ca..9b09c5893c3e13 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap index c376a192c5c698..7d48e7f85e4ae9 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap index 23218a3e8896a9..0512c454fc1f91 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap index 59fdbd0a05a02d..324c56eed2aad8 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap index a61f58c3b25dcf..d0278af5482f29 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap index 7ee8f412306dfd..70eba61ed56f89 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap @@ -1460,7 +1460,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1512,7 +1512,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1588,7 +1588,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "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 931a2737f92d81..0d24e4ac9d3a88 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 @@ -1533,7 +1533,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1585,7 +1585,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1661,7 +1661,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1697,7 +1697,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "commands": [], diff --git a/examples/common/pigweed/protos/attributes_service.proto b/examples/common/pigweed/protos/attributes_service.proto index 4c7eb3b13b0472..6f09e9faa7ba9a 100644 --- a/examples/common/pigweed/protos/attributes_service.proto +++ b/examples/common/pigweed/protos/attributes_service.proto @@ -89,8 +89,8 @@ enum ClusterType { ZCL_POLL_CONTROL_CLUSTER_ID = 0x0020; ZCL_ACTIONS_CLUSTER_ID = 0x0025; ZCL_BASIC_CLUSTER_ID = 0x0028; - ZCL_OTA_PROVIDER_CLUSTER_ID = 0x0029; - ZCL_OTA_REQUESTOR_CLUSTER_ID = 0x002A; + ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID = 0x0029; + ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID = 0x002A; ZCL_UNIT_LOCALIZATION_CLUSTER_ID = 0x002D; ZCL_POWER_SOURCE_CLUSTER_ID = 0x002F; ZCL_GENERAL_COMMISSIONING_CLUSTER_ID = 0x0030; 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 a8c1dd670ecf12..56dd9d1b244863 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 @@ -1524,7 +1524,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1576,7 +1576,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1652,7 +1652,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1688,7 +1688,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "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 e13877a7027bed..d28695f5333ddf 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 @@ -1572,7 +1572,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1700,7 +1700,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1736,7 +1736,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index 949a988b2c72c7..d42c36437fe3e3 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -1524,7 +1524,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1576,7 +1576,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1652,7 +1652,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1688,7 +1688,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index e2dc209a3ad1e0..5f82ebb3268c4d 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -1563,7 +1563,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1615,7 +1615,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1691,7 +1691,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1727,7 +1727,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 29b52671f80a8f..0b66ed69502e04 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -1272,7 +1272,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1324,7 +1324,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1400,7 +1400,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1436,7 +1436,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap index 15556db6500574..f317dbe599207d 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap @@ -1292,7 +1292,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1344,7 +1344,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 1, "commands": [ @@ -1404,7 +1404,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -1430,7 +1430,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap index d86fd54c3fc206..06cdae7a50d658 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap @@ -1470,7 +1470,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1522,7 +1522,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1566,7 +1566,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1602,7 +1602,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index a994782d3abe1f..47b1c82c1bc326 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -1608,7 +1608,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1676,7 +1676,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1702,7 +1702,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1720,7 +1720,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap index 3625f8859ea130..7902e94a4c6dd6 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap @@ -1556,7 +1556,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1624,7 +1624,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1650,7 +1650,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1668,7 +1668,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 0a93d9180ca5c4..601a871112cf16 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -1506,7 +1506,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1558,7 +1558,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1618,7 +1618,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1670,7 +1670,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ @@ -9136,7 +9136,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -9180,7 +9180,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -9216,7 +9216,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -9242,7 +9242,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 14ca77b878ee59..98bad2e084396a 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -1490,7 +1490,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1542,7 +1542,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_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 649e45a964dade..f5b9081f4b73ca 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 @@ -1472,7 +1472,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1524,7 +1524,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 1, "commands": [ @@ -8538,7 +8538,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -8582,7 +8582,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -8618,7 +8618,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -8644,7 +8644,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index 6632b95c70fede..0fa3ef44b7baab 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -1604,7 +1604,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -1656,7 +1656,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -1732,7 +1732,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 0, "commands": [ @@ -1768,7 +1768,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/src/app/clusters/ota-provider/ota-provider.cpp b/src/app/clusters/ota-provider/ota-provider.cpp index ff3b504490261b..da21de71399c92 100644 --- a/src/app/clusters/ota-provider/ota-provider.cpp +++ b/src/app/clusters/ota-provider/ota-provider.cpp @@ -36,16 +36,16 @@ using namespace chip::app::Clusters::OtaSoftwareUpdateProvider; using chip::app::Clusters::OTAProviderDelegate; using Protocols::InteractionModel::Status; -// EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT is only defined if the +// EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT is only defined if the // cluster is actually enabled in the ZAP config. To allow operation in setups // where that's not the case (and custom dispatch is used), define it here as // needed. -#ifndef EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT -#define EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT 0 -#endif // EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT +#ifndef EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT 0 +#endif // EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT static constexpr size_t kOtaProviderDelegateTableSize = - EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; + EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT + CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; namespace { constexpr size_t kLocationLen = 2; // The expected length of the location parameter in QueryImage diff --git a/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml b/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml index 99d2fc6483e396..9cdf878619eab0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml +++ b/src/app/zap-templates/zcl/data-model/chip/chip-ota.xml @@ -41,7 +41,7 @@ limitations under the License. CHIP Provides an interface for providing OTA software updates 0x0029 - OTA_PROVIDER_CLUSTER + OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER true true @@ -118,7 +118,7 @@ limitations under the License. CHIP Provides an interface for downloading and applying OTA software updates 0x002a - OTA_REQUESTOR_CLUSTER + OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER true true DefaultOtaProviders diff --git a/src/app/zap_cluster_list.py b/src/app/zap_cluster_list.py index d5940e92e20db0..11b3c21f05623b 100755 --- a/src/app/zap_cluster_list.py +++ b/src/app/zap_cluster_list.py @@ -58,8 +58,8 @@ 'ON_OFF_SWITCH_CONFIGURATION_CLUSTER': [], 'OPERATIONAL_CREDENTIALS_CLUSTER': ['operational-credentials-server'], 'OTA_BOOTLOAD_CLUSTER': [], - 'OTA_PROVIDER_CLUSTER': ['ota-provider'], - 'OTA_REQUESTOR_CLUSTER': ['ota-requestor'], + 'OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER': ['ota-provider'], + 'OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER': ['ota-requestor'], 'POWER_SOURCE_CLUSTER': ['power-source-server'], 'POWER_SOURCE_CONFIGURATION_CLUSTER': ['power-source-configuration-server'], 'POLL_CONTROL_CLUSTER': [], @@ -143,8 +143,8 @@ 'ON_OFF_SWITCH_CONFIGURATION_CLUSTER': [], 'OPERATIONAL_CREDENTIALS_CLUSTER': [], 'OTA_BOOTLOAD_CLUSTER': [], - 'OTA_PROVIDER_CLUSTER': [], - 'OTA_REQUESTOR_CLUSTER': [], + 'OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER': [], + 'OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER': [], 'POLL_CONTROL_CLUSTER': [], 'POWER_CONFIG_CLUSTER': [], 'POWER_PROFILE_CLUSTER': [], diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index 93595ee8884bc1..54521003b8ec95 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -3042,7 +3042,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -3110,7 +3110,7 @@ "name": "OTA Software Update Provider", "code": 41, "mfgCode": null, - "define": "OTA_PROVIDER_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -3186,7 +3186,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -3238,7 +3238,7 @@ "name": "OTA Software Update Requestor", "code": 42, "mfgCode": null, - "define": "OTA_REQUESTOR_CLUSTER", + "define": "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER", "side": "server", "enabled": 0, "attributes": [ 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 61ec6f7d8113c1..5ec8072f6e50b5 100644 --- a/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp @@ -143,10 +143,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OCCUPANCY_SENSING_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 2d19636d3fde57..947a9fa1dd4c9d 100644 --- a/zzz_generated/all-clusters-app/zap-generated/gen_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/gen_config.h @@ -41,8 +41,8 @@ #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -173,11 +173,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR 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 0aa65c3a9cc630..344bbe4982d5cd 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 @@ -131,10 +131,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OCCUPANCY_SENSING_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 747dc5a6c168a3..1f7d89b375cdb3 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 @@ -39,8 +39,8 @@ #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_ACTIONS_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -158,11 +158,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR 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 e0198f9c851383..8a47a11f50b7e2 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 @@ -62,10 +62,10 @@ static constexpr chip::ClusterId ZCL_ACTIONS_CLUSTER_ID = 0x0025; static constexpr chip::ClusterId ZCL_BASIC_CLUSTER_ID = 0x0028; // Definitions for cluster: OTA Software Update Provider -static constexpr chip::ClusterId ZCL_OTA_PROVIDER_CLUSTER_ID = 0x0029; +static constexpr chip::ClusterId ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID = 0x0029; // Definitions for cluster: OTA Software Update Requestor -static constexpr chip::ClusterId ZCL_OTA_REQUESTOR_CLUSTER_ID = 0x002A; +static constexpr chip::ClusterId ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID = 0x002A; // Definitions for cluster: Localization Configuration static constexpr chip::ClusterId ZCL_LOCALIZATION_CONFIGURATION_CLUSTER_ID = 0x002B; 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 0083c964061f24..b9d539a8aada9d 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 @@ -103,16 +103,19 @@ #define CHIP_PRINTCLUSTER_BASIC_CLUSTER #endif -#if defined(ZCL_USING_OTA_PROVIDER_CLUSTER_SERVER) || defined(ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_OTA_PROVIDER_CLUSTER { ZCL_OTA_PROVIDER_CLUSTER_ID, "OTA Software Update Provider" }, +#if defined(ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER) || defined(ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER \ + { ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID, "OTA Software Update Provider" }, #else -#define CHIP_PRINTCLUSTER_OTA_PROVIDER_CLUSTER +#define CHIP_PRINTCLUSTER_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER #endif -#if defined(ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER) || defined(ZCL_USING_OTA_REQUESTOR_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_OTA_REQUESTOR_CLUSTER { ZCL_OTA_REQUESTOR_CLUSTER_ID, "OTA Software Update Requestor" }, +#if defined(ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER) || \ + defined(ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER \ + { ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID, "OTA Software Update Requestor" }, #else -#define CHIP_PRINTCLUSTER_OTA_REQUESTOR_CLUSTER +#define CHIP_PRINTCLUSTER_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER #endif #if defined(ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER) || defined(ZCL_USING_LOCALIZATION_CONFIGURATION_CLUSTER_CLIENT) @@ -476,8 +479,8 @@ CHIP_PRINTCLUSTER_ACCESS_CONTROL_CLUSTER \ CHIP_PRINTCLUSTER_ACTIONS_CLUSTER \ CHIP_PRINTCLUSTER_BASIC_CLUSTER \ - CHIP_PRINTCLUSTER_OTA_PROVIDER_CLUSTER \ - CHIP_PRINTCLUSTER_OTA_REQUESTOR_CLUSTER \ + CHIP_PRINTCLUSTER_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER \ + CHIP_PRINTCLUSTER_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER \ CHIP_PRINTCLUSTER_LOCALIZATION_CONFIGURATION_CLUSTER \ CHIP_PRINTCLUSTER_TIME_FORMAT_LOCALIZATION_CLUSTER \ CHIP_PRINTCLUSTER_UNIT_LOCALIZATION_CLUSTER \ diff --git a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/callback-stub.cpp b/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/callback-stub.cpp index df7d5e1833c2da..0af808ba61a8b6 100644 --- a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/callback-stub.cpp @@ -74,10 +74,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_LOCALIZATION_CONFIGURATION_CLUSTER_ID: emberAfLocalizationConfigurationClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OCCUPANCY_SENSING_CLUSTER_ID: diff --git a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/gen_config.h b/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/gen_config.h index c961cd4d63437c..8f74d2b17889ca 100644 --- a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/gen_config.h +++ b/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/gen_config.h @@ -37,8 +37,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -101,11 +101,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/callback-stub.cpp index af030fd2a26354..3320691729800d 100644 --- a/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/callback-stub.cpp @@ -68,10 +68,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_ON_OFF_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/gen_config.h index 2df0a89a5da0ad..c5413d83874eec 100644 --- a/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/gen_config.h @@ -36,8 +36,8 @@ #define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_DIAGNOSTIC_LOGS_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -90,11 +90,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/callback-stub.cpp index d333c3c6efb180..ec9885815dc148 100644 --- a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/callback-stub.cpp @@ -74,10 +74,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/gen_config.h index 1b4f97e6839643..480231479ac6d4 100644 --- a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/gen_config.h @@ -35,8 +35,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -83,11 +83,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/callback-stub.cpp index 9b047c1c600f9a..a6c53d49ac0622 100644 --- a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/callback-stub.cpp @@ -74,10 +74,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OCCUPANCY_SENSING_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/gen_config.h index 3260e718104411..0b8bc40b16f972 100644 --- a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/gen_config.h @@ -37,8 +37,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -99,11 +99,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/callback-stub.cpp index c414256a07d137..3ca9c704c4df1a 100644 --- a/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/callback-stub.cpp @@ -74,10 +74,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/gen_config.h index 4e96f082d673cf..59dae30c241687 100644 --- a/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_doorlock_aNKYAreMXE/zap-generated/gen_config.h @@ -35,8 +35,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -83,11 +83,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/callback-stub.cpp index 67971b81cbec62..092a7917bbb451 100644 --- a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/callback-stub.cpp @@ -77,10 +77,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_ON_OFF_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/gen_config.h index 8a70bff7fb2309..6438af5947813f 100644 --- a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/gen_config.h @@ -37,8 +37,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -99,11 +99,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/callback-stub.cpp index e865297a44938a..b9f0ca750c5972 100644 --- a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/callback-stub.cpp @@ -71,10 +71,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/gen_config.h index edbb0b784ecb17..a7e3a2e25794e8 100644 --- a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/gen_config.h @@ -34,8 +34,8 @@ #define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -78,11 +78,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/callback-stub.cpp index f800e249fbbd57..6dc030bec6bbc2 100644 --- a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/callback-stub.cpp @@ -74,10 +74,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/gen_config.h index b063b6c8484b68..a63d6c3a0d95d0 100644 --- a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/gen_config.h @@ -36,8 +36,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -88,11 +88,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/callback-stub.cpp index d6d37ad0db81cc..0398da857afe54 100644 --- a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/callback-stub.cpp @@ -77,10 +77,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_ON_OFF_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/gen_config.h index fee3d90e7cdd62..6beffc1837db36 100644 --- a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/gen_config.h @@ -37,8 +37,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -100,11 +100,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/callback-stub.cpp index 57cec8ecd002f3..b09b8ce74688c2 100644 --- a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/callback-stub.cpp @@ -71,10 +71,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/gen_config.h index 281ec6a4f0f659..3f855088bdac65 100644 --- a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/gen_config.h @@ -36,8 +36,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -88,11 +88,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/callback-stub.cpp index 9e99fcfdb80584..7768e734647944 100644 --- a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/callback-stub.cpp @@ -74,10 +74,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/gen_config.h index cceec4b34fe194..9c96564f47bcff 100644 --- a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/gen_config.h @@ -36,8 +36,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -88,11 +88,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/callback-stub.cpp index ca1e449e6ca85c..19336db6b1db8c 100644 --- a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/callback-stub.cpp @@ -71,10 +71,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OCCUPANCY_SENSING_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/gen_config.h index b132bd22181ef3..8b1552bd8b41dc 100644 --- a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/gen_config.h @@ -36,8 +36,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -88,11 +88,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/callback-stub.cpp index 9c2e8f000263d1..8f55d69e7b7061 100644 --- a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/callback-stub.cpp @@ -74,10 +74,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_ON_OFF_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/gen_config.h index 8bba81d7dfeb55..f02657cb76ed75 100644 --- a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/gen_config.h @@ -37,8 +37,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -98,11 +98,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/callback-stub.cpp index 2d55cc054f6191..e822336cb98a90 100644 --- a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/callback-stub.cpp @@ -71,10 +71,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_ON_OFF_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/gen_config.h index 442bee7b704bce..97593d6acee774 100644 --- a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/gen_config.h @@ -37,8 +37,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -93,11 +93,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/callback-stub.cpp index 2d55cc054f6191..e822336cb98a90 100644 --- a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/callback-stub.cpp @@ -71,10 +71,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_ON_OFF_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/gen_config.h index 1af8fc3569f02c..88634672ff8db6 100644 --- a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/gen_config.h @@ -36,8 +36,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -88,11 +88,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/callback-stub.cpp index 433ef34a807b1b..1dcd805860ff90 100644 --- a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/callback-stub.cpp @@ -71,10 +71,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/gen_config.h index 8f89d74bd38aef..2f72b6fc5abbb3 100644 --- a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/gen_config.h @@ -36,8 +36,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -89,11 +89,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/callback-stub.cpp index 9c2e8f000263d1..8f55d69e7b7061 100644 --- a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/callback-stub.cpp @@ -74,10 +74,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_ON_OFF_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/gen_config.h index e94d951fef1fd8..fae385807dbb9d 100644 --- a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/gen_config.h @@ -37,8 +37,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -98,11 +98,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/callback-stub.cpp index e96b078c20f67e..ef0204d9b071c2 100644 --- a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/callback-stub.cpp @@ -71,10 +71,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/gen_config.h index 9f3f1b90735b51..cda6922dd251c2 100644 --- a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/gen_config.h @@ -36,8 +36,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -88,11 +88,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/callback-stub.cpp index aa5c2553e2c807..b014713b74e83b 100644 --- a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/callback-stub.cpp @@ -74,10 +74,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OCCUPANCY_SENSING_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/gen_config.h index 9fdd824d0a2720..ca53a677c9ce63 100644 --- a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/gen_config.h @@ -35,8 +35,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -88,11 +88,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/callback-stub.cpp b/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/callback-stub.cpp index 03a4db13d67622..e459c0fff0485b 100644 --- a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/callback-stub.cpp +++ b/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/callback-stub.cpp @@ -71,10 +71,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID: diff --git a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/gen_config.h b/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/gen_config.h index cf3aba222afd37..7bc5839d32774d 100644 --- a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/gen_config.h +++ b/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/gen_config.h @@ -35,8 +35,8 @@ #define EMBER_AF_BINDING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -83,11 +83,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/contact-sensor-app/zap-generated/callback-stub.cpp b/zzz_generated/contact-sensor-app/zap-generated/callback-stub.cpp index 23bedc6f847431..05356d75bfc935 100644 --- a/zzz_generated/contact-sensor-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/contact-sensor-app/zap-generated/callback-stub.cpp @@ -74,10 +74,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OCCUPANCY_SENSING_CLUSTER_ID: diff --git a/zzz_generated/contact-sensor-app/zap-generated/gen_config.h b/zzz_generated/contact-sensor-app/zap-generated/gen_config.h index e93e4b72742c90..019b5b88dd3bfc 100644 --- a/zzz_generated/contact-sensor-app/zap-generated/gen_config.h +++ b/zzz_generated/contact-sensor-app/zap-generated/gen_config.h @@ -34,8 +34,8 @@ #define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -82,11 +82,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp b/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp index 494df4dcc7dbf7..f35c36f0911d13 100644 --- a/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp +++ b/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp @@ -146,10 +146,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OCCUPANCY_SENSING_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 cc8430e7073f51..d73f3e587e5b60 100644 --- a/zzz_generated/controller-clusters/zap-generated/gen_config.h +++ b/zzz_generated/controller-clusters/zap-generated/gen_config.h @@ -41,8 +41,8 @@ #define EMBER_AF_ACCESS_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACTIONS_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_CLIENT_ENDPOINT_COUNT (1) @@ -146,11 +146,11 @@ #define EMBER_AF_PLUGIN_BASIC_CLIENT // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the client side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_CLIENT // Use this macro to check if the client side of the Localization Configuration cluster is included diff --git a/zzz_generated/light-switch-app/zap-generated/callback-stub.cpp b/zzz_generated/light-switch-app/zap-generated/callback-stub.cpp index 6de7b83a27c68f..9e468aef79816c 100644 --- a/zzz_generated/light-switch-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/light-switch-app/zap-generated/callback-stub.cpp @@ -77,10 +77,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_ON_OFF_CLUSTER_ID: diff --git a/zzz_generated/light-switch-app/zap-generated/gen_config.h b/zzz_generated/light-switch-app/zap-generated/gen_config.h index 77dc4cb1c9327a..d100152811f4a0 100644 --- a/zzz_generated/light-switch-app/zap-generated/gen_config.h +++ b/zzz_generated/light-switch-app/zap-generated/gen_config.h @@ -38,8 +38,8 @@ #define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -103,11 +103,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/lighting-app/nxp/zap-generated/callback-stub.cpp b/zzz_generated/lighting-app/nxp/zap-generated/callback-stub.cpp index b921402c5af1bd..83c3f4142cbe67 100644 --- a/zzz_generated/lighting-app/nxp/zap-generated/callback-stub.cpp +++ b/zzz_generated/lighting-app/nxp/zap-generated/callback-stub.cpp @@ -62,10 +62,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_ON_OFF_CLUSTER_ID: diff --git a/zzz_generated/lighting-app/nxp/zap-generated/gen_config.h b/zzz_generated/lighting-app/nxp/zap-generated/gen_config.h index f6c553a605b857..040e3e83be704a 100644 --- a/zzz_generated/lighting-app/nxp/zap-generated/gen_config.h +++ b/zzz_generated/lighting-app/nxp/zap-generated/gen_config.h @@ -36,8 +36,8 @@ #define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -89,11 +89,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/lighting-app/zap-generated/callback-stub.cpp b/zzz_generated/lighting-app/zap-generated/callback-stub.cpp index 4ca3b672166521..e2deb3f21a02ee 100644 --- a/zzz_generated/lighting-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/lighting-app/zap-generated/callback-stub.cpp @@ -77,10 +77,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OCCUPANCY_SENSING_CLUSTER_ID: diff --git a/zzz_generated/lighting-app/zap-generated/gen_config.h b/zzz_generated/lighting-app/zap-generated/gen_config.h index 6460a2243bdc9f..e21b517f347e6a 100644 --- a/zzz_generated/lighting-app/zap-generated/gen_config.h +++ b/zzz_generated/lighting-app/zap-generated/gen_config.h @@ -36,8 +36,8 @@ #define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -99,11 +99,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/lock-app/zap-generated/callback-stub.cpp b/zzz_generated/lock-app/zap-generated/callback-stub.cpp index 685899dcabeb9f..cbf5e5b568a9d4 100644 --- a/zzz_generated/lock-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/lock-app/zap-generated/callback-stub.cpp @@ -71,10 +71,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_ON_OFF_CLUSTER_ID: diff --git a/zzz_generated/lock-app/zap-generated/gen_config.h b/zzz_generated/lock-app/zap-generated/gen_config.h index b03704c9359648..aec5898a61e65f 100644 --- a/zzz_generated/lock-app/zap-generated/gen_config.h +++ b/zzz_generated/lock-app/zap-generated/gen_config.h @@ -34,8 +34,8 @@ #define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_POWER_SOURCE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -83,11 +83,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp b/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp index 35de014d60babc..e904d2f8e9f4b8 100644 --- a/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp @@ -56,7 +56,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID: diff --git a/zzz_generated/ota-provider-app/zap-generated/gen_config.h b/zzz_generated/ota-provider-app/zap-generated/gen_config.h index 9cb2ad12b81a37..05dd1b4c3782ab 100644 --- a/zzz_generated/ota-provider-app/zap-generated/gen_config.h +++ b/zzz_generated/ota-provider-app/zap-generated/gen_config.h @@ -32,7 +32,7 @@ #define EMBER_AF_ACCESS_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -61,7 +61,7 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the server side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER diff --git a/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp b/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp index 6e2e041de17600..297468bbdff66b 100644 --- a/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp @@ -65,10 +65,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_ON_OFF_CLUSTER_ID: diff --git a/zzz_generated/ota-requestor-app/zap-generated/gen_config.h b/zzz_generated/ota-requestor-app/zap-generated/gen_config.h index 2587d8673cecf8..e9384388a75c94 100644 --- a/zzz_generated/ota-requestor-app/zap-generated/gen_config.h +++ b/zzz_generated/ota-requestor-app/zap-generated/gen_config.h @@ -35,8 +35,8 @@ #define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (3) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -81,11 +81,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/pump-app/zap-generated/callback-stub.cpp b/zzz_generated/pump-app/zap-generated/callback-stub.cpp index c14f635ef53e2b..02837720241abc 100644 --- a/zzz_generated/pump-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/pump-app/zap-generated/callback-stub.cpp @@ -65,10 +65,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OCCUPANCY_SENSING_CLUSTER_ID: diff --git a/zzz_generated/pump-app/zap-generated/gen_config.h b/zzz_generated/pump-app/zap-generated/gen_config.h index 293c0db5486885..dfade4bd295293 100644 --- a/zzz_generated/pump-app/zap-generated/gen_config.h +++ b/zzz_generated/pump-app/zap-generated/gen_config.h @@ -36,8 +36,8 @@ #define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -93,11 +93,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp b/zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp index 2dcfd5c05e27f3..aa590c602dc390 100644 --- a/zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp @@ -62,10 +62,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_ON_OFF_CLUSTER_ID: diff --git a/zzz_generated/pump-controller-app/zap-generated/gen_config.h b/zzz_generated/pump-controller-app/zap-generated/gen_config.h index 8fc7c3c1d2d61c..fd78abdb672ecf 100644 --- a/zzz_generated/pump-controller-app/zap-generated/gen_config.h +++ b/zzz_generated/pump-controller-app/zap-generated/gen_config.h @@ -35,8 +35,8 @@ #define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_NETWORK_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GENERAL_DIAGNOSTICS_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -81,11 +81,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/thermostat/zap-generated/callback-stub.cpp b/zzz_generated/thermostat/zap-generated/callback-stub.cpp index 1522ea72978957..9e6402a1003382 100644 --- a/zzz_generated/thermostat/zap-generated/callback-stub.cpp +++ b/zzz_generated/thermostat/zap-generated/callback-stub.cpp @@ -74,10 +74,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID: diff --git a/zzz_generated/thermostat/zap-generated/gen_config.h b/zzz_generated/thermostat/zap-generated/gen_config.h index 35f4e7dd8ef7de..0f3fd1f8c1698d 100644 --- a/zzz_generated/thermostat/zap-generated/gen_config.h +++ b/zzz_generated/thermostat/zap-generated/gen_config.h @@ -37,8 +37,8 @@ #define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (2) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -111,11 +111,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR diff --git a/zzz_generated/tv-app/zap-generated/callback-stub.cpp b/zzz_generated/tv-app/zap-generated/callback-stub.cpp index 1757c0912158b6..224bb16051146c 100644 --- a/zzz_generated/tv-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/tv-app/zap-generated/callback-stub.cpp @@ -101,7 +101,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; case ZCL_ON_OFF_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 2a3143b7aec408..4a5da8ae21fb5d 100644 --- a/zzz_generated/tv-app/zap-generated/gen_config.h +++ b/zzz_generated/tv-app/zap-generated/gen_config.h @@ -36,7 +36,7 @@ #define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -111,7 +111,7 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the server side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER 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 d9abefdc94d533..3a33bc30185ea7 100644 --- a/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp @@ -110,7 +110,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; case ZCL_ON_OFF_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 6e8cb5938bb2f4..e0accdb2b7e1a5 100644 --- a/zzz_generated/tv-casting-app/zap-generated/gen_config.h +++ b/zzz_generated/tv-casting-app/zap-generated/gen_config.h @@ -42,7 +42,7 @@ #define EMBER_AF_BINDING_CLUSTER_SERVER_ENDPOINT_COUNT (2) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -154,7 +154,7 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the server side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER diff --git a/zzz_generated/window-app/zap-generated/callback-stub.cpp b/zzz_generated/window-app/zap-generated/callback-stub.cpp index 1155c2f1d92af0..fe5ce88834b8eb 100644 --- a/zzz_generated/window-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/window-app/zap-generated/callback-stub.cpp @@ -68,10 +68,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_NETWORK_COMMISSIONING_CLUSTER_ID: emberAfNetworkCommissioningClusterInitCallback(endpoint); break; - case ZCL_OTA_PROVIDER_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_ID: emberAfOtaSoftwareUpdateProviderClusterInitCallback(endpoint); break; - case ZCL_OTA_REQUESTOR_CLUSTER_ID: + case ZCL_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_ID: emberAfOtaSoftwareUpdateRequestorClusterInitCallback(endpoint); break; case ZCL_OPERATIONAL_CREDENTIALS_CLUSTER_ID: diff --git a/zzz_generated/window-app/zap-generated/gen_config.h b/zzz_generated/window-app/zap-generated/gen_config.h index a9e25bd41bdb4a..a7272945e18d7e 100644 --- a/zzz_generated/window-app/zap-generated/gen_config.h +++ b/zzz_generated/window-app/zap-generated/gen_config.h @@ -35,8 +35,8 @@ #define EMBER_AF_DESCRIPTOR_CLUSTER_SERVER_ENDPOINT_COUNT (3) #define EMBER_AF_ACCESS_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BASIC_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_OTA_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_LOCALIZATION_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_TIME_FORMAT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_UNIT_LOCALIZATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) @@ -100,11 +100,11 @@ #define EMBER_AF_PLUGIN_BASIC // Use this macro to check if the client side of the OTA Software Update Provider cluster is included -#define ZCL_USING_OTA_PROVIDER_CLUSTER_CLIENT +#define ZCL_USING_OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_PROVIDER_CLIENT // Use this macro to check if the server side of the OTA Software Update Requestor cluster is included -#define ZCL_USING_OTA_REQUESTOR_CLUSTER_SERVER +#define ZCL_USING_OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR_SERVER #define EMBER_AF_PLUGIN_OTA_SOFTWARE_UPDATE_REQUESTOR