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 0140d4b58d21ef..ff682be0830d2f 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 @@ -7710,7 +7710,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -7736,7 +7736,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 0, "attributes": [ @@ -14102,7 +14102,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -14128,7 +14128,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "server", "enabled": 1, "attributes": [ @@ -15308,7 +15308,7 @@ "name": "Thermostat User Interface Configuration", "code": 516, "mfgCode": null, - "define": "THERMOSTAT_UI_CONFIG_CLUSTER", + "define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -15334,7 +15334,7 @@ "name": "Thermostat User Interface Configuration", "code": 516, "mfgCode": null, - "define": "THERMOSTAT_UI_CONFIG_CLUSTER", + "define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER", "side": "server", "enabled": 1, "attributes": [ @@ -16626,7 +16626,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -16652,7 +16652,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 1, "attributes": [ @@ -24128,7 +24128,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -24154,7 +24154,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_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 832fc013e383b2..b6b357a25431b8 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 @@ -7710,7 +7710,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -7736,7 +7736,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 0, "attributes": [ @@ -13872,7 +13872,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -13898,7 +13898,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "server", "enabled": 1, "attributes": [ @@ -15014,7 +15014,7 @@ "name": "Thermostat User Interface Configuration", "code": 516, "mfgCode": null, - "define": "THERMOSTAT_UI_CONFIG_CLUSTER", + "define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -15040,7 +15040,7 @@ "name": "Thermostat User Interface Configuration", "code": 516, "mfgCode": null, - "define": "THERMOSTAT_UI_CONFIG_CLUSTER", + "define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER", "side": "server", "enabled": 1, "attributes": [ @@ -16332,7 +16332,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -16358,7 +16358,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 1, "attributes": [ @@ -23904,7 +23904,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -23930,7 +23930,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap index 703f9caf5da8db..c8ea2b9adc1c19 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -7320,7 +7320,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -7362,7 +7362,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp index 98fcfb1163278f..5007ceed7402cc 100644 --- a/examples/bridge-app/linux/main.cpp +++ b/examples/bridge-app/linux/main.cpp @@ -216,7 +216,7 @@ DECLARE_DYNAMIC_ATTRIBUTE(ZCL_TEMP_MEASURED_VALUE_ATTRIBUTE_ID, INT16S, 2, 0), // - Descriptor // - Bridged Device Basic DECLARE_DYNAMIC_CLUSTER_LIST_BEGIN(bridgedTempSensorClusters) -DECLARE_DYNAMIC_CLUSTER(ZCL_TEMP_MEASUREMENT_CLUSTER_ID, tempSensorAttrs, nullptr, nullptr), +DECLARE_DYNAMIC_CLUSTER(ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID, tempSensorAttrs, nullptr, nullptr), DECLARE_DYNAMIC_CLUSTER(ZCL_DESCRIPTOR_CLUSTER_ID, descriptorAttrs, nullptr, nullptr), DECLARE_DYNAMIC_CLUSTER(ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID, bridgedDeviceBasicAttrs, nullptr, nullptr), DECLARE_DYNAMIC_CLUSTER_LIST_END; diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap index c2b6b7edfea0c3..59fdbd0a05a02d 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap @@ -5954,7 +5954,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -5996,7 +5996,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_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 bb182f85f4a275..a61f58c3b25dcf 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -7334,7 +7334,7 @@ "name": "Thermostat User Interface Configuration", "code": 516, "mfgCode": null, - "define": "THERMOSTAT_UI_CONFIG_CLUSTER", + "define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER", "side": "client", "enabled": 0 }, @@ -7342,7 +7342,7 @@ "name": "Thermostat User Interface Configuration", "code": 516, "mfgCode": null, - "define": "THERMOSTAT_UI_CONFIG_CLUSTER", + "define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER", "side": "server", "enabled": 1, "attributes": [ @@ -7480,7 +7480,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 1, "attributes": [ @@ -7522,7 +7522,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 0 }, diff --git a/examples/common/pigweed/protos/attributes_service.proto b/examples/common/pigweed/protos/attributes_service.proto index 6aa352055f7d46..4c7eb3b13b0472 100644 --- a/examples/common/pigweed/protos/attributes_service.proto +++ b/examples/common/pigweed/protos/attributes_service.proto @@ -112,15 +112,15 @@ enum ClusterType { ZCL_DOOR_LOCK_CLUSTER_ID = 0x0101; ZCL_WINDOW_COVERING_CLUSTER_ID = 0x0102; ZCL_BARRIER_CONTROL_CLUSTER_ID = 0x0103; - ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID = 0x0200; + ZCL_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_ID = 0x0200; ZCL_THERMOSTAT_CLUSTER_ID = 0x0201; ZCL_FAN_CONTROL_CLUSTER_ID = 0x0202; ZCL_DEHUMID_CONTROL_CLUSTER_ID = 0x0203; - ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID = 0x0204; + ZCL_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_ID = 0x0204; ZCL_COLOR_CONTROL_CLUSTER_ID = 0x0300; ZCL_BALLAST_CONFIGURATION_CLUSTER_ID = 0x0301; ZCL_ILLUMINANCE_MEASUREMENT_CLUSTER_ID = 0x0400; - ZCL_TEMP_MEASUREMENT_CLUSTER_ID = 0x0402; + ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID = 0x0402; ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID = 0x0403; ZCL_FLOW_MEASUREMENT_CLUSTER_ID = 0x0404; ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID = 0x0405; diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap index 703f9caf5da8db..c8ea2b9adc1c19 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap @@ -7320,7 +7320,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -7362,7 +7362,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/log-source-app/log-source-common/log-source-app.zap b/examples/log-source-app/log-source-common/log-source-app.zap index 75a395e11cedce..ba9ef1ecc2e27b 100644 --- a/examples/log-source-app/log-source-common/log-source-app.zap +++ b/examples/log-source-app/log-source-common/log-source-app.zap @@ -3402,7 +3402,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -3428,7 +3428,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 0, "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 1e1d94edc5a5eb..15556db6500574 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 @@ -4638,7 +4638,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -4664,7 +4664,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_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 689062c272efbd..d86fd54c3fc206 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 @@ -4888,7 +4888,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -4914,7 +4914,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index 00641abcbd47d9..a4bc36bb1d4283 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -4252,7 +4252,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -4278,7 +4278,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "server", "enabled": 1, "attributes": [ @@ -5104,7 +5104,7 @@ "name": "Thermostat User Interface Configuration", "code": 516, "mfgCode": null, - "define": "THERMOSTAT_UI_CONFIG_CLUSTER", + "define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER", "side": "client", "enabled": 1, "attributes": [ @@ -5146,7 +5146,7 @@ "name": "Thermostat User Interface Configuration", "code": 516, "mfgCode": null, - "define": "THERMOSTAT_UI_CONFIG_CLUSTER", + "define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER", "side": "server", "enabled": 1, "attributes": [ @@ -5432,7 +5432,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 1, "attributes": [ @@ -5458,7 +5458,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index 00641abcbd47d9..a4bc36bb1d4283 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -4252,7 +4252,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -4278,7 +4278,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "server", "enabled": 1, "attributes": [ @@ -5104,7 +5104,7 @@ "name": "Thermostat User Interface Configuration", "code": 516, "mfgCode": null, - "define": "THERMOSTAT_UI_CONFIG_CLUSTER", + "define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER", "side": "client", "enabled": 1, "attributes": [ @@ -5146,7 +5146,7 @@ "name": "Thermostat User Interface Configuration", "code": 516, "mfgCode": null, - "define": "THERMOSTAT_UI_CONFIG_CLUSTER", + "define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER", "side": "server", "enabled": 1, "attributes": [ @@ -5432,7 +5432,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 1, "attributes": [ @@ -5458,7 +5458,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_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 cf478a2eacd174..a994782d3abe1f 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -6694,7 +6694,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -6720,7 +6720,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "server", "enabled": 1, "attributes": [ @@ -7178,7 +7178,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -7220,7 +7220,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_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 21d254963a7942..3625f8859ea130 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 @@ -6100,7 +6100,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "client", "enabled": 1, "attributes": [ @@ -6142,7 +6142,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "server", "enabled": 0, "attributes": [ @@ -6296,7 +6296,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 1, "attributes": [ @@ -6338,7 +6338,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap index bf93597d2c8f79..397a94a8355600 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap @@ -3986,7 +3986,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -4012,7 +4012,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 1, "attributes": [ diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index b9fe393b9dafc5..0a93d9180ca5c4 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -6782,7 +6782,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -6808,7 +6808,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 0, "attributes": [ @@ -10746,7 +10746,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -10772,7 +10772,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "server", "enabled": 0, "attributes": [ @@ -12356,7 +12356,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -12382,7 +12382,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_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 7c75cb7d7e4156..14ca77b878ee59 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -6676,7 +6676,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -6702,7 +6702,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 0, "attributes": [ 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 a75c0929aef1fe..649e45a964dade 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 @@ -6528,7 +6528,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -6554,7 +6554,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 0, "attributes": [ @@ -10334,7 +10334,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -10360,7 +10360,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "server", "enabled": 0, "attributes": [ @@ -11752,7 +11752,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -11778,7 +11778,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 0, "attributes": [ @@ -16178,7 +16178,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 0, "attributes": [ @@ -16204,7 +16204,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "server", "enabled": 0, "attributes": [ diff --git a/src/app/util/debug-printing-test.h b/src/app/util/debug-printing-test.h index 75d106cd3737d5..e399b249b91dba 100644 --- a/src/app/util/debug-printing-test.h +++ b/src/app/util/debug-printing-test.h @@ -50,16 +50,16 @@ #define EMBER_AF_PRINT_DOOR_LOCK_CLUSTER 0x0240 #define EMBER_AF_PRINT_WINDOW_COVERING_CLUSTER 0x0280 #define EMBER_AF_PRINT_BARRIER_CONTROL_CLUSTER 0x0301 -#define EMBER_AF_PRINT_PUMP_CONFIG_CONTROL_CLUSTER 0x0302 +#define EMBER_AF_PRINT_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER 0x0302 #define EMBER_AF_PRINT_THERMOSTAT_CLUSTER 0x0304 #define EMBER_AF_PRINT_FAN_CONTROL_CLUSTER 0x0308 #define EMBER_AF_PRINT_DEHUMID_CONTROL_CLUSTER 0x0310 -#define EMBER_AF_PRINT_THERMOSTAT_UI_CONFIG_CLUSTER 0x0320 +#define EMBER_AF_PRINT_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER 0x0320 #define EMBER_AF_PRINT_COLOR_CONTROL_CLUSTER 0x0340 #define EMBER_AF_PRINT_BALLAST_CONFIGURATION_CLUSTER 0x0380 #define EMBER_AF_PRINT_ILLUM_MEASUREMENT_CLUSTER 0x0401 #define EMBER_AF_PRINT_ILLUM_LEVEL_SENSING_CLUSTER 0x0402 -#define EMBER_AF_PRINT_TEMP_MEASUREMENT_CLUSTER 0x0404 +#define EMBER_AF_PRINT_TEMPERATURE_MEASUREMENT_CLUSTER 0x0404 #define EMBER_AF_PRINT_PRESSURE_MEASUREMENT_CLUSTER 0x0408 #define EMBER_AF_PRINT_FLOW_MEASUREMENT_CLUSTER 0x0410 #define EMBER_AF_PRINT_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER 0x0420 diff --git a/src/app/util/debug-printing.h b/src/app/util/debug-printing.h index e621d19a1e41d3..65ccb96743ea50 100644 --- a/src/app/util/debug-printing.h +++ b/src/app/util/debug-printing.h @@ -600,19 +600,21 @@ #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_BARRIER_CONTROL_CLUSTER) // Printing macros for cluster: Pump Configuration and Control -#if defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_PUMP_CONFIG_CONTROL_CLUSTER) -#define emberAfPumpConfigControlClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_PUMP_CONFIG_CONTROL_CLUSTER, __VA_ARGS__) -#define emberAfPumpConfigControlClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_PUMP_CONFIG_CONTROL_CLUSTER, __VA_ARGS__) +#if defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER) +#define emberAfPumpConfigControlClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER, __VA_ARGS__) +#define emberAfPumpConfigControlClusterPrintln(...) \ + emberAfPrintln(EMBER_AF_PRINT_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. #define emberAfPumpConfigControlClusterFlush() #define emberAfPumpConfigControlClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_PUMP_CONFIG_CONTROL_CLUSTER)) \ + if (emberAfPrintEnabled(EMBER_AF_PRINT_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER)) \ { \ x; \ } #define emberAfPumpConfigControlClusterPrintBuffer(buffer, len, withSpace) \ - emberAfPrintBuffer(EMBER_AF_PRINT_PUMP_CONFIG_CONTROL_CLUSTER, (buffer), (len), (withSpace)) -#define emberAfPumpConfigControlClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_PUMP_CONFIG_CONTROL_CLUSTER, (buffer)) + emberAfPrintBuffer(EMBER_AF_PRINT_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER, (buffer), (len), (withSpace)) +#define emberAfPumpConfigControlClusterPrintString(buffer) \ + emberAfPrintString(EMBER_AF_PRINT_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER, (buffer)) #else #define emberAfPumpConfigControlClusterPrint(...) #define emberAfPumpConfigControlClusterPrintln(...) @@ -620,7 +622,7 @@ #define emberAfPumpConfigControlClusterDebugExec(x) #define emberAfPumpConfigControlClusterPrintBuffer(buffer, len, withSpace) #define emberAfPumpConfigControlClusterPrintString(buffer) -#endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_PUMP_CONFIG_CONTROL_CLUSTER) +#endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER) // Printing macros for cluster: Thermostat #if defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_THERMOSTAT_CLUSTER) @@ -692,20 +694,22 @@ #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_DEHUMID_CONTROL_CLUSTER) // Printing macros for cluster: Thermostat User Interface Configuration -#if defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_THERMOSTAT_UI_CONFIG_CLUSTER) -#define emberAfThermostatUiConfigClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_THERMOSTAT_UI_CONFIG_CLUSTER, __VA_ARGS__) -#define emberAfThermostatUiConfigClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_THERMOSTAT_UI_CONFIG_CLUSTER, __VA_ARGS__) +#if defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER) +#define emberAfThermostatUiConfigClusterPrint(...) \ + emberAfPrint(EMBER_AF_PRINT_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER, __VA_ARGS__) +#define emberAfThermostatUiConfigClusterPrintln(...) \ + emberAfPrintln(EMBER_AF_PRINT_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. #define emberAfThermostatUiConfigClusterFlush() #define emberAfThermostatUiConfigClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_THERMOSTAT_UI_CONFIG_CLUSTER)) \ + if (emberAfPrintEnabled(EMBER_AF_PRINT_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER)) \ { \ x; \ } #define emberAfThermostatUiConfigClusterPrintBuffer(buffer, len, withSpace) \ - emberAfPrintBuffer(EMBER_AF_PRINT_THERMOSTAT_UI_CONFIG_CLUSTER, (buffer), (len), (withSpace)) + emberAfPrintBuffer(EMBER_AF_PRINT_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER, (buffer), (len), (withSpace)) #define emberAfThermostatUiConfigClusterPrintString(buffer) \ - emberAfPrintString(EMBER_AF_PRINT_THERMOSTAT_UI_CONFIG_CLUSTER, (buffer)) + emberAfPrintString(EMBER_AF_PRINT_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER, (buffer)) #else #define emberAfThermostatUiConfigClusterPrint(...) #define emberAfThermostatUiConfigClusterPrintln(...) @@ -713,7 +717,7 @@ #define emberAfThermostatUiConfigClusterDebugExec(x) #define emberAfThermostatUiConfigClusterPrintBuffer(buffer, len, withSpace) #define emberAfThermostatUiConfigClusterPrintString(buffer) -#endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_THERMOSTAT_UI_CONFIG_CLUSTER) +#endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER) // Printing macros for cluster: Color Control #if defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_COLOR_CONTROL_CLUSTER) @@ -809,19 +813,20 @@ #endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ILLUM_LEVEL_SENSING_CLUSTER) // Printing macros for cluster: Temperature Measurement -#if defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_TEMP_MEASUREMENT_CLUSTER) -#define emberAfTempMeasurementClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_TEMP_MEASUREMENT_CLUSTER, __VA_ARGS__) -#define emberAfTempMeasurementClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_TEMP_MEASUREMENT_CLUSTER, __VA_ARGS__) +#if defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_TEMPERATURE_MEASUREMENT_CLUSTER) +#define emberAfTempMeasurementClusterPrint(...) emberAfPrint(EMBER_AF_PRINT_TEMPERATURE_MEASUREMENT_CLUSTER, __VA_ARGS__) +#define emberAfTempMeasurementClusterPrintln(...) emberAfPrintln(EMBER_AF_PRINT_TEMPERATURE_MEASUREMENT_CLUSTER, __VA_ARGS__) // Blocking IO is enabled for all serial ports, therefore flush calls are unnecessary. #define emberAfTempMeasurementClusterFlush() #define emberAfTempMeasurementClusterDebugExec(x) \ - if (emberAfPrintEnabled(EMBER_AF_PRINT_TEMP_MEASUREMENT_CLUSTER)) \ + if (emberAfPrintEnabled(EMBER_AF_PRINT_TEMPERATURE_MEASUREMENT_CLUSTER)) \ { \ x; \ } #define emberAfTempMeasurementClusterPrintBuffer(buffer, len, withSpace) \ - emberAfPrintBuffer(EMBER_AF_PRINT_TEMP_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) -#define emberAfTempMeasurementClusterPrintString(buffer) emberAfPrintString(EMBER_AF_PRINT_TEMP_MEASUREMENT_CLUSTER, (buffer)) + emberAfPrintBuffer(EMBER_AF_PRINT_TEMPERATURE_MEASUREMENT_CLUSTER, (buffer), (len), (withSpace)) +#define emberAfTempMeasurementClusterPrintString(buffer) \ + emberAfPrintString(EMBER_AF_PRINT_TEMPERATURE_MEASUREMENT_CLUSTER, (buffer)) #else #define emberAfTempMeasurementClusterPrint(...) #define emberAfTempMeasurementClusterPrintln(...) @@ -829,7 +834,7 @@ #define emberAfTempMeasurementClusterDebugExec(x) #define emberAfTempMeasurementClusterPrintBuffer(buffer, len, withSpace) #define emberAfTempMeasurementClusterPrintString(buffer) -#endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_TEMP_MEASUREMENT_CLUSTER) +#endif // defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_TEMPERATURE_MEASUREMENT_CLUSTER) // Printing macros for cluster: Pressure Measurement #if defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_PRESSURE_MEASUREMENT_CLUSTER) diff --git a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml index 3ca77787b8ef28..0d00dc829a7385 100644 --- a/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml @@ -21,7 +21,7 @@ limitations under the License. HVAC An interface for configuring and controlling pumps. 0x0200 - PUMP_CONFIG_CONTROL_CLUSTER + PUMP_CONFIGURATION_AND_CONTROL_CLUSTER true true diff --git a/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml index c2ab5e882273ae..454583d1d825d0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/temperature-measurement-cluster.xml @@ -21,7 +21,7 @@ limitations under the License. Measurement & Sensing Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. 0x0402 - TEMP_MEASUREMENT_CLUSTER + TEMPERATURE_MEASUREMENT_CLUSTER true true MeasuredValue diff --git a/src/app/zap-templates/zcl/data-model/silabs/ha.xml b/src/app/zap-templates/zcl/data-model/silabs/ha.xml index 2bded3c28c8b3d..50e44915a729e3 100644 --- a/src/app/zap-templates/zcl/data-model/silabs/ha.xml +++ b/src/app/zap-templates/zcl/data-model/silabs/ha.xml @@ -94,7 +94,7 @@ limitations under the License. HVAC An interface for configuring the user interface of a thermostat (which may be remote from the thermostat). 0x0204 - THERMOSTAT_UI_CONFIG_CLUSTER + THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER true true temperature display mode diff --git a/src/app/zap_cluster_list.py b/src/app/zap_cluster_list.py index 6a4380749d6dd8..d5940e92e20db0 100755 --- a/src/app/zap_cluster_list.py +++ b/src/app/zap_cluster_list.py @@ -69,17 +69,17 @@ 'PROXY_CONFIGURATION_CLUSTER': [], 'PROXY_DISCOVERY_CLUSTER': [], 'PROXY_VALID_CLUSTER': [], - 'PUMP_CONFIG_CONTROL_CLUSTER': ['pump-configuration-and-control-server'], + 'PUMP_CONFIGURATION_AND_CONTROL_CLUSTER': ['pump-configuration-and-control-server'], 'PWM_CLUSTER': [], 'RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER': [], 'SCENES_CLUSTER': ['scenes'], 'SOFTWARE_DIAGNOSTICS_CLUSTER': ['software-diagnostics-server'], 'SWITCH_CLUSTER': ['switch-server'], 'TARGET_NAVIGATOR_CLUSTER': ['target-navigator-server'], - 'TEMP_MEASUREMENT_CLUSTER': [], + 'TEMPERATURE_MEASUREMENT_CLUSTER': [], 'TEST_CLUSTER': ['test-cluster-server'], 'THERMOSTAT_CLUSTER': ['thermostat-server'], - 'THERMOSTAT_UI_CONFIG_CLUSTER': ['thermostat-user-interface-configuration-server'], + 'THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER': ['thermostat-user-interface-configuration-server'], 'THREAD_NETWORK_DIAGNOSTICS_CLUSTER': ['thread-network-diagnostics-server'], 'TIME_CLUSTER': [], 'TIME_FORMAT_LOCALIZATION_CLUSTER': ['time-format-localization-server'], @@ -154,17 +154,17 @@ 'PROXY_CONFIGURATION_CLUSTER': [], 'PROXY_DISCOVERY_CLUSTER': [], 'PROXY_VALID_CLUSTER': [], - 'PUMP_CONFIG_CONTROL_CLUSTER': ['pump-configuration-and-control-client'], + 'PUMP_CONFIGURATION_AND_CONTROL_CLUSTER': ['pump-configuration-and-control-client'], 'PWM_CLUSTER': [], 'RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER': [], 'SCENES_CLUSTER': [], 'SOFTWARE_DIAGNOSTICS_CLUSTER': [], 'SWITCH_CLUSTER': [], 'TARGET_NAVIGATOR_CLUSTER': [], - 'TEMP_MEASUREMENT_CLUSTER': [], + 'TEMPERATURE_MEASUREMENT_CLUSTER': [], 'TEST_CLUSTER': [], 'THERMOSTAT_CLUSTER': ['thermostat-client'], - 'THERMOSTAT_UI_CONFIG_CLUSTER': [], + 'THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER': [], 'THREAD_NETWORK_DIAGNOSTICS_CLUSTER': [], 'TIME_CLUSTER': [], 'TIME_FORMAT_LOCALIZATION_CLUSTER': [], diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index f098507e6d168c..93595ee8884bc1 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -11036,7 +11036,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "client", "enabled": 1, "attributes": [ @@ -11078,7 +11078,7 @@ "name": "Pump Configuration and Control", "code": 512, "mfgCode": null, - "define": "PUMP_CONFIG_CONTROL_CLUSTER", + "define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER", "side": "server", "enabled": 0, "attributes": [ @@ -12242,7 +12242,7 @@ "name": "Thermostat User Interface Configuration", "code": 516, "mfgCode": null, - "define": "THERMOSTAT_UI_CONFIG_CLUSTER", + "define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER", "side": "client", "enabled": 1, "attributes": [ @@ -12268,7 +12268,7 @@ "name": "Thermostat User Interface Configuration", "code": 516, "mfgCode": null, - "define": "THERMOSTAT_UI_CONFIG_CLUSTER", + "define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER", "side": "server", "enabled": 0, "attributes": [ @@ -14060,7 +14060,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_CLUSTER", "side": "client", "enabled": 1, "attributes": [ @@ -14086,7 +14086,7 @@ "name": "Temperature Measurement", "code": 1026, "mfgCode": null, - "define": "TEMP_MEASUREMENT_CLUSTER", + "define": "TEMPERATURE_MEASUREMENT_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 18e461541df60b..61ec6f7d8113c1 100644 --- a/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp @@ -170,7 +170,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID: emberAfPressureMeasurementClusterInitCallback(endpoint); break; - case ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID: + case ZCL_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_ID: emberAfPumpConfigurationAndControlClusterInitCallback(endpoint); break; case ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID: @@ -188,7 +188,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_TARGET_NAVIGATOR_CLUSTER_ID: emberAfTargetNavigatorClusterInitCallback(endpoint); break; - case ZCL_TEMP_MEASUREMENT_CLUSTER_ID: + case ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID: emberAfTemperatureMeasurementClusterInitCallback(endpoint); break; case ZCL_TEST_CLUSTER_ID: @@ -197,7 +197,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_THERMOSTAT_CLUSTER_ID: emberAfThermostatClusterInitCallback(endpoint); break; - case ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID: + case ZCL_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_ID: emberAfThermostatUserInterfaceConfigurationClusterInitCallback(endpoint); break; case ZCL_THREAD_NETWORK_DIAGNOSTICS_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 cc74990add77da..2d19636d3fde57 100644 --- a/zzz_generated/all-clusters-app/zap-generated/gen_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/gen_config.h @@ -67,13 +67,13 @@ #define EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_BARRIER_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (2) @@ -302,7 +302,7 @@ #define EMBER_AF_PLUGIN_BARRIER_CONTROL // Use this macro to check if the server side of the Pump Configuration and Control cluster is included -#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER +#define ZCL_USING_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER #define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_SERVER #define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL @@ -317,7 +317,7 @@ #define EMBER_AF_PLUGIN_FAN_CONTROL // Use this macro to check if the server side of the Thermostat User Interface Configuration cluster is included -#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER +#define ZCL_USING_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_SERVER #define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_SERVER #define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION @@ -336,7 +336,7 @@ #define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT // Use this macro to check if the server side of the Temperature Measurement cluster is included -#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER +#define ZCL_USING_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT 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 1d2e00ad271239..0aa65c3a9cc630 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 @@ -155,7 +155,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID: emberAfPressureMeasurementClusterInitCallback(endpoint); break; - case ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID: + case ZCL_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_ID: emberAfPumpConfigurationAndControlClusterInitCallback(endpoint); break; case ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID: @@ -173,7 +173,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_TARGET_NAVIGATOR_CLUSTER_ID: emberAfTargetNavigatorClusterInitCallback(endpoint); break; - case ZCL_TEMP_MEASUREMENT_CLUSTER_ID: + case ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID: emberAfTemperatureMeasurementClusterInitCallback(endpoint); break; case ZCL_TEST_CLUSTER_ID: @@ -182,7 +182,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_THERMOSTAT_CLUSTER_ID: emberAfThermostatClusterInitCallback(endpoint); break; - case ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID: + case ZCL_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_ID: emberAfThermostatUserInterfaceConfigurationClusterInitCallback(endpoint); break; case ZCL_THREAD_NETWORK_DIAGNOSTICS_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 3fb4f9afdf657a..747dc5a6c168a3 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 @@ -64,13 +64,13 @@ #define EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_DOOR_LOCK_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_FAN_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (2) @@ -282,7 +282,7 @@ #define EMBER_AF_PLUGIN_WINDOW_COVERING // Use this macro to check if the server side of the Pump Configuration and Control cluster is included -#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER +#define ZCL_USING_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER #define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_SERVER #define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL @@ -297,7 +297,7 @@ #define EMBER_AF_PLUGIN_FAN_CONTROL // Use this macro to check if the server side of the Thermostat User Interface Configuration cluster is included -#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER +#define ZCL_USING_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_SERVER #define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_SERVER #define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION @@ -316,7 +316,7 @@ #define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT // Use this macro to check if the server side of the Temperature Measurement cluster is included -#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER +#define ZCL_USING_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT 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 22078f7162e8fe..e0198f9c851383 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 @@ -155,7 +155,7 @@ static constexpr chip::ClusterId ZCL_WINDOW_COVERING_CLUSTER_ID = 0x0102; static constexpr chip::ClusterId ZCL_BARRIER_CONTROL_CLUSTER_ID = 0x0103; // Definitions for cluster: Pump Configuration and Control -static constexpr chip::ClusterId ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID = 0x0200; +static constexpr chip::ClusterId ZCL_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_ID = 0x0200; // Definitions for cluster: Thermostat static constexpr chip::ClusterId ZCL_THERMOSTAT_CLUSTER_ID = 0x0201; @@ -164,7 +164,7 @@ static constexpr chip::ClusterId ZCL_THERMOSTAT_CLUSTER_ID = 0x0201; static constexpr chip::ClusterId ZCL_FAN_CONTROL_CLUSTER_ID = 0x0202; // Definitions for cluster: Thermostat User Interface Configuration -static constexpr chip::ClusterId ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID = 0x0204; +static constexpr chip::ClusterId ZCL_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_ID = 0x0204; // Definitions for cluster: Color Control static constexpr chip::ClusterId ZCL_COLOR_CONTROL_CLUSTER_ID = 0x0300; @@ -176,7 +176,7 @@ static constexpr chip::ClusterId ZCL_BALLAST_CONFIGURATION_CLUSTER_ID = 0x0301; static constexpr chip::ClusterId ZCL_ILLUMINANCE_MEASUREMENT_CLUSTER_ID = 0x0400; // Definitions for cluster: Temperature Measurement -static constexpr chip::ClusterId ZCL_TEMP_MEASUREMENT_CLUSTER_ID = 0x0402; +static constexpr chip::ClusterId ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID = 0x0402; // Definitions for cluster: Pressure Measurement static constexpr chip::ClusterId ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID = 0x0403; 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 77103d14f33b38..0083c964061f24 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 @@ -294,10 +294,12 @@ #define CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER #endif -#if defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER { ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID, "Pump Configuration and Control" }, +#if defined(ZCL_USING_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER) || \ + defined(ZCL_USING_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER \ + { ZCL_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_ID, "Pump Configuration and Control" }, #else -#define CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER +#define CHIP_PRINTCLUSTER_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER #endif #if defined(ZCL_USING_THERMOSTAT_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_CLUSTER_CLIENT) @@ -312,11 +314,12 @@ #define CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER #endif -#if defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER) || defined(ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER \ - { ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID, "Thermostat User Interface Configuration" }, +#if defined(ZCL_USING_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_SERVER) || \ + defined(ZCL_USING_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER \ + { ZCL_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_ID, "Thermostat User Interface Configuration" }, #else -#define CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER +#define CHIP_PRINTCLUSTER_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER #endif #if defined(ZCL_USING_COLOR_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_COLOR_CONTROL_CLUSTER_CLIENT) @@ -337,10 +340,10 @@ #define CHIP_PRINTCLUSTER_ILLUMINANCE_MEASUREMENT_CLUSTER #endif -#if defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER { ZCL_TEMP_MEASUREMENT_CLUSTER_ID, "Temperature Measurement" }, +#if defined(ZCL_USING_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_TEMPERATURE_MEASUREMENT_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_TEMPERATURE_MEASUREMENT_CLUSTER { ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID, "Temperature Measurement" }, #else -#define CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER +#define CHIP_PRINTCLUSTER_TEMPERATURE_MEASUREMENT_CLUSTER #endif #if defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_SERVER) || defined(ZCL_USING_PRESSURE_MEASUREMENT_CLUSTER_CLIENT) @@ -504,14 +507,14 @@ CHIP_PRINTCLUSTER_DOOR_LOCK_CLUSTER \ CHIP_PRINTCLUSTER_WINDOW_COVERING_CLUSTER \ CHIP_PRINTCLUSTER_BARRIER_CONTROL_CLUSTER \ - CHIP_PRINTCLUSTER_PUMP_CONFIG_CONTROL_CLUSTER \ + CHIP_PRINTCLUSTER_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER \ CHIP_PRINTCLUSTER_THERMOSTAT_CLUSTER \ CHIP_PRINTCLUSTER_FAN_CONTROL_CLUSTER \ - CHIP_PRINTCLUSTER_THERMOSTAT_UI_CONFIG_CLUSTER \ + CHIP_PRINTCLUSTER_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER \ CHIP_PRINTCLUSTER_COLOR_CONTROL_CLUSTER \ CHIP_PRINTCLUSTER_BALLAST_CONFIGURATION_CLUSTER \ CHIP_PRINTCLUSTER_ILLUMINANCE_MEASUREMENT_CLUSTER \ - CHIP_PRINTCLUSTER_TEMP_MEASUREMENT_CLUSTER \ + CHIP_PRINTCLUSTER_TEMPERATURE_MEASUREMENT_CLUSTER \ CHIP_PRINTCLUSTER_PRESSURE_MEASUREMENT_CLUSTER \ CHIP_PRINTCLUSTER_FLOW_MEASUREMENT_CLUSTER \ CHIP_PRINTCLUSTER_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER \ diff --git a/zzz_generated/bridge-app/zap-generated/callback-stub.cpp b/zzz_generated/bridge-app/zap-generated/callback-stub.cpp index 474a1352bb45bc..73eefd115c4702 100644 --- a/zzz_generated/bridge-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/bridge-app/zap-generated/callback-stub.cpp @@ -86,7 +86,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_SWITCH_CLUSTER_ID: emberAfSwitchClusterInitCallback(endpoint); break; - case ZCL_TEMP_MEASUREMENT_CLUSTER_ID: + case ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID: emberAfTemperatureMeasurementClusterInitCallback(endpoint); break; case ZCL_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID: diff --git a/zzz_generated/bridge-app/zap-generated/gen_config.h b/zzz_generated/bridge-app/zap-generated/gen_config.h index f675999cfb095f..47c85fe3ba03fd 100644 --- a/zzz_generated/bridge-app/zap-generated/gen_config.h +++ b/zzz_generated/bridge-app/zap-generated/gen_config.h @@ -54,7 +54,7 @@ #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) /**** Cluster Plugins ****/ @@ -186,6 +186,6 @@ #define EMBER_AF_PLUGIN_USER_LABEL // Use this macro to check if the server side of the Temperature Measurement cluster is included -#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER +#define ZCL_USING_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT 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 108b466f793532..e96b078c20f67e 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 @@ -86,7 +86,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_SWITCH_CLUSTER_ID: emberAfSwitchClusterInitCallback(endpoint); break; - case ZCL_TEMP_MEASUREMENT_CLUSTER_ID: + case ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID: emberAfTemperatureMeasurementClusterInitCallback(endpoint); break; case ZCL_TIME_FORMAT_LOCALIZATION_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 791528d1aa0472..9f3f1b90735b51 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 @@ -50,7 +50,7 @@ #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) /**** Cluster Plugins ****/ @@ -157,6 +157,6 @@ #define EMBER_AF_PLUGIN_FIXED_LABEL // Use this macro to check if the server side of the Temperature Measurement cluster is included -#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER +#define ZCL_USING_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT 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 6d4938ad961fad..aa5c2553e2c807 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 @@ -95,13 +95,13 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_SWITCH_CLUSTER_ID: emberAfSwitchClusterInitCallback(endpoint); break; - case ZCL_TEMP_MEASUREMENT_CLUSTER_ID: + case ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID: emberAfTemperatureMeasurementClusterInitCallback(endpoint); break; case ZCL_THERMOSTAT_CLUSTER_ID: emberAfThermostatClusterInitCallback(endpoint); break; - case ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID: + case ZCL_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_ID: emberAfThermostatUserInterfaceConfigurationClusterInitCallback(endpoint); break; case ZCL_TIME_FORMAT_LOCALIZATION_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 e2f44dbb7b8c4d..9fdd824d0a2720 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 @@ -51,8 +51,8 @@ #define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_FAN_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_TEMPERATURE_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) @@ -166,12 +166,12 @@ #define EMBER_AF_PLUGIN_FAN_CONTROL_CLIENT // Use this macro to check if the server side of the Thermostat User Interface Configuration cluster is included -#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER +#define ZCL_USING_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_SERVER #define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_SERVER #define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION // Use this macro to check if the client side of the Temperature Measurement cluster is included -#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT +#define ZCL_USING_TEMPERATURE_MEASUREMENT_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_CLIENT // Use this macro to check if the client side of the Relative Humidity Measurement cluster is included diff --git a/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp b/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp index 23725b2b38bad6..494df4dcc7dbf7 100644 --- a/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp +++ b/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp @@ -173,7 +173,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID: emberAfPressureMeasurementClusterInitCallback(endpoint); break; - case ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID: + case ZCL_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_ID: emberAfPumpConfigurationAndControlClusterInitCallback(endpoint); break; case ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID: @@ -191,7 +191,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_TARGET_NAVIGATOR_CLUSTER_ID: emberAfTargetNavigatorClusterInitCallback(endpoint); break; - case ZCL_TEMP_MEASUREMENT_CLUSTER_ID: + case ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID: emberAfTemperatureMeasurementClusterInitCallback(endpoint); break; case ZCL_TEST_CLUSTER_ID: @@ -200,7 +200,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_THERMOSTAT_CLUSTER_ID: emberAfThermostatClusterInitCallback(endpoint); break; - case ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID: + case ZCL_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_ID: emberAfThermostatUserInterfaceConfigurationClusterInitCallback(endpoint); break; case ZCL_THREAD_NETWORK_DIAGNOSTICS_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 9098f1d0820017..cc8430e7073f51 100644 --- a/zzz_generated/controller-clusters/zap-generated/gen_config.h +++ b/zzz_generated/controller-clusters/zap-generated/gen_config.h @@ -68,14 +68,14 @@ #define EMBER_AF_DOOR_LOCK_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_WINDOW_COVERING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_BARRIER_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_THERMOSTAT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_FAN_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_COLOR_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_BALLAST_CONFIGURATION_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_TEMPERATURE_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) @@ -254,7 +254,7 @@ #define EMBER_AF_PLUGIN_BARRIER_CONTROL_CLIENT // Use this macro to check if the client side of the Pump Configuration and Control cluster is included -#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT +#define ZCL_USING_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_CLIENT // Use this macro to check if the client side of the Thermostat cluster is included @@ -266,7 +266,7 @@ #define EMBER_AF_PLUGIN_FAN_CONTROL_CLIENT // Use this macro to check if the client side of the Thermostat User Interface Configuration cluster is included -#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT +#define ZCL_USING_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLIENT // Use this macro to check if the client side of the Color Control cluster is included @@ -282,7 +282,7 @@ #define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT_CLIENT // Use this macro to check if the client side of the Temperature Measurement cluster is included -#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT +#define ZCL_USING_TEMPERATURE_MEASUREMENT_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_CLIENT // Use this macro to check if the client side of the Pressure Measurement cluster is included diff --git a/zzz_generated/dynamic-bridge-app/zap-generated/callback-stub.cpp b/zzz_generated/dynamic-bridge-app/zap-generated/callback-stub.cpp index 474a1352bb45bc..73eefd115c4702 100644 --- a/zzz_generated/dynamic-bridge-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/dynamic-bridge-app/zap-generated/callback-stub.cpp @@ -86,7 +86,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_SWITCH_CLUSTER_ID: emberAfSwitchClusterInitCallback(endpoint); break; - case ZCL_TEMP_MEASUREMENT_CLUSTER_ID: + case ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID: emberAfTemperatureMeasurementClusterInitCallback(endpoint); break; case ZCL_THREAD_NETWORK_DIAGNOSTICS_CLUSTER_ID: diff --git a/zzz_generated/dynamic-bridge-app/zap-generated/gen_config.h b/zzz_generated/dynamic-bridge-app/zap-generated/gen_config.h index f675999cfb095f..47c85fe3ba03fd 100644 --- a/zzz_generated/dynamic-bridge-app/zap-generated/gen_config.h +++ b/zzz_generated/dynamic-bridge-app/zap-generated/gen_config.h @@ -54,7 +54,7 @@ #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) /**** Cluster Plugins ****/ @@ -186,6 +186,6 @@ #define EMBER_AF_PLUGIN_USER_LABEL // Use this macro to check if the server side of the Temperature Measurement cluster is included -#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER +#define ZCL_USING_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT diff --git a/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp b/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp index eee13e235f2ef0..b17bd14324d692 100644 --- a/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp +++ b/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp @@ -101,7 +101,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID: emberAfPressureMeasurementClusterInitCallback(endpoint); break; - case ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID: + case ZCL_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_ID: emberAfPumpConfigurationAndControlClusterInitCallback(endpoint); break; case ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID: @@ -119,13 +119,13 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_TARGET_NAVIGATOR_CLUSTER_ID: emberAfTargetNavigatorClusterInitCallback(endpoint); break; - case ZCL_TEMP_MEASUREMENT_CLUSTER_ID: + case ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID: emberAfTemperatureMeasurementClusterInitCallback(endpoint); break; case ZCL_THERMOSTAT_CLUSTER_ID: emberAfThermostatClusterInitCallback(endpoint); break; - case ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID: + case ZCL_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_ID: emberAfThermostatUserInterfaceConfigurationClusterInitCallback(endpoint); break; case ZCL_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_ID: diff --git a/zzz_generated/placeholder/app1/zap-generated/gen_config.h b/zzz_generated/placeholder/app1/zap-generated/gen_config.h index b242edf0306714..e76b8482cbb1c7 100644 --- a/zzz_generated/placeholder/app1/zap-generated/gen_config.h +++ b/zzz_generated/placeholder/app1/zap-generated/gen_config.h @@ -56,14 +56,14 @@ #define EMBER_AF_MODE_SELECT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_TEMPERATURE_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) @@ -226,7 +226,7 @@ #define EMBER_AF_PLUGIN_WINDOW_COVERING // Use this macro to check if the server side of the Pump Configuration and Control cluster is included -#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER +#define ZCL_USING_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER #define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_SERVER #define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL @@ -236,11 +236,11 @@ #define EMBER_AF_PLUGIN_THERMOSTAT // Use this macro to check if the client side of the Thermostat User Interface Configuration cluster is included -#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT +#define ZCL_USING_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLIENT // Use this macro to check if the server side of the Thermostat User Interface Configuration cluster is included -#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER +#define ZCL_USING_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_SERVER #define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_SERVER #define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION @@ -259,11 +259,11 @@ #define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT // Use this macro to check if the client side of the Temperature Measurement cluster is included -#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT +#define ZCL_USING_TEMPERATURE_MEASUREMENT_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_CLIENT // Use this macro to check if the server side of the Temperature Measurement cluster is included -#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER +#define ZCL_USING_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT diff --git a/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp b/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp index eee13e235f2ef0..b17bd14324d692 100644 --- a/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp +++ b/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp @@ -101,7 +101,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID: emberAfPressureMeasurementClusterInitCallback(endpoint); break; - case ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID: + case ZCL_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_ID: emberAfPumpConfigurationAndControlClusterInitCallback(endpoint); break; case ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID: @@ -119,13 +119,13 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_TARGET_NAVIGATOR_CLUSTER_ID: emberAfTargetNavigatorClusterInitCallback(endpoint); break; - case ZCL_TEMP_MEASUREMENT_CLUSTER_ID: + case ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID: emberAfTemperatureMeasurementClusterInitCallback(endpoint); break; case ZCL_THERMOSTAT_CLUSTER_ID: emberAfThermostatClusterInitCallback(endpoint); break; - case ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID: + case ZCL_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_ID: emberAfThermostatUserInterfaceConfigurationClusterInitCallback(endpoint); break; case ZCL_WIFI_NETWORK_DIAGNOSTICS_CLUSTER_ID: diff --git a/zzz_generated/placeholder/app2/zap-generated/gen_config.h b/zzz_generated/placeholder/app2/zap-generated/gen_config.h index b242edf0306714..e76b8482cbb1c7 100644 --- a/zzz_generated/placeholder/app2/zap-generated/gen_config.h +++ b/zzz_generated/placeholder/app2/zap-generated/gen_config.h @@ -56,14 +56,14 @@ #define EMBER_AF_MODE_SELECT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_WINDOW_COVERING_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_THERMOSTAT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_COLOR_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_ILLUMINANCE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_TEMPERATURE_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) @@ -226,7 +226,7 @@ #define EMBER_AF_PLUGIN_WINDOW_COVERING // Use this macro to check if the server side of the Pump Configuration and Control cluster is included -#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER +#define ZCL_USING_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER #define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_SERVER #define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL @@ -236,11 +236,11 @@ #define EMBER_AF_PLUGIN_THERMOSTAT // Use this macro to check if the client side of the Thermostat User Interface Configuration cluster is included -#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_CLIENT +#define ZCL_USING_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLIENT // Use this macro to check if the server side of the Thermostat User Interface Configuration cluster is included -#define ZCL_USING_THERMOSTAT_UI_CONFIG_CLUSTER_SERVER +#define ZCL_USING_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_SERVER #define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION_SERVER #define EMBER_AF_PLUGIN_THERMOSTAT_USER_INTERFACE_CONFIGURATION @@ -259,11 +259,11 @@ #define EMBER_AF_PLUGIN_ILLUMINANCE_MEASUREMENT // Use this macro to check if the client side of the Temperature Measurement cluster is included -#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT +#define ZCL_USING_TEMPERATURE_MEASUREMENT_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_CLIENT // Use this macro to check if the server side of the Temperature Measurement cluster is included -#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER +#define ZCL_USING_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT diff --git a/zzz_generated/pump-app/zap-generated/callback-stub.cpp b/zzz_generated/pump-app/zap-generated/callback-stub.cpp index 3b74a5bd79e715..c14f635ef53e2b 100644 --- a/zzz_generated/pump-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/pump-app/zap-generated/callback-stub.cpp @@ -83,10 +83,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID: emberAfPressureMeasurementClusterInitCallback(endpoint); break; - case ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID: + case ZCL_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_ID: emberAfPumpConfigurationAndControlClusterInitCallback(endpoint); break; - case ZCL_TEMP_MEASUREMENT_CLUSTER_ID: + case ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID: emberAfTemperatureMeasurementClusterInitCallback(endpoint); break; case ZCL_THREAD_NETWORK_DIAGNOSTICS_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 d4431327e203ab..293c0db5486885 100644 --- a/zzz_generated/pump-app/zap-generated/gen_config.h +++ b/zzz_generated/pump-app/zap-generated/gen_config.h @@ -45,8 +45,8 @@ #define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_OCCUPANCY_SENSING_CLUSTER_CLIENT_ENDPOINT_COUNT (1) @@ -137,12 +137,12 @@ #define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT // Use this macro to check if the server side of the Pump Configuration and Control cluster is included -#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_SERVER +#define ZCL_USING_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_SERVER #define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_SERVER #define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL // Use this macro to check if the server side of the Temperature Measurement cluster is included -#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER +#define ZCL_USING_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT 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 596b4f1afa2284..2dcfd5c05e27f3 100644 --- a/zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp @@ -77,10 +77,10 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID: emberAfPressureMeasurementClusterInitCallback(endpoint); break; - case ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID: + case ZCL_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_ID: emberAfPumpConfigurationAndControlClusterInitCallback(endpoint); break; - case ZCL_TEMP_MEASUREMENT_CLUSTER_ID: + case ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID: emberAfTemperatureMeasurementClusterInitCallback(endpoint); break; case ZCL_THREAD_NETWORK_DIAGNOSTICS_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 75d22e56e153e1..8fc7c3c1d2d61c 100644 --- a/zzz_generated/pump-controller-app/zap-generated/gen_config.h +++ b/zzz_generated/pump-controller-app/zap-generated/gen_config.h @@ -44,8 +44,8 @@ #define EMBER_AF_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_OPERATIONAL_CREDENTIALS_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_TEMPERATURE_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_PRESSURE_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_FLOW_MEASUREMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) @@ -125,11 +125,11 @@ #define EMBER_AF_PLUGIN_GROUP_KEY_MANAGEMENT // Use this macro to check if the client side of the Pump Configuration and Control cluster is included -#define ZCL_USING_PUMP_CONFIG_CONTROL_CLUSTER_CLIENT +#define ZCL_USING_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_PUMP_CONFIGURATION_AND_CONTROL_CLIENT // Use this macro to check if the client side of the Temperature Measurement cluster is included -#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_CLIENT +#define ZCL_USING_TEMPERATURE_MEASUREMENT_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_CLIENT // Use this macro to check if the client side of the Pressure Measurement cluster is included diff --git a/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp b/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp index cd4f67725c4cc4..8b9d77a5aa13f3 100644 --- a/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp @@ -71,7 +71,7 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId) case ZCL_SOFTWARE_DIAGNOSTICS_CLUSTER_ID: emberAfSoftwareDiagnosticsClusterInitCallback(endpoint); break; - case ZCL_TEMP_MEASUREMENT_CLUSTER_ID: + case ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID: emberAfTemperatureMeasurementClusterInitCallback(endpoint); break; case ZCL_TIME_FORMAT_LOCALIZATION_CLUSTER_ID: diff --git a/zzz_generated/temperature-measurement-app/zap-generated/gen_config.h b/zzz_generated/temperature-measurement-app/zap-generated/gen_config.h index c5933cc8660a83..3d828577b10108 100644 --- a/zzz_generated/temperature-measurement-app/zap-generated/gen_config.h +++ b/zzz_generated/temperature-measurement-app/zap-generated/gen_config.h @@ -47,7 +47,7 @@ #define EMBER_AF_GROUP_KEY_MANAGEMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_FIXED_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1) #define EMBER_AF_USER_LABEL_CLUSTER_SERVER_ENDPOINT_COUNT (1) -#define EMBER_AF_TEMP_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) +#define EMBER_AF_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER_ENDPOINT_COUNT (1) /**** Cluster Plugins ****/ @@ -142,6 +142,6 @@ #define EMBER_AF_PLUGIN_USER_LABEL // Use this macro to check if the server side of the Temperature Measurement cluster is included -#define ZCL_USING_TEMP_MEASUREMENT_CLUSTER_SERVER +#define ZCL_USING_TEMPERATURE_MEASUREMENT_CLUSTER_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT_SERVER #define EMBER_AF_PLUGIN_TEMPERATURE_MEASUREMENT