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.

Sign up for GitHub

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

Jump to bottom

[1.0 Cherry Pick] Add Chef Color Temperature Light (#22956) #23191

Merged
merged 3 commits into from
Oct 14, 2022
Merged

[1.0 Cherry Pick] Add Chef Color Temperature Light (#22956) #23191

merged 3 commits into from
Oct 14, 2022

Conversation

erwinpan1
Copy link
Contributor

@erwinpan1 erwinpan1 commented Oct 14, 2022 •
edited
Loading

Fixes #23149

Add Chef Color Temperature Light
Add new chef device : colortemperaturelight

Restyled by whitespace

Restyled by clang-format

Remove Chef ColorTemperatureLight Clusters.matter

Remove unused Clusters.matter
zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/Clusters.matter

Remove Scene Cluster which is not supported in 1.0

Restyled by whitespace

Restyled by clang-format

Remove unnecessary clusters fro chef colortemperature device

The current chef Color Temperature Light device contains several unnecessary clusters such as Switch, LocalizationConfiguration, , TimeFormatLocalization.

Putting a Switch cluster in the EP0 (root node) is wrong. While we don't need to localize text/time for a light. So we remove them all.

Fix Chef color temperature light zzz_generated
After removing Switch/LocalizationConfiguration/TimeFormat clusters, the codes in zzz_generated are also regenerated and should be committed

Fix chef colortemperaturelight matter new format
Fix examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter which defines new matter format "fabric_scoped"

Remove FixedLabel & UserLabel which doesn't apply here

Restyled by whitespace

Restyled by clang-format

Co-authored-by: Restyled.io commits@restyled.io

erwinpan1 and others added 2 commits October 12, 2022 23:08
@erwinpan1 @restyled-commits
Add Chef Color Temperature Light (project-chip#22956)
c870385 
* Add Chef Color Temperature Light

Add new chef device : colortemperaturelight

* Restyled by whitespace

* Restyled by clang-format

* Remove Chef ColorTemperatureLight Clusters.matter

Remove unused Clusters.matter
zzz_generated/chef-rootnode_colortemperaturelight_hbUnzYVeyn/zap-generated/Clusters.matter

* Remove Scene Cluster which is not supported in 1.0

* Restyled by whitespace

* Restyled by clang-format

* Remove unnecessary clusters fro chef colortemperature device

The current chef Color Temperature Light device contains several
unnecessary clusters such as Switch, LocalizationConfiguration,
, TimeFormatLocalization.

Putting a Switch cluster in the EP0 (root node) is wrong.
While we don't need to localize text/time for a light.
So we remove them all.

* Fix Chef color temperature light zzz_generated

After removing Switch/LocalizationConfiguration/TimeFormat clusters,
the codes in zzz_generated are also regenerated and should be committed

* Fix chef colortemperaturelight matter new format

Fix examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
which defines new matter format "fabric_scoped"

* Remove FixedLabel & UserLabel which doesn't apply here

* Restyled by whitespace

* Restyled by clang-format

Co-authored-by: Restyled.io <commits@restyled.io>
@erwinpan1
Fix rootnode_colortemperaturelight_hbUnzYVeyn.matter
0fb71f4 
Fix rootnode_colortemperaturelight_hbUnzYVeyn.matter lint error
(fabric_scoped) due to cherry-pick from master
@erwinpan1 erwinpan1 mentioned this pull request Oct 14, 2022
Closed
@github-actions
Copy link

github-actions bot commented Oct 14, 2022 •
edited
Loading

PR #23191: Size comparison from 4589a52 to 9729848

Increases (4 builds for cc13x2_26x2, psoc6, telink)
platform target config section 4589a52 9729848 change % change
cc13x2_26x2 pump-controller-app LP_CC2652R7 (read/write) 177324 177332 8 0.0
psoc6 all-clusters-minimal cy8ckit_062s2_43012 .debug_info 26560017 26560018 1 0.0
telink light-switch-app tlsr9518adk80d text 574798 574800 2 0.0
ota-requestor-app tlsr9518adk80d (read/write) 844140 844148 8 0.0
text 599200 599202 2 0.0
Decreases (6 builds for bl602, bl702, cc13x2_26x2, esp32, k32w, nrfconnect)
platform target config section 4589a52 9729848 change % change
bl602 lighting-app bl602+rpc (read/write) 1434182 1434174 -8 -0.0
.text 1099890 1099888 -2 -0.0
bl702 lighting-app bl702+rpc .debug_info 41806567 41806566 -1 -0.0
.text 1031064 1031062 -2 -0.0
cc13x2_26x2 pump-controller-app LP_CC2652R7 (read only) 672195 672187 -8 -0.0
.text 585464 585456 -8 -0.0
esp32 all-clusters-app c3devkit (read only) 1223182 1223180 -2 -0.0
(read/write) 1788302 1788294 -8 -0.0
.flash.rodata 257872 257864 -8 -0.0
.flash.text 1223182 1223180 -2 -0.0
k32w lock k32w0+release (read/write) 635688 635672 -16 -0.0
.text 555280 555264 -16 -0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 text 815496 815492 -4 -0.0
Full report (37 builds for bl602, bl702, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, psoc6, qpg, telink)
platform target config section 4589a52 9729848 change % change
bl602 lighting-app bl602 (read/write) 1388962 1388962 0 0.0
.bss 90529 90529 0 0.0
.data 9936 9936 0 0.0
.text 1068542 1068542 0 0.0
bl602+rpc (read/write) 1434182 1434174 -8 -0.0
.bss 97961 97961 0 0.0
.data 10320 10320 0 0.0
.text 1099890 1099888 -2 -0.0
bl702 lighting-app bl702 (read only) 3262 3262 0 0.0
(read/write) 1188939 1188939 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 67006 67006 0 0.0
.bss_psram 29696 29696 0 0.0
.comment 48 48 0 0.0
.data 4280 4280 0 0.0
.debug_abbrev 1506948 1506948 0 0.0
.debug_aranges 133168 133168 0 0.0
.debug_frame 486676 486676 0 0.0
.debug_info 37899948 37899948 0 0.0
.debug_line 5256897 5256897 0 0.0
.debug_loc 3364109 3364109 0 0.0
.debug_ranges 360032 360032 0 0.0
.debug_str 3456613 3456613 0 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 116792 116792 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 565170 565170 0 0.0
.symtab 171856 171856 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
957356 957356 0 0.0
bl702+rpc (read only) 3262 3262 0 0.0
(read/write) 1284867 1284867 0 0.0
.bleromro 6296 6296 0 0.0
.bleromrw 124 124 0 0.0
.boot2 688 688 0 0.0
.bss 75038 75038 0 0.0
.bss_psram 29936 29936 0 0.0
.comment 48 48 0 0.0
.data 4800 4800 0 0.0
.debug_abbrev 1644527 1644527 0 0.0
.debug_aranges 140672 140672 0 0.0
.debug_frame 512052 512052 0 0.0
.debug_info 41806567 41806566 -1 -0.0
.debug_line 5631432 5631432 0 0.0
.debug_loc 3556789 3556789 0 0.0
.debug_ranges 382488 382488 0 0.0
.debug_str 3852580 3852580 0 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 130200 130200 0 0.0
.rsvd 3188 3188 0 0.0
.shstrtab 293 293 0 0.0
.stack 2048 2048 0 0.0
.strtab 624343 624343 0 0.0
.symtab 189664 189664 0 0.0
.tcm_data 36 36 0 0.0
.tcmcode 3262 3262 0 0.0
.text 0 0 0 0.0
1031064 1031062 -2 -0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 676995 676995 0 0.0
(read/write) 174540 174540 0 0.0
.bss 81228 81228 0 0.0
.data 3380 3380 0 0.0
.rodata 89787 89787 0 0.0
.text 586896 586896 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 641235 641235 0 0.0
(read/write) 157996 157996 0 0.0
.bss 80500 80500 0 0.0
.data 3380 3380 0 0.0
.rodata 78923 78923 0 0.0
.text 561992 561992 0 0.0
lock-ftd LP_CC2652R7 (read only) 678519 678519 0 0.0
(read/write) 170184 170184 0 0.0
.bss 78484 78484 0 0.0
.data 3304 3304 0 0.0
.rodata 77471 77471 0 0.0
.text 600568 600568 0 0.0
lock-mtd LP_CC2652R7 (read only) 662347 662347 0 0.0
(read/write) 182044 182044 0 0.0
.bss 74172 74172 0 0.0
.data 3304 3304 0 0.0
.rodata 103307 103307 0 0.0
.text 558560 558560 0 0.0
pump-app LP_CC2652R7 (read only) 687687 687687 0 0.0
(read/write) 161720 161720 0 0.0
.bss 78420 78420 0 0.0
.data 3296 3296 0 0.0
.rodata 90695 90695 0 0.0
.text 596508 596508 0 0.0
pump-controller-app LP_CC2652R7 (read only) 672195 672187 -8 -0.0
(read/write) 177324 177332 8 0.0
.bss 78532 78532 0 0.0
.data 3292 3292 0 0.0
.rodata 86251 86251 0 0.0
.text 585464 585456 -8 -0.0
shell LP_CC2652R7 (read only) 667990 667990 0 0.0
(read/write) 185856 185856 0 0.0
.bss 83540 83540 0 0.0
.data 3376 3376 0 0.0
.rodata 86502 86502 0 0.0
.text 581172 581172 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 587730 587730 0 0.0
.app_xip_area 464356 464356 0 0.0
.bss 65792 65792 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) 594778 594778 0 0.0
.app_xip_area 466076 466076 0 0.0
.bss 71112 71112 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) 543702 543702 0 0.0
.app_xip_area 425384 425384 0 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 (read/write) 1110016 1110016 0 0.0
.bss 136340 136340 0 0.0
.data 2072 2072 0 0.0
.text 971584 971584 0 0.0
BRD4161A+rpc (read/write) 973588 973588 0 0.0
.bss 150852 150852 0 0.0
.data 2252 2252 0 0.0
.text 820460 820460 0 0.0
BRD4161A+rs911x (read/write) 1003312 1003312 0 0.0
.bss 169176 169176 0 0.0
.data 2064 2064 0 0.0
.text 832052 832052 0 0.0
lock-app BRD4161A+wf200 (read/write) 1151140 1151140 0 0.0
.bss 152264 152264 0 0.0
.data 2072 2072 0 0.0
.text 996784 996784 0 0.0
window-app BRD4161A (read/write) 1103612 1103612 0 0.0
.bss 137788 137788 0 0.0
.data 2096 2096 0 0.0
.text 963708 963708 0 0.0
esp32 all-clusters-app c3devkit (read only) 1223182 1223180 -2 -0.0
(read/write) 1788302 1788294 -8 -0.0
.dram0.bss 76944 76944 0 0.0
.dram0.data 13840 13840 0 0.0
.flash.rodata 257872 257864 -8 -0.0
.flash.text 1223182 1223180 -2 -0.0
.iram0.text 65204 65204 0 0.0
m5stack (read only) 1233251 1233251 0 0.0
(read/write) 564188 564188 0 0.0
.dram0.bss 82304 82304 0 0.0
.dram0.data 34296 34296 0 0.0
.flash.rodata 314920 314920 0 0.0
.flash.text 1227867 1227867 0 0.0
.iram0.text 123939 123939 0 0.0
k32w light k32w0+release (read/write) 641608 641608 0 0.0
.bss 74816 74816 0 0.0
.data 2064 2064 0 0.0
.text 562000 562000 0 0.0
lock k32w0+release (read/write) 635688 635672 -16 -0.0
.bss 75600 75600 0 0.0
.data 2080 2080 0 0.0
.text 555280 555264 -16 -0.0
linux chip-tool-ipv6only arm64 (read only) 10360092 10360092 0 0.0
(read/write) 706337 706337 0 0.0
.bss 33953 33953 0 0.0
.data 2768 2768 0 0.0
.data.rel.ro 650608 650608 0 0.0
.dynamic 560 560 0 0.0
.got 13904 13904 0 0.0
.init 24 24 0 0.0
.init_array 208 208 0 0.0
.rodata 504540 504540 0 0.0
.text 8200036 8200036 0 0.0
thermostat-no-ble arm64 (read only) 2389636 2389636 0 0.0
(read/write) 143601 143601 0 0.0
.bss 55361 55361 0 0.0
.data 1816 1816 0 0.0
.data.rel.ro 77232 77232 0 0.0
.dynamic 560 560 0 0.0
.got 5184 5184 0 0.0
.init 24 24 0 0.0
.init_array 440 440 0 0.0
.rodata 144300 144300 0 0.0
.text 2002480 2002480 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2456016 2456016 0 0.0
.bss 215044 215044 0 0.0
.data 5872 5872 0 0.0
.text 1418660 1418660 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1182455 1182455 0 0.0
bss 143633 143633 0 0.0
rodata 144376 144376 0 0.0
text 815496 815492 -4 -0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1161091 1161091 0 0.0
bss 142860 142860 0 0.0
rodata 135948 135948 0 0.0
text 803360 803360 0 0.0
psoc6 all-clusters cy8ckit_062s2_43012 (read only) 841968 841968 0 0.0
(read/write) 1744732 1744732 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 1229290 1229290 0 0.0
.debug_aranges 111840 111840 0 0.0
.debug_frame 373436 373436 0 0.0
.debug_info 26823235 26823235 0 0.0
.debug_line 3670828 3670828 0 0.0
.debug_loc 3584515 3584515 0 0.0
.debug_ranges 340272 340272 0 0.0
.debug_str 3440051 3440051 0 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 569581 569581 0 0.0
.symtab 421136 421136 0 0.0
.text 1544968 1544968 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) 1687332 1687332 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 1221089 1221089 0 0.0
.debug_aranges 111312 111312 0 0.0
.debug_frame 376516 376516 0 0.0
.debug_info 26560017 26560018 1 0.0
.debug_line 3691544 3691544 0 0.0
.debug_loc 3572152 3572152 0 0.0
.debug_ranges 338888 338888 0 0.0
.debug_str 3429064 3429064 0 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 533670 533670 0 0.0
.symtab 407568 407568 0 0.0
.text 1488304 1488304 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
light cy8ckit_062s2_43012 (read only) 850896 850896 0 0.0
(read/write) 1605868 1605868 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 179992 179992 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 1055145 1055145 0 0.0
.debug_aranges 103520 103520 0 0.0
.debug_frame 346844 346844 0 0.0
.debug_info 22024213 22024213 0 0.0
.debug_line 3261462 3261462 0 0.0
.debug_loc 3270218 3270218 0 0.0
.debug_ranges 304216 304216 0 0.0
.debug_str 3234596 3234596 0 0.0
.heap 850896 850896 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 470047 470047 0 0.0
.symtab 376016 376016 0 0.0
.text 1415032 1415032 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
lock cy8ckit_062s2_43012 (read only) 845864 845864 0 0.0
(read/write) 1643732 1643732 0 0.0
.ARM.attributes 46 46 0 0.0
.ARM.exidx 8 8 0 0.0
.bss 185008 185008 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 1062564 1062564 0 0.0
.debug_aranges 104192 104192 0 0.0
.debug_frame 349668 349668 0 0.0
.debug_info 22403565 22403565 0 0.0
.debug_line 3270178 3270178 0 0.0
.debug_loc 3310090 3310090 0 0.0
.debug_ranges 307560 307560 0 0.0
.debug_str 3262051 3262051 0 0.0
.heap 845864 845864 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 476287 476287 0 0.0
.symtab 379248 379248 0 0.0
.text 1447864 1447864 0 0.0
.zero.table 0 0 0 0.0
8 8 0 0.0
qpg lighting-app qpg6105+debug (read/write) 1148516 1148516 0 0.0
.bss 110348 110348 0 0.0
.data 832 832 0 0.0
.text 595616 595616 0 0.0
lock-app qpg6105+debug (read/write) 1116436 1116436 0 0.0
.bss 106172 106172 0 0.0
.data 836 836 0 0.0
.text 563532 563532 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 814084 814084 0 0.0
bss 71372 71372 0 0.0
noinit 43488 43488 0 0.0
text 574798 574800 2 0.0
lighting-app tlsr9518adk80d (read/write) 836188 836188 0 0.0
bss 72228 72228 0 0.0
noinit 43488 43488 0 0.0
text 593018 593018 0 0.0
ota-requestor-app tlsr9518adk80d (read/write) 844140 844148 8 0.0
bss 73136 73136 0 0.0
noinit 43488 43488 0 0.0
text 599200 599202 2 0.0

@andy31415 andy31415 merged commit 0b9cae0 into project-chip:v1.0-branch Oct 14, 2022
@erwinpan1 erwinpan1 deleted the cherry_pick_add_color_temperature branch April 6, 2023 03:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andy31415 andy31415 andy31415 approved these changes

Assignees
No one assigned
Labels
examples
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@erwinpan1 @andy31415