Skip to content

Commit adfc39a

Browse files
authored
Merge branch 'master' into add_chef_rootnode_fan
2 parents 0db043f + 0cf7694 commit adfc39a

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

examples/all-clusters-app/linux/main-common.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ void ApplicationExit()
263263

264264
void emberAfLowPowerClusterInitCallback(EndpointId endpoint)
265265
{
266-
ChipLogProgress(NotSpecified, "TV Linux App: LowPower::SetDefaultDelegate");
266+
ChipLogProgress(NotSpecified, "Setting LowPower default delegate to global manager");
267267
chip::app::Clusters::LowPower::SetDefaultDelegate(endpoint, &sLowPowerManager);
268268
}
269269

scripts/tests/chiptest/test_definition.py

+5
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ def __init__(self, runner, command):
3939
self.lastLogIndex = 0
4040
self.kvsPathSet = {'/tmp/chip_kvs'}
4141
self.options = None
42+
self.killed = False
4243

4344
def start(self, options=None):
4445
if not self.process:
@@ -85,9 +86,13 @@ def waitForMessage(self, message):
8586
def kill(self):
8687
if self.process:
8788
self.process.kill()
89+
self.killed = True
8890

8991
def wait(self, timeout=None):
9092
while True:
93+
# If the App was never started, AND was killed, exit immediately
94+
if self.killed:
95+
return 0
9196
# If the App was never started, wait cannot be called on the process
9297
if self.process == None:
9398
time.sleep(0.1)

src/app/MessageDef/MessageDefHelper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ CHIP_ERROR CheckIMPayload(TLV::TLVReader & aReader, int aDepth, const char * aLa
217217
{
218218
for (size_t i = 0; i < len; i++)
219219
{
220-
PRETTY_PRINT_SAMELINE("0x%x, ", value_b[i]);
220+
PRETTY_PRINT_SAMELINE("0x%02x, ", value_b[i]);
221221
}
222222
}
223223

src/lib/core/CHIPConfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ extern const char CHIP_NON_PRODUCTION_MARKER[];
896896
* @brief The maximum size of the lambda which can be post into system event queue.
897897
*/
898898
#ifndef CHIP_CONFIG_LAMBDA_EVENT_SIZE
899-
#define CHIP_CONFIG_LAMBDA_EVENT_SIZE (16)
899+
#define CHIP_CONFIG_LAMBDA_EVENT_SIZE (24)
900900
#endif
901901

902902
/**

0 commit comments

Comments
 (0)