diff --git a/examples/osd/slip-radio/Makefile b/examples/osd/slip-radio/Makefile index 5456466ab..9d6f8ca88 100644 --- a/examples/osd/slip-radio/Makefile +++ b/examples/osd/slip-radio/Makefile @@ -8,9 +8,6 @@ endif CONTIKI=../../.. -UIP_CONF_IPV6=1 -UIP_CONF_RPL=0 - #linker optimizations SMALL=1 @@ -26,4 +23,6 @@ ifeq ($(TARGET),econotag) PROJECT_SOURCEFILES += slip-radio-mc1322x.c endif +CONTIKI_WITH_RPL = 0 +CONTIKI_WITH_IPV6 = 1 include $(CONTIKI)/Makefile.include diff --git a/examples/osd/slip-radio/no-framer.c b/examples/osd/slip-radio/no-framer.c index e3aed93b7..7f3447e97 100644 --- a/examples/osd/slip-radio/no-framer.c +++ b/examples/osd/slip-radio/no-framer.c @@ -109,8 +109,7 @@ parse(void) } packetbuf_set_addr(PACKETBUF_ADDR_SENDER, (linkaddr_t *)&frame.src_addr); packetbuf_set_attr(PACKETBUF_ATTR_PENDING, frame.fcf.frame_pending); - /* packetbuf_set_attr(PACKETBUF_ATTR_RELIABLE, frame.fcf.ack_required);*/ - packetbuf_set_attr(PACKETBUF_ATTR_PACKET_ID, frame.seq); + packetbuf_set_attr(PACKETBUF_ATTR_MAC_SEQNO, frame.seq); PRINTF("15.4-IN: %2X", frame.fcf.frame_type); PRINTADDR(packetbuf_addr(PACKETBUF_ADDR_SENDER)); diff --git a/examples/osd/slip-radio/project-conf.h b/examples/osd/slip-radio/project-conf.h index 4a2950c59..66cd61cbc 100644 --- a/examples/osd/slip-radio/project-conf.h +++ b/examples/osd/slip-radio/project-conf.h @@ -39,9 +39,6 @@ #undef UIP_CONF_ROUTER #define UIP_CONF_ROUTER 0 -#undef UIP_CONF_IPV6_RPL -#define UIP_CONF_IPV6_RPL 0 - #define CMD_CONF_OUTPUT slip_radio_cmd_output /* add the cmd_handler_cc2420 + some sensors if TARGET_SKY */