Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-06-02 18:41:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2011 from jdede/z1-llsec

Browse Source 
Enable llsec on Z1 nodes
This commit is contained in:
Antonio Lignan 2017-01-10 09:07:27 +01:00 committed by GitHub
commit 247d79ea7c
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/z1/Makefile.z1
View File

@ -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

4
platform/z1/contiki-conf.h
View File

@ -241,4 +241,8 @@
#define BOARD_STRING "Zolertia Z1 platform"
#ifndef AES_128_CONF
#define AES_128_CONF cc2420_aes_128_driver
#endif /* AES_128_CONF */
#endif /* CONTIKI_CONF_H */

10
platform/z1/contiki-z1-main.c
View File

@ -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);