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

Move APP/gen/callback.h to src/app/common/gen/ #8065

Merged
merged 2 commits into from
Jul 5, 2021

Conversation

vivien-apple
Copy link
Contributor

Problem

This PR moves APP/gen/callback.h to src/app/common/gen/callback.h and instead of generating declarations for enabled clusters, it generates declarations for all clusters.

Change overview

  • Move APP/gen/callback.h to src/app/common/gen/callback.h
  • Generate all declarations of callbacks into src/app/common/gen/callback.h since common does not in advance which clusters are enabled and this follow what is done for af-structs.h, enums.h and friends.
  • Use {{asUpperCamelCase}} and {{asLowerCase}} instead of {{asCamelCased}} to avoid issues with cluster names that contains characters not filtered by {{asCamelCased}}

Testing

There is no feature change, not real code change. This is mostly code beeing shuffled around.

@vivien-apple vivien-apple self-assigned this Jul 1, 2021
@vivien-apple vivien-apple changed the title Zap move callback h file Move APP/gen/callback.h to src/app/common/gen/ Jul 1, 2021
@vivien-apple
Copy link
Contributor Author

The Darwin CI task is failing because of #8021 :

/Users/runner/work/connectedhomeip/connectedhomeip/src/controller/data_model/gen/call-command-handler.cpp:23:10: fatal error: 'callback.h' file not found

@vivien-apple vivien-apple force-pushed the ZAP_MoveCallbackHFile branch from ddfd952 to f3e1129 Compare July 2, 2021 18:27
@woody-apple
Copy link
Contributor

@vivien-apple vivien-apple force-pushed the ZAP_MoveCallbackHFile branch from f3e1129 to 897991c Compare July 5, 2021 09:27
@andy31415
Copy link
Contributor

@vivien-apple - merge conflicts

@vivien-apple vivien-apple force-pushed the ZAP_MoveCallbackHFile branch from 897991c to 55f4628 Compare July 5, 2021 16:38
@mspang mspang merged commit 181046e into project-chip:master Jul 5, 2021
@franck-apple franck-apple added this to the Test Event 4 milestone Jul 7, 2021
vivien-apple added a commit to vivien-apple/connectedhomeip-1 that referenced this pull request Jul 7, 2021
* Move examples gen/callback.h to src/app/common/gen/callback.h

* Update gen/ folders
andy31415 pushed a commit that referenced this pull request Jul 8, 2021
…7934)"

This reverts commit 1048dca.

Revert to enable ordered cherrypicks including #8065
andy31415 pushed a commit that referenced this pull request Jul 8, 2021
* Move examples gen/callback.h to src/app/common/gen/callback.h

* Update gen/ folders
nikita-s-wrk pushed a commit to nikita-s-wrk/connectedhomeip that referenced this pull request Sep 23, 2021
* Move examples gen/callback.h to src/app/common/gen/callback.h

* Update gen/ folders
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.

8 participants