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.

Sign up for GitHub

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

Jump to bottom

[shell]:Start CHIP event-loop by default during initialization. #4185

Merged
merged 2 commits into from
Dec 12, 2020
Merged

[shell]:Start CHIP event-loop by default during initialization. #4185

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5334dd0
Start CHIP event-loop by default during initialization.
yufengwangca Dec 11, 2020
4c66e6f
Add CHIP memory init during initialization
yufengwangca Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 12 additions & 23 deletions examples/shell/shell_common/cmd_device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,6 @@ int cmd_device_help(int argc, char ** argv)
return 0;
}

int cmd_device_start(int argc, char ** argv)
{
CHIP_ERROR error = CHIP_NO_ERROR;
streamer_t * sout = streamer_get();

VerifyOrExit(argc == 0, error = CHIP_ERROR_INVALID_ARGUMENT);

streamer_printf(sout, "Starting Platform Manager Event Loop\r\n");
error = PlatformMgr().StartEventLoopTask();
SuccessOrExit(error);

exit:
return error;
}

static CHIP_ERROR ConfigGetDone(streamer_t * sout, CHIP_ERROR error)
{
if (error)
Expand Down Expand Up @@ -925,7 +910,6 @@ static const shell_command_t cmds_device_root = { &cmd_device_dispatch, "device"
/// Subcommands for root command: `device <subcommand>`
static const shell_command_t cmds_device[] = {
{ &cmd_device_help, "help", "Usage: device <subcommand>" },
{ &cmd_device_start, "start", "Start the device layer. Usage: device start" },
{ &cmd_device_get, "get", "Get configuration value. Usage: device get <param_name>" },
{ &cmd_device_config, "config", "Dump entire configuration of device. Usage: device config" },
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
Expand Down Expand Up @@ -953,20 +937,25 @@ void cmd_device_init()

streamer_t * sout = streamer_get();

error = chip::Platform::MemoryInit();
VerifyOrExit(error == CHIP_NO_ERROR,
streamer_printf(sout, "Failed to init CHIP platform memory with error: %s\r\n", ErrorStr(error)));

streamer_printf(sout, "Init CHIP Stack\r\n");
error = PlatformMgr().InitChipStack();

if (error != CHIP_NO_ERROR)
streamer_printf(sout, "Failed to init CHIP Stack with error: %s\r\n", ErrorStr(error));
VerifyOrExit(error == CHIP_NO_ERROR, streamer_printf(sout, "Failed to init CHIP Stack with error: %s\r\n", ErrorStr(error)));

#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
streamer_printf(sout, "Init Thread stack\r\n");
error = ThreadStackMgr().InitThreadStack();
if (error != CHIP_NO_ERROR)
{
streamer_printf(sout, "ThreadStackMgr().InitThreadStack() failed\r\n");
}
VerifyOrExit(error == CHIP_NO_ERROR, streamer_printf(sout, "ThreadStackMgr().InitThreadStack() failed\r\n"));
#endif

// Starting Platform Manager Event Loop;
error = PlatformMgr().StartEventLoopTask();
VerifyOrExit(error == CHIP_NO_ERROR, streamer_printf(sout, "Failed to start platform event loop\r\n"));

exit:
return;
#endif // CONFIG_DEVICE_LAYER
}