Skip to content

Commit 58c7c28

Browse files
authored
Merge branch 'master' into feature/fix-tv-app-install-flow-and-supported-clusters
2 parents 21fce36 + e407d40 commit 58c7c28

33 files changed

+335
-337
lines changed

scripts/tests/chiptest/yamltest_with_chip_repl_tester.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ async def execute_test(yaml, runner):
101101
'--pics-file',
102102
default=None,
103103
help='Optional PICS file')
104-
def main(setup_code, yaml_path, node_id, pics_file):
104+
async def main(setup_code, yaml_path, node_id, pics_file):
105105
# Setting up python environment for running YAML CI tests using python parser.
106106
with tempfile.NamedTemporaryFile() as chip_stack_storage:
107107
chip.native.Init()
@@ -122,7 +122,7 @@ def main(setup_code, yaml_path, node_id, pics_file):
122122
# Creating and commissioning to a single controller to match what is currently done when
123123
# running.
124124
dev_ctrl = ca_list[0].adminList[0].NewController()
125-
dev_ctrl.CommissionWithCode(setup_code, node_id)
125+
await dev_ctrl.CommissionWithCode(setup_code, node_id)
126126

127127
def _StackShutDown():
128128
# Tearing down chip stack. If not done in the correct order test will fail.
@@ -143,7 +143,7 @@ def _StackShutDown():
143143
runner = ReplTestRunner(
144144
clusters_definitions, certificate_authority_manager, dev_ctrl)
145145

146-
asyncio.run(execute_test(yaml, runner))
146+
await execute_test(yaml, runner)
147147

148148
except Exception:
149149
print(traceback.format_exc())
@@ -153,4 +153,4 @@ def _StackShutDown():
153153

154154

155155
if __name__ == '__main__':
156-
main()
156+
asyncio.run(main())

src/app/ClusterStateCache.h

-2
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ class ClusterStateCacheT : protected ReadClient::Callback
102102
* @param [in] callback the derived callback which inherit from ReadClient::Callback
103103
* @param [in] highestReceivedEventNumber optional highest received event number, if cache receive the events with the number
104104
* less than or equal to this value, skip those events
105-
* @param [in] cacheData boolean to decide whether this cache would store attribute/event data/status,
106-
* the default is true.
107105
*/
108106
ClusterStateCacheT(Callback & callback, Optional<EventNumber> highestReceivedEventNumber = Optional<EventNumber>::Missing()) :
109107
mCallback(callback), mBufferedReader(*this)

src/app/CommandSender.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ class CommandSender final : public Messaging::ExchangeDelegate
136136
* The CommandSender object MUST continue to exist after this call is completed. The application shall wait until it
137137
* receives an OnDone call to destroy the object.
138138
*
139-
* @param[in] apCommandSender The command sender object that initiated the command transaction.
139+
* @param[in] commandSender The command sender object that initiated the command transaction.
140140
* @param[in] aResponseData Information pertaining to the response.
141141
*/
142142
virtual void OnResponse(CommandSender * commandSender, const ResponseData & aResponseData) {}
@@ -149,7 +149,7 @@ class CommandSender final : public Messaging::ExchangeDelegate
149149
* The CommandSender object MUST continue to exist after this call is completed. The application shall wait until it
150150
* receives an OnDone call to destroy the object.
151151
*
152-
* @param apCommandSender The CommandSender object that initiated the transaction.
152+
* @param commandSender The CommandSender object that initiated the transaction.
153153
* @param aNoResponseData Details about the request without a response.
154154
*/
155155
virtual void OnNoResponse(CommandSender * commandSender, const NoResponseData & aNoResponseData) {}

src/controller/CHIPDeviceController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ class DLL_EXPORT DeviceController : public AbstractDnssdDiscoveryController
385385
* @param[in] noc NOC in CHIP certificate format.
386386
* @param[in] icac ICAC in CHIP certificate format. If no icac is present, an empty
387387
* ByteSpan should be passed.
388-
* @param[in] externalOperationalKeypair External operational keypair. If null, use keypair in OperationalKeystore.
388+
* @param[in] operationalKeypair External operational keypair. If null, use keypair in OperationalKeystore.
389389
* @param[in] operationalKeypairExternalOwned If true, external operational keypair must outlive the fabric.
390390
* If false, the keypair is copied and owned in heap of a FabricInfo.
391391
*

0 commit comments

Comments
 (0)