Skip to content

Commit a99675e

Browse files
andy31415andy31415
authored
More cluster define renames for consistency with spec cluster names (#23487)
* Rename PUMP_CONFIG_CONTROL to PUMP_CONFIGURATION_AND_CONTROL * Rename TEMP_MEASUREMENT_CLUSTER to TEMPERATURE_MEASUREMENT_CLUSTER * zap regen * Restyle * rename THERMOSTAT_UI_CONFIG_CLUSTER into THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER (even though this does NOT seem to be a valid matter cluster ... name taken from zigbee * zap regen
1 parent 0970426 commit a99675e

File tree

52 files changed

+224
-216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+224
-216
lines changed

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

+10-10
Original file line numberDiff line numberDiff line change
@@ -7710,7 +7710,7 @@
77107710
"name": "Temperature Measurement",
77117711
"code": 1026,
77127712
"mfgCode": null,
7713-
"define": "TEMP_MEASUREMENT_CLUSTER",
7713+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
77147714
"side": "client",
77157715
"enabled": 0,
77167716
"attributes": [
@@ -7736,7 +7736,7 @@
77367736
"name": "Temperature Measurement",
77377737
"code": 1026,
77387738
"mfgCode": null,
7739-
"define": "TEMP_MEASUREMENT_CLUSTER",
7739+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
77407740
"side": "server",
77417741
"enabled": 0,
77427742
"attributes": [
@@ -14102,7 +14102,7 @@
1410214102
"name": "Pump Configuration and Control",
1410314103
"code": 512,
1410414104
"mfgCode": null,
14105-
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
14105+
"define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER",
1410614106
"side": "client",
1410714107
"enabled": 0,
1410814108
"attributes": [
@@ -14128,7 +14128,7 @@
1412814128
"name": "Pump Configuration and Control",
1412914129
"code": 512,
1413014130
"mfgCode": null,
14131-
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
14131+
"define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER",
1413214132
"side": "server",
1413314133
"enabled": 1,
1413414134
"attributes": [
@@ -15308,7 +15308,7 @@
1530815308
"name": "Thermostat User Interface Configuration",
1530915309
"code": 516,
1531015310
"mfgCode": null,
15311-
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
15311+
"define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER",
1531215312
"side": "client",
1531315313
"enabled": 0,
1531415314
"attributes": [
@@ -15334,7 +15334,7 @@
1533415334
"name": "Thermostat User Interface Configuration",
1533515335
"code": 516,
1533615336
"mfgCode": null,
15337-
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
15337+
"define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER",
1533815338
"side": "server",
1533915339
"enabled": 1,
1534015340
"attributes": [
@@ -16626,7 +16626,7 @@
1662616626
"name": "Temperature Measurement",
1662716627
"code": 1026,
1662816628
"mfgCode": null,
16629-
"define": "TEMP_MEASUREMENT_CLUSTER",
16629+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
1663016630
"side": "client",
1663116631
"enabled": 0,
1663216632
"attributes": [
@@ -16652,7 +16652,7 @@
1665216652
"name": "Temperature Measurement",
1665316653
"code": 1026,
1665416654
"mfgCode": null,
16655-
"define": "TEMP_MEASUREMENT_CLUSTER",
16655+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
1665616656
"side": "server",
1665716657
"enabled": 1,
1665816658
"attributes": [
@@ -24128,7 +24128,7 @@
2412824128
"name": "Temperature Measurement",
2412924129
"code": 1026,
2413024130
"mfgCode": null,
24131-
"define": "TEMP_MEASUREMENT_CLUSTER",
24131+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
2413224132
"side": "client",
2413324133
"enabled": 0,
2413424134
"attributes": [
@@ -24154,7 +24154,7 @@
2415424154
"name": "Temperature Measurement",
2415524155
"code": 1026,
2415624156
"mfgCode": null,
24157-
"define": "TEMP_MEASUREMENT_CLUSTER",
24157+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
2415824158
"side": "server",
2415924159
"enabled": 0,
2416024160
"attributes": [

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap

+10-10
Original file line numberDiff line numberDiff line change
@@ -7710,7 +7710,7 @@
77107710
"name": "Temperature Measurement",
77117711
"code": 1026,
77127712
"mfgCode": null,
7713-
"define": "TEMP_MEASUREMENT_CLUSTER",
7713+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
77147714
"side": "client",
77157715
"enabled": 0,
77167716
"attributes": [
@@ -7736,7 +7736,7 @@
77367736
"name": "Temperature Measurement",
77377737
"code": 1026,
77387738
"mfgCode": null,
7739-
"define": "TEMP_MEASUREMENT_CLUSTER",
7739+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
77407740
"side": "server",
77417741
"enabled": 0,
77427742
"attributes": [
@@ -13872,7 +13872,7 @@
1387213872
"name": "Pump Configuration and Control",
1387313873
"code": 512,
1387413874
"mfgCode": null,
13875-
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
13875+
"define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER",
1387613876
"side": "client",
1387713877
"enabled": 0,
1387813878
"attributes": [
@@ -13898,7 +13898,7 @@
1389813898
"name": "Pump Configuration and Control",
1389913899
"code": 512,
1390013900
"mfgCode": null,
13901-
"define": "PUMP_CONFIG_CONTROL_CLUSTER",
13901+
"define": "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER",
1390213902
"side": "server",
1390313903
"enabled": 1,
1390413904
"attributes": [
@@ -15014,7 +15014,7 @@
1501415014
"name": "Thermostat User Interface Configuration",
1501515015
"code": 516,
1501615016
"mfgCode": null,
15017-
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
15017+
"define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER",
1501815018
"side": "client",
1501915019
"enabled": 0,
1502015020
"attributes": [
@@ -15040,7 +15040,7 @@
1504015040
"name": "Thermostat User Interface Configuration",
1504115041
"code": 516,
1504215042
"mfgCode": null,
15043-
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
15043+
"define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER",
1504415044
"side": "server",
1504515045
"enabled": 1,
1504615046
"attributes": [
@@ -16332,7 +16332,7 @@
1633216332
"name": "Temperature Measurement",
1633316333
"code": 1026,
1633416334
"mfgCode": null,
16335-
"define": "TEMP_MEASUREMENT_CLUSTER",
16335+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
1633616336
"side": "client",
1633716337
"enabled": 0,
1633816338
"attributes": [
@@ -16358,7 +16358,7 @@
1635816358
"name": "Temperature Measurement",
1635916359
"code": 1026,
1636016360
"mfgCode": null,
16361-
"define": "TEMP_MEASUREMENT_CLUSTER",
16361+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
1636216362
"side": "server",
1636316363
"enabled": 1,
1636416364
"attributes": [
@@ -23904,7 +23904,7 @@
2390423904
"name": "Temperature Measurement",
2390523905
"code": 1026,
2390623906
"mfgCode": null,
23907-
"define": "TEMP_MEASUREMENT_CLUSTER",
23907+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
2390823908
"side": "client",
2390923909
"enabled": 0,
2391023910
"attributes": [
@@ -23930,7 +23930,7 @@
2393023930
"name": "Temperature Measurement",
2393123931
"code": 1026,
2393223932
"mfgCode": null,
23933-
"define": "TEMP_MEASUREMENT_CLUSTER",
23933+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
2393423934
"side": "server",
2393523935
"enabled": 0,
2393623936
"attributes": [

‎examples/bridge-app/bridge-common/bridge-app.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -7320,7 +7320,7 @@
73207320
"name": "Temperature Measurement",
73217321
"code": 1026,
73227322
"mfgCode": null,
7323-
"define": "TEMP_MEASUREMENT_CLUSTER",
7323+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
73247324
"side": "client",
73257325
"enabled": 0,
73267326
"attributes": [
@@ -7362,7 +7362,7 @@
73627362
"name": "Temperature Measurement",
73637363
"code": 1026,
73647364
"mfgCode": null,
7365-
"define": "TEMP_MEASUREMENT_CLUSTER",
7365+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
73667366
"side": "server",
73677367
"enabled": 1,
73687368
"attributes": [

‎examples/bridge-app/linux/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ DECLARE_DYNAMIC_ATTRIBUTE(ZCL_TEMP_MEASURED_VALUE_ATTRIBUTE_ID, INT16S, 2, 0),
216216
// - Descriptor
217217
// - Bridged Device Basic
218218
DECLARE_DYNAMIC_CLUSTER_LIST_BEGIN(bridgedTempSensorClusters)
219-
DECLARE_DYNAMIC_CLUSTER(ZCL_TEMP_MEASUREMENT_CLUSTER_ID, tempSensorAttrs, nullptr, nullptr),
219+
DECLARE_DYNAMIC_CLUSTER(ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID, tempSensorAttrs, nullptr, nullptr),
220220
DECLARE_DYNAMIC_CLUSTER(ZCL_DESCRIPTOR_CLUSTER_ID, descriptorAttrs, nullptr, nullptr),
221221
DECLARE_DYNAMIC_CLUSTER(ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID, bridgedDeviceBasicAttrs, nullptr, nullptr),
222222
DECLARE_DYNAMIC_CLUSTER_LIST_END;

‎examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -5954,7 +5954,7 @@
59545954
"name": "Temperature Measurement",
59555955
"code": 1026,
59565956
"mfgCode": null,
5957-
"define": "TEMP_MEASUREMENT_CLUSTER",
5957+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
59585958
"side": "client",
59595959
"enabled": 0,
59605960
"attributes": [
@@ -5996,7 +5996,7 @@
59965996
"name": "Temperature Measurement",
59975997
"code": 1026,
59985998
"mfgCode": null,
5999-
"define": "TEMP_MEASUREMENT_CLUSTER",
5999+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
60006000
"side": "server",
60016001
"enabled": 1,
60026002
"attributes": [

‎examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap

+4-4
Original file line numberDiff line numberDiff line change
@@ -7334,15 +7334,15 @@
73347334
"name": "Thermostat User Interface Configuration",
73357335
"code": 516,
73367336
"mfgCode": null,
7337-
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
7337+
"define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER",
73387338
"side": "client",
73397339
"enabled": 0
73407340
},
73417341
{
73427342
"name": "Thermostat User Interface Configuration",
73437343
"code": 516,
73447344
"mfgCode": null,
7345-
"define": "THERMOSTAT_UI_CONFIG_CLUSTER",
7345+
"define": "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER",
73467346
"side": "server",
73477347
"enabled": 1,
73487348
"attributes": [
@@ -7480,7 +7480,7 @@
74807480
"name": "Temperature Measurement",
74817481
"code": 1026,
74827482
"mfgCode": null,
7483-
"define": "TEMP_MEASUREMENT_CLUSTER",
7483+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
74847484
"side": "client",
74857485
"enabled": 1,
74867486
"attributes": [
@@ -7522,7 +7522,7 @@
75227522
"name": "Temperature Measurement",
75237523
"code": 1026,
75247524
"mfgCode": null,
7525-
"define": "TEMP_MEASUREMENT_CLUSTER",
7525+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
75267526
"side": "server",
75277527
"enabled": 0
75287528
},

‎examples/common/pigweed/protos/attributes_service.proto

+3-3
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,15 @@ enum ClusterType {
112112
ZCL_DOOR_LOCK_CLUSTER_ID = 0x0101;
113113
ZCL_WINDOW_COVERING_CLUSTER_ID = 0x0102;
114114
ZCL_BARRIER_CONTROL_CLUSTER_ID = 0x0103;
115-
ZCL_PUMP_CONFIG_CONTROL_CLUSTER_ID = 0x0200;
115+
ZCL_PUMP_CONFIGURATION_AND_CONTROL_CLUSTER_ID = 0x0200;
116116
ZCL_THERMOSTAT_CLUSTER_ID = 0x0201;
117117
ZCL_FAN_CONTROL_CLUSTER_ID = 0x0202;
118118
ZCL_DEHUMID_CONTROL_CLUSTER_ID = 0x0203;
119-
ZCL_THERMOSTAT_UI_CONFIG_CLUSTER_ID = 0x0204;
119+
ZCL_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER_ID = 0x0204;
120120
ZCL_COLOR_CONTROL_CLUSTER_ID = 0x0300;
121121
ZCL_BALLAST_CONFIGURATION_CLUSTER_ID = 0x0301;
122122
ZCL_ILLUMINANCE_MEASUREMENT_CLUSTER_ID = 0x0400;
123-
ZCL_TEMP_MEASUREMENT_CLUSTER_ID = 0x0402;
123+
ZCL_TEMPERATURE_MEASUREMENT_CLUSTER_ID = 0x0402;
124124
ZCL_PRESSURE_MEASUREMENT_CLUSTER_ID = 0x0403;
125125
ZCL_FLOW_MEASUREMENT_CLUSTER_ID = 0x0404;
126126
ZCL_RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER_ID = 0x0405;

‎examples/dynamic-bridge-app/bridge-common/bridge-app.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -7320,7 +7320,7 @@
73207320
"name": "Temperature Measurement",
73217321
"code": 1026,
73227322
"mfgCode": null,
7323-
"define": "TEMP_MEASUREMENT_CLUSTER",
7323+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
73247324
"side": "client",
73257325
"enabled": 0,
73267326
"attributes": [
@@ -7362,7 +7362,7 @@
73627362
"name": "Temperature Measurement",
73637363
"code": 1026,
73647364
"mfgCode": null,
7365-
"define": "TEMP_MEASUREMENT_CLUSTER",
7365+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
73667366
"side": "server",
73677367
"enabled": 1,
73687368
"attributes": [

‎examples/log-source-app/log-source-common/log-source-app.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -3402,7 +3402,7 @@
34023402
"name": "Temperature Measurement",
34033403
"code": 1026,
34043404
"mfgCode": null,
3405-
"define": "TEMP_MEASUREMENT_CLUSTER",
3405+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
34063406
"side": "client",
34073407
"enabled": 0,
34083408
"attributes": [
@@ -3428,7 +3428,7 @@
34283428
"name": "Temperature Measurement",
34293429
"code": 1026,
34303430
"mfgCode": null,
3431-
"define": "TEMP_MEASUREMENT_CLUSTER",
3431+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
34323432
"side": "server",
34333433
"enabled": 0,
34343434
"attributes": [

‎examples/ota-provider-app/ota-provider-common/ota-provider-app.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -4638,7 +4638,7 @@
46384638
"name": "Temperature Measurement",
46394639
"code": 1026,
46404640
"mfgCode": null,
4641-
"define": "TEMP_MEASUREMENT_CLUSTER",
4641+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
46424642
"side": "client",
46434643
"enabled": 0,
46444644
"attributes": [
@@ -4664,7 +4664,7 @@
46644664
"name": "Temperature Measurement",
46654665
"code": 1026,
46664666
"mfgCode": null,
4667-
"define": "TEMP_MEASUREMENT_CLUSTER",
4667+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
46684668
"side": "server",
46694669
"enabled": 0,
46704670
"attributes": [

‎examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap

+2-2
Original file line numberDiff line numberDiff line change
@@ -4888,7 +4888,7 @@
48884888
"name": "Temperature Measurement",
48894889
"code": 1026,
48904890
"mfgCode": null,
4891-
"define": "TEMP_MEASUREMENT_CLUSTER",
4891+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
48924892
"side": "client",
48934893
"enabled": 0,
48944894
"attributes": [
@@ -4914,7 +4914,7 @@
49144914
"name": "Temperature Measurement",
49154915
"code": 1026,
49164916
"mfgCode": null,
4917-
"define": "TEMP_MEASUREMENT_CLUSTER",
4917+
"define": "TEMPERATURE_MEASUREMENT_CLUSTER",
49184918
"side": "server",
49194919
"enabled": 0,
49204920
"attributes": [

0 commit comments

Comments
 (0)