Merge branch 'develop' into nbr-fixes

This commit is contained in:
Joakim Eriksson 2018-01-27 23:31:56 +01:00 committed by GitHub
commit 3418bc7435
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -712,11 +712,6 @@ shell_commands_init(void)
/* Set up Ping Reply callback */
uip_icmp6_echo_reply_callback_add(&echo_reply_notification,
echo_reply_handler);
/* Start with soft log level 0 so as to minimize interference with shell */
log_set_level("all", LOG_LEVEL_NONE);
#if MAC_CONF_WITH_TSCH && TSCH_LOG_PER_SLOT
tsch_log_stop();
#endif /* MAC_CONF_WITH_TSCH && TSCH_LOG_PER_SLOT */
}
/*---------------------------------------------------------------------------*/
struct shell_command_t shell_commands[] = {