From fb473237ceb86d320001bd169288cac4fb6bcc44 Mon Sep 17 00:00:00 2001 From: Harald Pichler Date: Mon, 29 Dec 2014 11:02:51 +0100 Subject: [PATCH] bugfix modules --- platform/osd-merkur/Makefile.osd-merkur | 10 ++++++---- platform/osd-merkur/contiki-conf.h | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/platform/osd-merkur/Makefile.osd-merkur b/platform/osd-merkur/Makefile.osd-merkur index a2bbcc7ff..d4918ed07 100644 --- a/platform/osd-merkur/Makefile.osd-merkur +++ b/platform/osd-merkur/Makefile.osd-merkur @@ -67,7 +67,9 @@ LDFLAGS += -Wl,--defsym,bootloader_get_mac=$(BOOTLOADER_GET_MAC) include $(CONTIKIAVR)/Makefile.avr include $(CONTIKIAVR)/radio/Makefile.radio -MODULES += core/net/ipv6 core/net/ipv4 core/net/ip \ - core/net/mac core/net core/net/rime core/net/rpl \ - core/net/mac/sicslowmac core/net/mac/contikimac \ - core/net/llsec +MODULES += core/net/mac core/net core/net/mac/sicslowmac \ + core/net/llsec \ + core/net/mac/contikimac \ +# core/net/ipv6 core/net/ipv4 core/net/ip \ +# core/net/rime \ +# core/net/rpl \ diff --git a/platform/osd-merkur/contiki-conf.h b/platform/osd-merkur/contiki-conf.h index e80a62492..c68cb27b1 100644 --- a/platform/osd-merkur/contiki-conf.h +++ b/platform/osd-merkur/contiki-conf.h @@ -242,9 +242,9 @@ typedef unsigned short uip_stats_t; /* So without the header this needed for RPL mesh to form */ #define CONTIKIMAC_FRAMER_CONF_SHORTEST_PACKET_SIZE 43-18 //multicast RPL DIS length /* Not tested much yet */ -#define WITH_PHASE_OPTIMIZATION 0 +#define CONTIKIMAC_CONF_WITH_PHASE_OPTIMIZATION 0 #define CONTIKIMAC_CONF_COMPOWER 1 -#define RIMESTATS_CONF_ENABLED 1 +#define RIMESTATS_CONF_ENABLED 0 #if NETSTACK_CONF_WITH_IPV6 //#define NETSTACK_CONF_FRAMER framer802154