Add timedInteractionTimeoutMs optional argument to chip-tool commands

project-chip · Dec 2, 2021 · 4711edd · 4711edd
1 parent a28f2be
commit 4711edd
Show file tree

Hide file tree

Showing 3 changed files with 280 additions and 187 deletions.
diff --git a/examples/chip-tool/commands/clusters/ModelCommand.h b/examples/chip-tool/commands/clusters/ModelCommand.h
@@ -38,6 +38,7 @@ class ModelCommand : public CHIPCommand
     {
         AddArgument("node-id", 0, UINT64_MAX, &mNodeId);
         AddArgument("endpoint-id", CHIP_ZCL_ENDPOINT_MIN, CHIP_ZCL_ENDPOINT_MAX, &mEndPointId);
+        AddArgument("timedInteractionTimeoutMs", 0, UINT16_MAX, &mTimedInteractionTimeoutMs);
     }
 
     /////////// CHIPCommand Interface /////////
@@ -46,6 +47,9 @@ class ModelCommand : public CHIPCommand
 
     virtual CHIP_ERROR SendCommand(ChipDevice * device, uint8_t endPointId) = 0;
 
+protected:
+    chip::Optional<uint16_t> mTimedInteractionTimeoutMs;
+
 private:
     chip::NodeId mNodeId;
     uint8_t mEndPointId;

diff --git a/examples/chip-tool/templates/commands.zapt b/examples/chip-tool/templates/commands.zapt
@@ -445,13 +445,7 @@ public:
         {{/if}}
         {{/chip_cluster_command_non_expanded_arguments}}
 
-        return chip::Controller::InvokeCommand(device, this, {{#if hasSpecificResponse}}On{{asUpperCamelCase parent.name}}{{asUpperCamelCase response.name}}Success{{else}}OnDefaultSuccess{{/if}}, OnDefaultFailure, endpointId, mRequest
-          {{#if mustUseTimedInvoke}}
-            {{!TODO figure out where to get useful timeout values here.  For
-                    now, pick 10 seconds.}}
-            , 10000
-          {{/if}}
-        );
+        return chip::Controller::InvokeCommand(device, this, {{#if hasSpecificResponse}}On{{asUpperCamelCase parent.name}}{{asUpperCamelCase response.name}}Success{{else}}OnDefaultSuccess{{/if}}, OnDefaultFailure, endpointId, mRequest, mTimedInteractionTimeoutMs);
     }
 
 private: