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

bugfix modules

Browse source
This commit is contained in:
Harald Pichler 2014-12-29 11:02:51 +01:00
parent 9efc5d41c1
commit fb473237ce
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
platform/osd-merkur/Makefile.osd-merkur
View file

@ -67,7 +67,9 @@ LDFLAGS += -Wl,--defsym,bootloader_get_mac=$(BOOTLOADER_GET_MAC)
include $(CONTIKIAVR)/Makefile.avr include $(CONTIKIAVR)/Makefile.avr
include $(CONTIKIAVR)/radio/Makefile.radio include $(CONTIKIAVR)/radio/Makefile.radio
MODULES += core/net/ipv6 core/net/ipv4 core/net/ip \ MODULES += core/net/mac core/net core/net/mac/sicslowmac \
core/net/mac core/net core/net/rime core/net/rpl \ core/net/llsec \
core/net/mac/sicslowmac core/net/mac/contikimac \ core/net/mac/contikimac \
core/net/llsec # core/net/ipv6 core/net/ipv4 core/net/ip \
# core/net/rime \
# core/net/rpl \

4
platform/osd-merkur/contiki-conf.h
View file

@ -242,9 +242,9 @@ typedef unsigned short uip_stats_t;
/* So without the header this needed for RPL mesh to form */ /* So without the header this needed for RPL mesh to form */
#define CONTIKIMAC_FRAMER_CONF_SHORTEST_PACKET_SIZE 43-18 //multicast RPL DIS length #define CONTIKIMAC_FRAMER_CONF_SHORTEST_PACKET_SIZE 43-18 //multicast RPL DIS length
/* Not tested much yet */ /* Not tested much yet */
#define WITH_PHASE_OPTIMIZATION 0 #define CONTIKIMAC_CONF_WITH_PHASE_OPTIMIZATION 0
#define CONTIKIMAC_CONF_COMPOWER 1 #define CONTIKIMAC_CONF_COMPOWER 1
#define RIMESTATS_CONF_ENABLED 1 #define RIMESTATS_CONF_ENABLED 0
#if NETSTACK_CONF_WITH_IPV6 #if NETSTACK_CONF_WITH_IPV6
//#define NETSTACK_CONF_FRAMER framer802154 //#define NETSTACK_CONF_FRAMER framer802154