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

Feature/enhanced setup flow feature #34065

Merged

Conversation

swan-amazon
Copy link
Contributor

@swan-amazon swan-amazon commented Jun 24, 2024

Integrate Terms and Conditions Acknowledgements in Commissioning Process

Fixes #34064

  1. Add support for setting Terms and Conditions acknowledgements

    • Added functionality to set Terms and Conditions acknowledgements and
      acknowledgment version in the General Commissioning cluster.
    • Implemented corresponding commands and responses to handle
      acknowledgements.
  2. Enhance setup flow handling

    • Refactored the setup flow handling to accommodate setting Terms and
      Conditions acknowledgements.
    • Updated the commissioning stages to include configuring Terms and
      Conditions acknowledgements.
  3. Handle setting Terms and Conditions acknowledgements

    • Implemented setting Terms and Conditions acknowledgements in the
      commissioning process.
    • Implemented proper handling of command responses and error checking.
  4. Zap regen

    python3 ./scripts/tools/zap_regen_all.py

Testing

image

src/app/server/BUILD.gn Outdated Show resolved Hide resolved
Copy link
Contributor

@andy31415 andy31415 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please create some source set for h/cpp to go together, so that we can ensure correct layering.

- Moved the configuration from core into app buildconfig
- renamed the flag to expand `TC` into `TERMS AND CONDITIONS`
- updated includes in general-commissioning to include the right header
- added the configuration as a build option into targets.py/host.py
- updated unit test
- Create a separate source set for terms and conditions
- include the manager cpp in that file
- make the build conditional (this required flag moving)
- fixed typo in targets.py to make things compile

Compile-tested only (the -terms-and-conditions variant of all clusters
compiled)
@andy31415 andy31415 dismissed their stale review December 16, 2024 14:50

I updated the code to have cpp compiled in and build-tested the new build flag.

Copy link

github-actions bot commented Dec 16, 2024

PR #34065: Size comparison from cfdaf79 to 813c8e9

Full report (69 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section cfdaf79 813c8e9 change % change
bl602 lighting-app bl602+mfd+littlefs+rpc FLASH 1353340 1353606 266 0.0
RAM 104112 104136 24 0.0
bl702 lighting-app bl702+eth FLASH 651826 651834 8 0.0
RAM 25353 25353 0 0.0
bl702+wifi FLASH 829154 829418 264 0.0
RAM 14093 14093 0 0.0
bl706+mfd+rpc+littlefs FLASH 1057626 1057890 264 0.0
RAM 23933 23933 0 0.0
bl702l lighting-app bl702l+mfd+littlefs FLASH 979000 979264 264 0.0
RAM 16596 16596 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 839760 839812 52 0.0
RAM 123664 123672 8 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 825308 825352 44 0.0
RAM 125552 125560 8 0.0
pump-app LP_EM_CC1354P10_6 FLASH 772096 772244 148 0.0
RAM 114020 114036 16 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 756300 756440 140 0.0
RAM 114228 114236 8 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 539605 539753 148 0.0
RAM 205760 205776 16 0.0
lock CC3235SF_LAUNCHXL FLASH 573885 574025 140 0.0
RAM 205904 205920 16 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 681513 681657 144 0.0
RAM 78724 78732 8 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 701357 701509 152 0.0
RAM 81364 81372 8 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 701357 701509 152 0.0
RAM 81364 81372 8 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 658301 658445 144 0.0
RAM 73792 73800 8 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 618073 618209 136 0.0
RAM 71708 71724 16 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 637701 637845 144 0.0
RAM 74252 74268 16 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 637701 637845 144 0.0
RAM 74252 74268 16 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 637473 637617 144 0.0
RAM 74724 74732 8 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 657181 657325 144 0.0
RAM 77268 77276 8 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 657181 657325 144 0.0
RAM 77268 77276 8 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 613933 614077 144 0.0
RAM 68812 68820 8 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 633785 633929 144 0.0
RAM 71444 71452 8 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 633785 633929 144 0.0
RAM 71444 71452 8 0.0
efr32 lock-app BRD4187C FLASH 932340 932492 152 0.0
RAM 160192 160204 12 0.0
BRD4338a FLASH 746256 746448 192 0.0
RAM 233320 233332 12 0.0
window-app BRD4187C FLASH 1024912 1025128 216 0.0
RAM 128296 128308 12 0.0
esp32 all-clusters-app c3devkit DRAM 95360 95384 24 0.0
FLASH 1543380 1543518 138 0.0
IRAM 82542 82542 0 0.0
m5stack DRAM 116312 116328 16 0.0
FLASH 1549950 1550086 136 0.0
IRAM 117039 117039 0 0.0
linux air-purifier-app debug unknown 4720 4720 0 0.0
FLASH 2715629 2716107 478 0.0
RAM 129800 129896 96 0.1
all-clusters-app debug unknown 5560 5560 0 0.0
FLASH 6009314 6009792 478 0.0
RAM 523544 523640 96 0.0
all-clusters-minimal-app debug unknown 5456 5456 0 0.0
FLASH 5345370 5345880 510 0.0
RAM 242600 242696 96 0.0
bridge-app debug unknown 5440 5440 0 0.0
FLASH 4684938 4685416 478 0.0
RAM 218416 218512 96 0.0
chip-tool debug unknown 5992 5992 0 0.0
FLASH 12849310 12849310 0 0.0
RAM 582506 582506 0 0.0
chip-tool-ipv6only arm64 unknown 21352 21352 0 0.0
FLASH 10983936 10983936 0 0.0
RAM 633424 633424 0 0.0
fabric-admin debug unknown 5816 5816 0 0.0
FLASH 11255859 11255859 0 0.0
RAM 582850 582850 0 0.0
fabric-bridge-app debug unknown 4696 4696 0 0.0
FLASH 4510514 4510992 478 0.0
RAM 205600 205696 96 0.0
fabric-sync debug unknown 4936 4936 0 0.0
FLASH 5610549 5611061 512 0.0
RAM 472584 472680 96 0.0
lighting-app debug+rpc+ui unknown 6104 6104 0 0.0
FLASH 5621633 5622145 512 0.0
RAM 228792 228888 96 0.0
lock-app debug unknown 5376 5376 0 0.0
FLASH 4734178 4734688 510 0.0
RAM 204776 204872 96 0.0
ota-provider-app debug unknown 4752 4752 0 0.0
FLASH 4359916 4360394 478 0.0
RAM 198448 198544 96 0.0
ota-requestor-app debug unknown 4688 4688 0 0.0
FLASH 4498908 4499418 510 0.0
RAM 203032 203128 96 0.0
shell debug unknown 4248 4248 0 0.0
FLASH 3032765 3033245 480 0.0
RAM 160424 160520 96 0.1
thermostat-no-ble arm64 unknown 9536 9552 16 0.2
FLASH 4104176 4104672 496 0.0
RAM 243040 243160 120 0.0
tv-app debug unknown 5704 5704 0 0.0
FLASH 5959461 5959941 480 0.0
RAM 596016 596112 96 0.0
tv-casting-app debug unknown 5288 5288 0 0.0
FLASH 11055165 11055693 528 0.0
RAM 692184 692328 144 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 917880 918024 144 0.0
RAM 143292 143312 20 0.0
nrf7002dk_nrf5340_cpuapp FLASH 890360 890456 96 0.0
RAM 141487 141499 12 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 851772 851916 144 0.0
RAM 142200 142220 20 0.0
nxp contact k32w0+release FLASH 585440 585472 32 0.0
RAM 71080 71088 8 0.0
mcxw71+release FLASH 600048 600184 136 0.0
RAM 63176 63184 8 0.0
light k32w0+release FLASH 612412 612476 64 0.0
RAM 70472 70480 8 0.0
k32w1+release FLASH 686592 686736 144 0.0
RAM 48808 48816 8 0.0
lock mcxw71+release FLASH 762928 763072 144 0.0
RAM 70844 70852 8 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1646812 1646996 184 0.0
RAM 212104 212112 8 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1554236 1554436 200 0.0
RAM 208904 208920 16 0.0
light cy8ckit_062s2_43012 FLASH 1469564 1469748 184 0.0
RAM 200880 200888 8 0.0
lock cy8ckit_062s2_43012 FLASH 1467292 1467492 200 0.0
RAM 225240 225248 8 0.0
qpg lighting-app qpg6105+debug FLASH 664024 664160 136 0.0
RAM 105424 105432 8 0.0
lock-app qpg6105+debug FLASH 621812 621948 136 0.0
RAM 99868 99884 16 0.0
stm32 light STM32WB5MM-DK FLASH 484728 484868 140 0.0
RAM 144880 144888 8 0.0
telink bridge-app tlsr9258a FLASH 682916 683072 156 0.0
RAM 91208 91224 16 0.0
contact-sensor-app tlsr9528a_retention FLASH 623346 623486 140 0.0
RAM 31440 31456 16 0.1
light-app-ota-compress-lzma-shell-factory-data tl3218x FLASH 772176 772304 128 0.0
RAM 49300 49316 16 0.0
light-switch-app-ota-compress-lzma-shell-factory-data tlsr9528a FLASH 710770 710926 156 0.0
RAM 73504 73520 16 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 627790 627942 152 0.0
RAM 142140 142156 16 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 813804 813960 156 0.0
RAM 99684 99700 16 0.0
tizen all-clusters-app arm unknown 4988 4996 8 0.2
FLASH 1734440 1734820 380 0.0
RAM 90744 90792 48 0.1
chip-tool-ubsan arm unknown 10804 10804 0 0.0
FLASH 17973406 17973406 0 0.0
RAM 7842608 7842608 0 0.0

Copy link

github-actions bot commented Dec 16, 2024

PR #34065: Size comparison from cfdaf79 to 64df3b6

Full report (69 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
platform target config section cfdaf79 64df3b6 change % change
bl602 lighting-app bl602+mfd+littlefs+rpc FLASH 1353340 1353606 266 0.0
RAM 104112 104136 24 0.0
bl702 lighting-app bl702+eth FLASH 651826 651834 8 0.0
RAM 25353 25353 0 0.0
bl702+wifi FLASH 829154 829418 264 0.0
RAM 14093 14093 0 0.0
bl706+mfd+rpc+littlefs FLASH 1057626 1057890 264 0.0
RAM 23933 23933 0 0.0
bl702l lighting-app bl702l+mfd+littlefs FLASH 979000 979264 264 0.0
RAM 16596 16596 0 0.0
cc13x4_26x4 lighting-app LP_EM_CC1354P10_6 FLASH 839760 839812 52 0.0
RAM 123664 123672 8 0.0
lock-ftd LP_EM_CC1354P10_6 FLASH 825308 825352 44 0.0
RAM 125552 125560 8 0.0
pump-app LP_EM_CC1354P10_6 FLASH 772096 772244 148 0.0
RAM 114020 114036 16 0.0
pump-controller-app LP_EM_CC1354P10_6 FLASH 756300 756440 140 0.0
RAM 114228 114236 8 0.0
cc32xx air-purifier CC3235SF_LAUNCHXL FLASH 539605 539753 148 0.0
RAM 205760 205776 16 0.0
lock CC3235SF_LAUNCHXL FLASH 573885 574025 140 0.0
RAM 205904 205920 16 0.0
cyw30739 light CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 681513 681657 144 0.0
RAM 78724 78732 8 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 701357 701509 152 0.0
RAM 81364 81372 8 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 701357 701509 152 0.0
RAM 81364 81372 8 0.0
CYW930739M2EVB-02 unknown 2040 2040 0 0.0
FLASH 658301 658445 144 0.0
RAM 73792 73800 8 0.0
light-switch CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 618073 618209 136 0.0
RAM 71708 71724 16 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 637701 637845 144 0.0
RAM 74252 74268 16 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 637701 637845 144 0.0
RAM 74252 74268 16 0.0
lock CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 637473 637617 144 0.0
RAM 74724 74732 8 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 657181 657325 144 0.0
RAM 77268 77276 8 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 657181 657325 144 0.0
RAM 77268 77276 8 0.0
thermostat CYW30739B2-P5-EVK-01 unknown 2040 2040 0 0.0
FLASH 613933 614077 144 0.0
RAM 68812 68820 8 0.0
CYW30739B2-P5-EVK-02 unknown 2040 2040 0 0.0
FLASH 633785 633929 144 0.0
RAM 71444 71452 8 0.0
CYW30739B2-P5-EVK-03 unknown 2040 2040 0 0.0
FLASH 633785 633929 144 0.0
RAM 71444 71452 8 0.0
efr32 lock-app BRD4187C FLASH 932340 932492 152 0.0
RAM 160192 160204 12 0.0
BRD4338a FLASH 746256 746448 192 0.0
RAM 233320 233332 12 0.0
window-app BRD4187C FLASH 1024912 1025128 216 0.0
RAM 128296 128308 12 0.0
esp32 all-clusters-app c3devkit DRAM 95360 95376 16 0.0
FLASH 1543380 1543422 42 0.0
IRAM 82542 82542 0 0.0
m5stack DRAM 116312 116320 8 0.0
FLASH 1549950 1549994 44 0.0
IRAM 117039 117039 0 0.0
linux air-purifier-app debug unknown 4720 4720 0 0.0
FLASH 2715629 2716107 478 0.0
RAM 129800 129896 96 0.1
all-clusters-app debug unknown 5560 5560 0 0.0
FLASH 6009314 6009308 -6 -0.0
RAM 523544 523640 96 0.0
all-clusters-minimal-app debug unknown 5456 5456 0 0.0
FLASH 5345370 5345880 510 0.0
RAM 242600 242696 96 0.0
bridge-app debug unknown 5440 5440 0 0.0
FLASH 4684938 4685416 478 0.0
RAM 218416 218512 96 0.0
chip-tool debug unknown 5992 5992 0 0.0
FLASH 12849310 12849310 0 0.0
RAM 582506 582506 0 0.0
chip-tool-ipv6only arm64 unknown 21352 21352 0 0.0
FLASH 10983936 10983936 0 0.0
RAM 633424 633424 0 0.0
fabric-admin debug unknown 5816 5816 0 0.0
FLASH 11255859 11255859 0 0.0
RAM 582850 582850 0 0.0
fabric-bridge-app debug unknown 4696 4696 0 0.0
FLASH 4510514 4510992 478 0.0
RAM 205600 205696 96 0.0
fabric-sync debug unknown 4936 4936 0 0.0
FLASH 5610549 5611061 512 0.0
RAM 472584 472680 96 0.0
lighting-app debug+rpc+ui unknown 6104 6104 0 0.0
FLASH 5621633 5622145 512 0.0
RAM 228792 228888 96 0.0
lock-app debug unknown 5376 5376 0 0.0
FLASH 4734178 4734688 510 0.0
RAM 204776 204872 96 0.0
ota-provider-app debug unknown 4752 4752 0 0.0
FLASH 4359916 4360394 478 0.0
RAM 198448 198544 96 0.0
ota-requestor-app debug unknown 4688 4688 0 0.0
FLASH 4498908 4499418 510 0.0
RAM 203032 203128 96 0.0
shell debug unknown 4248 4248 0 0.0
FLASH 3032765 3033245 480 0.0
RAM 160424 160520 96 0.1
thermostat-no-ble arm64 unknown 9536 9552 16 0.2
FLASH 4104176 4104672 496 0.0
RAM 243040 243160 120 0.0
tv-app debug unknown 5704 5704 0 0.0
FLASH 5959461 5959941 480 0.0
RAM 596016 596112 96 0.0
tv-casting-app debug unknown 5288 5288 0 0.0
FLASH 11055165 11055693 528 0.0
RAM 692184 692328 144 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 FLASH 917880 918024 144 0.0
RAM 143292 143308 16 0.0
nrf7002dk_nrf5340_cpuapp FLASH 890360 890456 96 0.0
RAM 141487 141495 8 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 FLASH 851772 851916 144 0.0
RAM 142200 142220 20 0.0
nxp contact k32w0+release FLASH 585440 585472 32 0.0
RAM 71080 71088 8 0.0
mcxw71+release FLASH 600048 600184 136 0.0
RAM 63176 63184 8 0.0
light k32w0+release FLASH 612412 612476 64 0.0
RAM 70472 70480 8 0.0
k32w1+release FLASH 686592 686736 144 0.0
RAM 48808 48816 8 0.0
lock mcxw71+release FLASH 762928 763072 144 0.0
RAM 70844 70852 8 0.0
psoc6 all-clusters cy8ckit_062s2_43012 FLASH 1646812 1646996 184 0.0
RAM 212104 212104 0 0.0
all-clusters-minimal cy8ckit_062s2_43012 FLASH 1554236 1554436 200 0.0
RAM 208904 208920 16 0.0
light cy8ckit_062s2_43012 FLASH 1469564 1469748 184 0.0
RAM 200880 200888 8 0.0
lock cy8ckit_062s2_43012 FLASH 1467292 1467492 200 0.0
RAM 225240 225248 8 0.0
qpg lighting-app qpg6105+debug FLASH 664024 664160 136 0.0
RAM 105424 105432 8 0.0
lock-app qpg6105+debug FLASH 621812 621948 136 0.0
RAM 99868 99884 16 0.0
stm32 light STM32WB5MM-DK FLASH 484728 484868 140 0.0
RAM 144880 144888 8 0.0
telink bridge-app tlsr9258a FLASH 682916 683072 156 0.0
RAM 91208 91224 16 0.0
contact-sensor-app tlsr9528a_retention FLASH 623346 623486 140 0.0
RAM 31440 31456 16 0.1
light-app-ota-compress-lzma-shell-factory-data tl3218x FLASH 772176 772304 128 0.0
RAM 49300 49316 16 0.0
light-switch-app-ota-compress-lzma-shell-factory-data tlsr9528a FLASH 710770 710926 156 0.0
RAM 73504 73520 16 0.0
lighting-app-ota-factory-data tlsr9118bdk40d FLASH 627790 627942 152 0.0
RAM 142140 142156 16 0.0
lighting-app-ota-rpc-factory-data-4mb tlsr9518adk80d FLASH 813804 813960 156 0.0
RAM 99684 99700 16 0.0
tizen all-clusters-app arm unknown 4988 4996 8 0.2
FLASH 1734440 1734820 380 0.0
RAM 90744 90784 40 0.0
chip-tool-ubsan arm unknown 10804 10804 0 0.0
FLASH 17973406 17973406 0 0.0
RAM 7842608 7842608 0 0.0

@mergify mergify bot merged commit 4e44586 into project-chip:master Dec 16, 2024
68 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

[Feature] Implement Enhanced Setup Flow for core platform