Update chip-tool zapt to align with src/app/zap-templates #5141
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pullapprove
bot
requested review from
andy31415,
bzbarsky-apple,
chrisdecenzo,
hawk248,
jelderton,
msandstedt,
mspang,
saurabhst and
woody-apple
yufengwangca
requested review from
lazarkov
and removed request for
mspang,
andy31415,
msandstedt,
saurabhst,
hawk248,
woody-apple,
chrisdecenzo,
jelderton and
bzbarsky-apple
pullapprove
bot
requested review from
andy31415,
bzbarsky-apple,
chrisdecenzo,
hawk248,
jelderton,
msandstedt,
mspang,
saurabhst and
woody-apple
pullapprove
bot
requested review from
andy31415,
bzbarsky-apple,
chrisdecenzo,
hawk248,
jelderton,
msandstedt,
mspang,
saurabhst and
woody-apple
saurabhst
approved these changes
Mar 3, 2021
andy31415
approved these changes
Mar 3, 2021
|
|
andy31415
reviewed
Mar 4, 2021
| @@ -117,7 +125,7 @@ public: | |||
|
|
|||
| chip::Controller::{{asCamelCased parent.name false}}Cluster cluster; | |||
| cluster.Associate(device, endpointId); | |||
| return cluster.{{asCamelCased name false}}(onSuccessCallback->Cancel(), onFailureCallback->Cancel(){{#chip_server_cluster_command_arguments}}, {{#if (isByteString type)}} reinterpret_cast<uint8_t*>(m{{asCamelCased label false}}), static_cast<uint32_t>(strlen(m{{asCamelCased label false}})){{else}}m{{asCamelCased label false}}{{/if}}{{/chip_server_cluster_command_arguments}}); | |||
| return cluster.{{asCamelCased name false}}(onSuccessCallback->Cancel(), onFailureCallback->Cancel(){{#chip_server_cluster_command_arguments}}, {{#if (isByteString type)}} reinterpret_cast<char*>(m{{asCamelCased label false}}){{else}}m{{asCamelCased label false}}{{/if}}{{/chip_server_cluster_command_arguments}}); | |||
There was a problem hiding this comment.
Bytes seem to be more correctly represented as uint8_t than char .
Should we not update the other way and enter a bug that 'using strlen for byte strings is not ok'?
There was a problem hiding this comment.
The byte string bit is going to get fixed in #5122 to some extent, right? Though I guess #5122 (comment) is precisely about needing to change the member here to ByteSpan too.
And the rest of this looks like the PR I asked for in #5122 (comment) which I obviously approve of. ;)
bzbarsky-apple
approved these changes
Mar 4, 2021
| @@ -117,7 +125,7 @@ public: | |||
|
|
|||
| chip::Controller::{{asCamelCased parent.name false}}Cluster cluster; | |||
| cluster.Associate(device, endpointId); | |||
| return cluster.{{asCamelCased name false}}(onSuccessCallback->Cancel(), onFailureCallback->Cancel(){{#chip_server_cluster_command_arguments}}, {{#if (isByteString type)}} reinterpret_cast<uint8_t*>(m{{asCamelCased label false}}), static_cast<uint32_t>(strlen(m{{asCamelCased label false}})){{else}}m{{asCamelCased label false}}{{/if}}{{/chip_server_cluster_command_arguments}}); | |||
| return cluster.{{asCamelCased name false}}(onSuccessCallback->Cancel(), onFailureCallback->Cancel(){{#chip_server_cluster_command_arguments}}, {{#if (isByteString type)}} reinterpret_cast<char*>(m{{asCamelCased label false}}){{else}}m{{asCamelCased label false}}{{/if}}{{/chip_server_cluster_command_arguments}}); | |||
There was a problem hiding this comment.
The byte string bit is going to get fixed in #5122 to some extent, right? Though I guess #5122 (comment) is precisely about needing to change the member here to ByteSpan too.
And the rest of this looks like the PR I asked for in #5122 (comment) which I obviously approve of. ;)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
Once I run
./scripts/tools/zap_regen_all.py && ./gn_build.sh
Got the following error:
I../../third_party/lwip/repo/lwip/src/include -I../../src/lwip/include -I../../src/setup_payload -I../../third_party/inipp/repo/inipp -c ../../examples/chip-tool/main.cpp -o standalone/obj/examples/chip-tool/chip-tool.main.cpp.o
In file included from ../../examples/chip-tool/main.cpp:21:
../../examples/chip-tool/commands/clusters/Commands.h:4682:264: error: too many arguments to function call, expected 6, have 8
return cluster.SetFabric(onSuccessCallback->Cancel(), onFailureCallback->Cancel(), reinterpret_cast<uint8_t*>(mFabricId), static_cast<uint32_t>(strlen(mFabricId)), reinterpret_cast<uint8_t*>(mFabricSecret), static_cast<uint32_t>(strlen(mFabricSecret)), mBreadcrumb, mTimeoutMs);
~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~
../../src/controller/CHIPClusters.h:338:5: note: 'SetFabric' declared here
CHIP_ERROR SetFabric(Callback::Cancelable * onSuccessCallback, Callback::Cancelable * onFailureCallback, char * fabricId, char * fabricSecret, uint64_t breadcrumb, uint32_t timeoutMs);
The problem is chip-tool zapt translates type "byteString" to following two arguments:
"reinterpret_cast<uint8_t*>(arg), static_cast<uint32_t>(strlen(arg))"
This is not aligned with src/app/zap-templates, if we can take arg length with strlen, then it seems the length argument is not necessary.
Summary of Changes
Update chip-tool zapt to align with src/app/zap-templates
Test
./scripts/tools/zap_regen_all.py && ./gn_build.sh
All builds passed