From 0b68334e95087feed23b366c1e75382bab057f81 Mon Sep 17 00:00:00 2001 From: Jens Dede Date: Wed, 21 Dec 2016 14:54:15 +0100 Subject: [PATCH] Enable llsec on Z1 nodes --- platform/z1/Makefile.z1 | 2 +- platform/z1/contiki-z1-main.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/platform/z1/Makefile.z1 b/platform/z1/Makefile.z1 index 6ca3ab0e8..7611f6ec8 100644 --- a/platform/z1/Makefile.z1 +++ b/platform/z1/Makefile.z1 @@ -11,5 +11,5 @@ endif MODULES += core/net \ core/net/mac core/net/mac/contikimac \ - core/net/llsec \ + core/net/llsec core/net/llsec/noncoresec \ dev/cc2420 diff --git a/platform/z1/contiki-z1-main.c b/platform/z1/contiki-z1-main.c index c2c7e7caf..de0e4518c 100644 --- a/platform/z1/contiki-z1-main.c +++ b/platform/z1/contiki-z1-main.c @@ -318,10 +318,11 @@ main(int argc, char **argv) NETSTACK_RDC.init(); NETSTACK_MAC.init(); + NETSTACK_LLSEC.init(); NETSTACK_NETWORK.init(); - printf("%s %s, channel check rate %lu Hz, radio channel %u\n", - NETSTACK_MAC.name, NETSTACK_RDC.name, + printf("%s %s %s, channel check rate %lu Hz, radio channel %u\n", + NETSTACK_LLSEC.name, NETSTACK_MAC.name, NETSTACK_RDC.name, CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1 : NETSTACK_RDC.channel_check_interval()), CC2420_CONF_CHANNEL); @@ -359,10 +360,11 @@ main(int argc, char **argv) NETSTACK_RDC.init(); NETSTACK_MAC.init(); + NETSTACK_LLSEC.init(); NETSTACK_NETWORK.init(); - printf("%s %s, channel check rate %lu Hz, radio channel %u\n", - NETSTACK_MAC.name, NETSTACK_RDC.name, + printf("%s %s %s, channel check rate %lu Hz, radio channel %u\n", + NETSTACK_LLSEC.name, NETSTACK_MAC.name, NETSTACK_RDC.name, CLOCK_SECOND / (NETSTACK_RDC.channel_check_interval() == 0 ? 1 : NETSTACK_RDC.channel_check_interval()), CC2420_CONF_CHANNEL);