deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1492 from simonduq/pr/jn516x-minor

Browse source 
Reworking jn516x default configuration and examples
This commit is contained in:
Simon Duquennoy 2016-02-03 11:41:10 +01:00
parent 79a0709cd7 658cf0d2cc
commit 9f383ba534
11 changed files with 13 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
examples/jn516x/rime/project-conf.h
View file

@ -53,14 +53,8 @@
#undef UIP_CONF_IPV6 #undef UIP_CONF_IPV6
#define UIP_CONF_IPV6 0 #define UIP_CONF_IPV6 0
#undef RF_CHANNEL
#define RF_CHANNEL 25
#undef MICROMAC_CONF_CHANNEL #undef MICROMAC_CONF_CHANNEL
#define MICROMAC_CONF_CHANNEL RF_CHANNEL #define MICROMAC_CONF_CHANNEL 25
#undef CC2420_CONF_CHANNEL
#define CC2420_CONF_CHANNEL RF_CHANNEL
#undef MICROMAC_CONF_AUTOACK #undef MICROMAC_CONF_AUTOACK
#define MICROMAC_CONF_AUTOACK 1 #define MICROMAC_CONF_AUTOACK 1

1
examples/jn516x/rpl/border-router/Makefile
View file

@ -7,6 +7,7 @@ CONTIKI=../../../..
CONTIKI_WITH_IPV6 = 1 CONTIKI_WITH_IPV6 = 1
MODULES += core/net/mac/tsch
PROJECTDIRS += .. ../tools PROJECTDIRS += .. ../tools
PROJECT_SOURCEFILES += rpl-tools.c PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"

1
examples/jn516x/rpl/coap-dongle-node/Makefile
View file

@ -8,6 +8,7 @@ CONTIKI=../../../..
CONTIKI_WITH_IPV6 = 1 CONTIKI_WITH_IPV6 = 1
MODULES += core/net/mac/tsch
PROJECTDIRS += .. ../tools PROJECTDIRS += .. ../tools
PROJECT_SOURCEFILES += rpl-tools.c PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"

1
examples/jn516x/rpl/coap-dr1175-node/Makefile
View file

@ -8,6 +8,7 @@ CONTIKI=../../../..
CONTIKI_WITH_IPV6 = 1 CONTIKI_WITH_IPV6 = 1
MODULES += core/net/mac/tsch
PROJECTDIRS += .. ../tools PROJECTDIRS += .. ../tools
PROJECT_SOURCEFILES += rpl-tools.c PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"

1
examples/jn516x/rpl/coap-dr1199-node/Makefile
View file

@ -8,6 +8,7 @@ CONTIKI=../../../..
CONTIKI_WITH_IPV6 = 1 CONTIKI_WITH_IPV6 = 1
MODULES += core/net/mac/tsch
PROJECTDIRS += .. ../tools PROJECTDIRS += .. ../tools
PROJECT_SOURCEFILES += rpl-tools.c PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"

4
examples/jn516x/rpl/common-conf.h
View file

@ -137,8 +137,8 @@
#undef IEEE802154_CONF_PANID #undef IEEE802154_CONF_PANID
#define IEEE802154_CONF_PANID 0xabcd #define IEEE802154_CONF_PANID 0xabcd
#undef RF_CHANNEL #undef MICROMAC_CONF_CHANNEL
#define RF_CHANNEL 26 #define MICROMAC_CONF_CHANNEL 26
/* UART Configuration */ /* UART Configuration */

1
examples/jn516x/rpl/node/Makefile
View file

@ -7,6 +7,7 @@ CONTIKI=../../../..
CONTIKI_WITH_IPV6 = 1 CONTIKI_WITH_IPV6 = 1
MODULES += core/net/mac/tsch
PROJECTDIRS += .. ../tools PROJECTDIRS += .. ../tools
PROJECT_SOURCEFILES += rpl-tools.c PROJECT_SOURCEFILES += rpl-tools.c
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\" CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"

4
examples/jn516x/tsch/common-conf.h
View file

@ -176,8 +176,8 @@
#undef NETSTACK_CONF_RDC #undef NETSTACK_CONF_RDC
#define NETSTACK_CONF_RDC nullrdc_driver #define NETSTACK_CONF_RDC nullrdc_driver
#undef RF_CHANNEL #undef MICROMAC_CONF_CHANNEL
#define RF_CHANNEL 26 #define MICROMAC_CONF_CHANNEL 26
#undef MICROMAC_CONF_AUTOACK #undef MICROMAC_CONF_AUTOACK
#define MICROMAC_CONF_AUTOACK 1 #define MICROMAC_CONF_AUTOACK 1

2
platform/jn516x/Makefile.jn516x
View file

@ -145,7 +145,7 @@ CLEAN += *.jn516x.bin
MODULES += core/net \ MODULES += core/net \
core/net/mac \ core/net/mac \
core/net/mac/contikimac core/net/mac/tsch \ core/net/mac/contikimac \
core/net/llsec core/net/llsec/noncoresec core/net/llsec core/net/llsec/noncoresec
CONTIKI_TARGET_SOURCEFILES += $(ARCH) CONTIKI_TARGET_SOURCEFILES += $(ARCH)

8
platform/jn516x/contiki-conf.h
View file

@ -44,11 +44,11 @@
#endif /* CCM_STAR_CONF */ #endif /* CCM_STAR_CONF */
#ifndef NETSTACK_CONF_MAC #ifndef NETSTACK_CONF_MAC
#define NETSTACK_CONF_MAC tschmac_driver #define NETSTACK_CONF_MAC csma_driver
#endif /* NETSTACK_CONF_MAC */ #endif /* NETSTACK_CONF_MAC */
#ifndef NETSTACK_CONF_RDC #ifndef NETSTACK_CONF_RDC
#define NETSTACK_CONF_RDC nordc_driver #define NETSTACK_CONF_RDC nullrdc_driver
#endif /* NETSTACK_CONF_RDC */ #endif /* NETSTACK_CONF_RDC */
#ifndef NETSTACK_CONF_RADIO #ifndef NETSTACK_CONF_RADIO
@ -59,10 +59,6 @@
#define NETSTACK_CONF_FRAMER framer_802154 #define NETSTACK_CONF_FRAMER framer_802154
#endif /* NETSTACK_CONF_FRAMER */ #endif /* NETSTACK_CONF_FRAMER */
/* IEEE802.15.4 frame version */
#undef FRAME802154_CONF_VERSION
#define FRAME802154_CONF_VERSION FRAME802154_IEEE802154E_2012
#define PACKETBUF_CONF_ATTRS_INLINE 1 #define PACKETBUF_CONF_ATTRS_INLINE 1
#ifndef IEEE802154_CONF_PANID #ifndef IEEE802154_CONF_PANID

4
platform/jn516x/platform-conf.h
View file

@ -57,10 +57,6 @@
#define MICROMAC_CONF_CHANNEL 26 #define MICROMAC_CONF_CHANNEL 26
#endif #endif
#ifdef RF_CHANNEL
#define MICROMAC_CONF_CHANNEL RF_CHANNEL
#endif
/* 32kHz or 16MHz rtimers? */ /* 32kHz or 16MHz rtimers? */
#ifdef RTIMER_CONF_USE_32KHZ #ifdef RTIMER_CONF_USE_32KHZ
#define RTIMER_USE_32KHZ RTIMER_CONF_USE_32KHZ #define RTIMER_USE_32KHZ RTIMER_CONF_USE_32KHZ