Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More cluster define renames for consistency with spec cluster names #23487

Conversation

andy31415
Copy link
Contributor

@andy31415 andy31415 commented Nov 4, 2022

Renames:

  • PUMP_CONFIG_CONTROL to PUMP_CONFIGURATION_AND_CONTROL
  • TEMP_MEASUREMENT to TEMPERATURE_MEASUREMENT
  • THERMOSTAT_UI_CONFIG_CLUSTER to THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER

This is to make define names consistent with the cluster naming (which in turn should be consistent with the spec).
Also it seems to me that not all of these clusters are matter spec... but that is a problem to be solved separately.

…NFIGURATION_CLUSTER (even though this does NOT seem to be a valid matter cluster ... name taken from zigbee
@github-actions
Copy link

github-actions bot commented Nov 4, 2022

PR #23487: Size comparison from 42b4438 to 754830b

Increases (11 builds for bl602, bl702, cyw30739, esp32, nrfconnect, psoc6, telink)
platform target config section 42b4438 754830b change % change
bl602 lighting-app bl602+rpc .text 1100362 1100364 2 0.0
bl702 lighting-app bl702 (read/write) 1188147 1188163 16 0.0
.debug_info 38087204 38087205 1 0.0
.debug_str 3451959 3451996 37 0.0
.text 957072 957074 2 0.0
bl702+rpc .debug_info 42004558 42004560 2 0.0
.debug_str 3848087 3848124 37 0.0
.text 1030778 1030782 4 0.0
cyw30739 lock cyw930739m2evb_01 (read/write) 592310 592318 8 0.0
.app_xip_area 463616 463624 8 0.0
esp32 all-clusters-app c3devkit (read only) 1224290 1224292 2 0.0
.flash.text 1224290 1224292 2 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 text 816964 816968 4 0.0
psoc6 all-clusters cy8ckit_062s2_43012 .debug_info 2702594 27025948 1 0.0
.debug_str 3435682 3435719 37 0.0
all-clusters-minimal cy8ckit_062s2_43012 .debug_str 3424711 3424748 37 0.0
light cy8ckit_062s2_43012 .debug_str 3230138 3230175 37 0.0
lock cy8ckit_062s2_43012 .debug_info 22461401 22461402 1 0.0
.debug_str 3249609 3249646 37 0.0
telink lighting-app tlsr9518adk80d (read/write) 874460 874468 8 0.0
text 624084 624086 2 0.0
Decreases (3 builds for bl602, cyw30739, psoc6)
platform target config section 42b4438 754830b change % change
bl602 lighting-app bl602 .text 1068758 1068756 -2 -0.0
cyw30739 ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 544402 544394 -8 -0.0
.app_xip_area 426084 426076 -8 -0.0
psoc6 light cy8ckit_062s2_43012 .debug_info 22228026 22228025 -1 -0.0
Full report (44 builds for bl602, bl702, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section 42b4438 754830b change % change
bl602 lighting-app bl602 (read/write) 1388990 1388990 0 0.0
.bss 90729 90729 0 0.0
.data 9936 9936 0 0.0
.text 1068758 1068756 -2 -0.0
bl602+rpc (read/write) 1434454 1434454 0 0.0
.bss 98161 98161 0 0.0
.data 10320 10320 0 0.0
.text 1100362 1100364 2 0.0
bl702 lighting-app bl702 (read only) 3262 3262 0 0.0
(read/write) 1188147 1188163 16 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 67126 67126 0 0.0
.bss_psram 29696 29696 0 0.0
.comment 48 48 0 0.0
.data 4280 4280 0 0.0
.debug_abbrev 1514492 1514492 0 0.0
.debug_aranges 132064 132064 0 0.0
.debug_frame 484664 484664 0 0.0
.debug_info 38087204 38087205 1 0.0
.debug_line 5271085 5271085 0 0.0
.debug_loc 3373269 3373269 0 0.0
.debug_ranges 359744 359744 0 0.0
.debug_str 3451959 3451996 37 0.0
.hbn 509 509 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 144 144 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 116168 116168 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 565774 565774 0 0.0
.symtab 171984 171984 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
957072 957074 2 0.0
bl702+rpc (read only) 3262 3262 0 0.0
(read/write) 1284075 1284075 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 75158 75158 0 0.0
.bss_psram 29936 29936 0 0.0
.comment 48 48 0 0.0
.data 4816 4816 0 0.0
.debug_abbrev 1651926 1651926 0 0.0
.debug_aranges 139568 139568 0 0.0
.debug_frame 510036 510036 0 0.0
.debug_info 42004558 42004560 2 0.0
.debug_line 5647232 5647232 0 0.0
.debug_loc 3566096 3566096 0 0.0
.debug_ranges 382544 382544 0 0.0
.debug_str 3848087 3848124 37 0.0
.hbn 509 509 0 0.0
.hbn_noinit 260 260 0 0.0
.init 342 342 0 0.0
.init_array 160 160 0 0.0
.psram 0 0 0 0.0
.riscv.attributes 47 47 0 0.0
.rodata 129560 129560 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 624947 624947 0 0.0
.symtab 189792 189792 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
1030778 1030782 4 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 588270 588270 0 0.0
.app_xip_area 464872 464872 0 0.0
.bss 65816 65816 0 0.0
.data 760 760 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 592310 592318 8 0.0
.app_xip_area 463616 463624 8 0.0
.bss 71104 71104 0 0.0
.data 768 768 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 544402 544394 -8 -0.0
.app_xip_area 426084 426076 -8 -0.0
.bss 60784 60784 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A+rpc (read/write) 974252 974252 0 0.0
.bss 152260 152260 0 0.0
.data 2248 2248 0 0.0
.text 819724 819724 0 0.0
BRD4161A+rs911x (read/write) 1034792 1034792 0 0.0
.bss 186728 186728 0 0.0
.data 2092 2092 0 0.0
.text 845948 845948 0 0.0
BRD4187C (read/write) 1146656 1146656 0 0.0
.bss 138648 138648 0 0.0
.data 2596 2596 0 0.0
.text 980816 980816 0 0.0
lock-app BRD4161A+wf200 (read/write) 1160072 1160072 0 0.0
.bss 158256 158256 0 0.0
.data 2100 2100 0 0.0
.text 999692 999692 0 0.0
window-app BRD4187C (read/write) 1139876 1139876 0 0.0
.bss 140064 140064 0 0.0
.data 2620 2620 0 0.0
.text 972596 972596 0 0.0
esp32 all-clusters-app c3devkit (read only) 1224290 1224292 2 0.0
(read/write) 1788526 1788526 0 0.0
.dram0.bss 76944 76944 0 0.0
.dram0.data 13840 13840 0 0.0
.flash.rodata 258096 258096 0 0.0
.flash.text 1224290 1224292 2 0.0
.iram0.text 65204 65204 0 0.0
m5stack (read only) 1234091 1234091 0 0.0
(read/write) 564332 564332 0 0.0
.dram0.bss 82320 82320 0 0.0
.dram0.data 34296 34296 0 0.0
.flash.rodata 315048 315048 0 0.0
.flash.text 1228707 1228707 0 0.0
.iram0.text 123939 123939 0 0.0
k32w contact k32w0+release (read/write) 661212 661212 0 0.0
.bss 77024 77024 0 0.0
.data 2104 2104 0 0.0
.text 562972 562972 0 0.0
light k32w0+release (read/write) 671256 671256 0 0.0
.bss 74824 74824 0 0.0
.data 2060 2060 0 0.0
.text 591644 591644 0 0.0
lock k32w0+release (read/write) 632732 632732 0 0.0
.bss 75584 75584 0 0.0
.data 2080 2080 0 0.0
.text 552340 552340 0 0.0
linux all-clusters-app debug (read only) 3088105 3088105 0 0.0
(read/write) 158352 158352 0 0.0
.bss 62464 62464 0 0.0
.data 2272 2272 0 0.0
.data.rel.ro 87016 87016 0 0.0
.dynamic 608 608 0 0.0
.got 4776 4776 0 0.0
.init 27 27 0 0.0
.init_array 1192 1192 0 0.0
.rodata 281291 281291 0 0.0
.text 2622450 2622450 0 0.0
all-clusters-minimal-app debug (read only) 2913913 2913913 0 0.0
(read/write) 149784 149784 0 0.0
.bss 61664 61664 0 0.0
.data 2240 2240 0 0.0
.data.rel.ro 79384 79384 0 0.0
.dynamic 608 608 0 0.0
.got 4696 4696 0 0.0
.init 27 27 0 0.0
.init_array 1168 1168 0 0.0
.rodata 280811 280811 0 0.0
.text 2451682 2451682 0 0.0
bridge-app debug+rpc (read only) 2413737 2413737 0 0.0
(read/write) 129552 129552 0 0.0
.bss 51008 51008 0 0.0
.data 3792 3792 0 0.0
.data.rel.ro 68680 68680 0 0.0
.dynamic 608 608 0 0.0
.got 4600 4600 0 0.0
.init 27 27 0 0.0
.init_array 840 840 0 0.0
.rodata 211104 211104 0 0.0
.text 2035106 2035106 0 0.0
chip-tool debug (read only) 11082657 11082657 0 0.0
(read/write) 658408 658408 0 0.0
.bss 25912 25912 0 0.0
.data 2754 2754 0 0.0
.data.rel.ro 623080 623080 0 0.0
.dynamic 608 608 0 0.0
.got 5216 5216 0 0.0
.init 27 27 0 0.0
.init_array 776 776 0 0.0
.rodata 592253 592253 0 0.0
.text 8966484 8966484 0 0.0
chip-tool-ipv6only arm64 (read only) 10438300 10438300 0 0.0
(read/write) 706417 706417 0 0.0
.bss 33905 33905 0 0.0
.data 2768 2768 0 0.0
.data.rel.ro 650720 650720 0 0.0
.dynamic 560 560 0 0.0
.got 13928 13928 0 0.0
.init 24 24 0 0.0
.init_array 208 208 0 0.0
.rodata 518364 518364 0 0.0
.text 8264100 8264100 0 0.0
lighting-app debug+rpc (read only) 2641089 2641089 0 0.0
(read/write) 132240 132240 0 0.0
.bss 49984 49984 0 0.0
.data 2288 2288 0 0.0
.data.rel.ro 73800 73800 0 0.0
.dynamic 608 608 0 0.0
.got 4600 4600 0 0.0
.init 27 27 0 0.0
.init_array 936 936 0 0.0
.rodata 227968 227968 0 0.0
.text 2237170 2237170 0 0.0
lock-app debug (read only) 2603209 2603209 0 0.0
(read/write) 127288 127288 0 0.0
.bss 48416 48416 0 0.0
.data 1904 1904 0 0.0
.data.rel.ro 70728 70728 0 0.0
.dynamic 608 608 0 0.0
.got 4672 4672 0 0.0
.init 27 27 0 0.0
.init_array 912 912 0 0.0
.rodata 244200 244200 0 0.0
.text 2187426 2187426 0 0.0
ota-provider-app debug (read only) 2399729 2399729 0 0.0
(read/write) 120816 120816 0 0.0
.bss 47936 47936 0 0.0
.data 2128 2128 0 0.0
.data.rel.ro 64648 64648 0 0.0
.dynamic 608 608 0 0.0
.got 4696 4696 0 0.0
.init 27 27 0 0.0
.init_array 776 776 0 0.0
.rodata 216776 216776 0 0.0
.text 2014434 2014434 0 0.0
ota-requestor-app debug (read only) 2564865 2564865 0 0.0
(read/write) 129128 129128 0 0.0
.bss 50464 50464 0 0.0
.data 2496 2496 0 0.0
.data.rel.ro 69992 69992 0 0.0
.dynamic 608 608 0 0.0
.got 4688 4688 0 0.0
.init 27 27 0 0.0
.init_array 864 864 0 0.0
.rodata 223856 223856 0 0.0
.text 2163394 2163394 0 0.0
shell debug (read only) 2624377 2624377 0 0.0
(read/write) 142880 142880 0 0.0
.bss 57864 57864 0 0.0
.data 1264 1264 0 0.0
.data.rel.ro 77936 77936 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 1040 1040 0 0.0
.rodata 239602 239602 0 0.0
.text 2225394 2225394 0 0.0
thermostat-no-ble arm64 (read only) 2394748 2394748 0 0.0
(read/write) 143649 143649 0 0.0
.bss 55361 55361 0 0.0
.data 1816 1816 0 0.0
.data.rel.ro 77280 77280 0 0.0
.dynamic 560 560 0 0.0
.got 5176 5176 0 0.0
.init 24 24 0 0.0
.init_array 440 440 0 0.0
.rodata 144548 144548 0 0.0
.text 2007216 2007216 0 0.0
tv-app debug (read only) 3234673 3234673 0 0.0
(read/write) 261616 261616 0 0.0
.bss 170552 170552 0 0.0
.data 4256 4256 0 0.0
.data.rel.ro 80144 80144 0 0.0
.dynamic 608 608 0 0.0
.got 4976 4976 0 0.0
.init 27 27 0 0.0
.init_array 1072 1072 0 0.0
.rodata 267640 267640 0 0.0
.text 2773954 2773954 0 0.0
tv-casting-app debug (read only) 5582745 5582745 0 0.0
(read/write) 161728 161728 0 0.0
.bss 52120 52120 0 0.0
.data 1936 1936 0 0.0
.data.rel.ro 101096 101096 0 0.0
.dynamic 608 608 0 0.0
.got 4888 4888 0 0.0
.init 27 27 0 0.0
.init_array 1056 1056 0 0.0
.rodata 355481 355481 0 0.0
.text 4952162 4952162 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2452224 2452224 0 0.0
.bss 215012 215012 0 0.0
.data 5872 5872 0 0.0
.text 1414868 1414868 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1187759 1187759 0 0.0
bss 145285 145285 0 0.0
rodata 144436 144436 0 0.0
text 816964 816968 4 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1167123 1167123 0 0.0
bss 144512 144512 0 0.0
rodata 136224 136224 0 0.0
text 805458 805458 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 841968 841968 0 0.0
(read/write) 1746036 1746036 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 188712 188712 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1235810 1235810 0 0.0
.debug_aranges 110736 110736 0 0.0
.debug_frame 371344 371344 0 0.0
.debug_info 2702594 27025948 1 0.0
.debug_line 3685828 3685828 0 0.0
.debug_loc 3603682 3603682 0 0.0
.debug_ranges 339560 339560 0 0.0
.debug_str 3435682 3435719 37 0.0
.heap 841968 841968 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 570280 570280 0 0.0
.symtab 421424 421424 0 0.0
.text 1546272 1546272 0 0.0
.zero.table 8 8 0 0.0
text 0 0 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 (read only) 842704 842704 0 0.0
(read/write) 1688644 1688644 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 187976 187976 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2664 2664 0 0.0
.debug_abbrev 1227653 1227653 0 0.0
.debug_aranges 110208 110208 0 0.0
.debug_frame 374424 374424 0 0.0
.debug_info 26762577 26762577 0 0.0
.debug_line 3706812 3706812 0 0.0
.debug_loc 3591319 3591319 0 0.0
.debug_ranges 338176 338176 0 0.0
.debug_str 3424711 3424748 37 0.0
.heap 842704 842704 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 534369 534369 0 0.0
.symtab 407856 407856 0 0.0
.text 1489616 1489616 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
light cy8ckit_062s2_43012 (read only) 850888 850888 0 0.0
(read/write) 1606972 1606972 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 180000 180000 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2456 2456 0 0.0
.debug_abbrev 1062114 1062114 0 0.0
.debug_aranges 102408 102408 0 0.0
.debug_frame 344740 344740 0 0.0
.debug_info 22228026 22228025 -1 -0.0
.debug_line 3276154 3276154 0 0.0
.debug_loc 3289030 3289030 0 0.0
.debug_ranges 303472 303472 0 0.0
.debug_str 3230138 3230175 37 0.0
.heap 850888 850888 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 470694 470694 0 0.0
.symtab 376240 376240 0 0.0
.text 1416128 1416128 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
lock cy8ckit_062s2_43012 (read only) 845896 845896 0 0.0
(read/write) 1640764 1640764 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 184976 184976 0 0.0
.comment 204 204 0 0.0
.copy.table 24 24 0 0.0
.cy_m0p_image 6216 6216 0 0.0
.cy_sharedmem 8 8 0 0.0
.data 2472 2472 0 0.0
.debug_abbrev 1064089 1064089 0 0.0
.debug_aranges 102808 102808 0 0.0
.debug_frame 346612 346612 0 0.0
.debug_info 22461401 22461402 1 0.0
.debug_line 3273048 3273048 0 0.0
.debug_loc 3316624 3316624 0 0.0
.debug_ranges 305416 305416 0 0.0
.debug_str 3249609 3249646 37 0.0
.heap 845896 845896 0 0.0
.noinit 148 148 0 0.0
.ramVectors 736 736 0 0.0
.shstrtab 288 288 0 0.0
.stab 156 156 0 0.0
.stabstr 335 335 0 0.0
.stack_dummy 4096 4096 0 0.0
.strtab 473097 473097 0 0.0
.symtab 377920 377920 0 0.0
.text 1444928 1444928 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1149520 1149520 0 0.0
.bss 110596 110596 0 0.0
.data 848 848 0 0.0
.text 596620 596620 0 0.0
lock-app qpg6105+debug (read/write) 1114312 1114312 0 0.0
.bss 106372 106372 0 0.0
.data 836 836 0 0.0
.text 561408 561408 0 0.0
telink all-clusters-app tlsr9518adk80d (read/write) 936772 936772 0 0.0
bss 81616 81616 0 0.0
noinit 43440 43440 0 0.0
text 648606 648606 0 0.0
all-clusters-minimal-app tlsr9518adk80d (read/write) 874748 874748 0 0.0
bss 80840 80840 0 0.0
noinit 43440 43440 0 0.0
text 612578 612578 0 0.0
light-switch-app tlsr9518adk80d (read/write) 790244 790244 0 0.0
bss 72464 72464 0 0.0
noinit 43520 43520 0 0.0
text 554106 554106 0 0.0
lighting-app tlsr9518adk80d (read/write) 874460 874468 8 0.0
bss 82232 82232 0 0.0
noinit 43520 43520 0 0.0
text 624084 624086 2 0.0
ota-requestor-app tlsr9518adk80d (read/write) 804736 804736 0 0.0
bss 74036 74036 0 0.0
noinit 43520 43520 0 0.0
text 565486 565486 0 0.0

@Damian-Nordic Damian-Nordic merged commit a99675e into project-chip:master Nov 4, 2022
adbridge pushed a commit to ARM-software/connectedhomeip that referenced this pull request Nov 18, 2022
…roject-chip#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
adbridge pushed a commit to ARM-software/connectedhomeip that referenced this pull request Nov 18, 2022
…roject-chip#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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants