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

bugfix no framer

Browse source
This commit is contained in:
Harald Pichler 2015-05-15 20:59:59 +02:00
parent 877bf27f5a
commit 82d03d0ebf
3 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
examples/osd/slip-radio/Makefile
View file

@ -8,9 +8,6 @@ endif
CONTIKI=../../.. CONTIKI=../../..
UIP_CONF_IPV6=1
UIP_CONF_RPL=0
#linker optimizations #linker optimizations
SMALL=1 SMALL=1
@ -26,4 +23,6 @@ ifeq ($(TARGET),econotag)
PROJECT_SOURCEFILES += slip-radio-mc1322x.c PROJECT_SOURCEFILES += slip-radio-mc1322x.c
endif endif
CONTIKI_WITH_RPL = 0
CONTIKI_WITH_IPV6 = 1
include $(CONTIKI)/Makefile.include include $(CONTIKI)/Makefile.include

3
examples/osd/slip-radio/no-framer.c
View file

@ -109,8 +109,7 @@ parse(void)
} }
packetbuf_set_addr(PACKETBUF_ADDR_SENDER, (linkaddr_t *)&frame.src_addr); 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_PENDING, frame.fcf.frame_pending);
/* packetbuf_set_attr(PACKETBUF_ATTR_RELIABLE, frame.fcf.ack_required);*/ packetbuf_set_attr(PACKETBUF_ATTR_MAC_SEQNO, frame.seq);
packetbuf_set_attr(PACKETBUF_ATTR_PACKET_ID, frame.seq);
PRINTF("15.4-IN: %2X", frame.fcf.frame_type); PRINTF("15.4-IN: %2X", frame.fcf.frame_type);
PRINTADDR(packetbuf_addr(PACKETBUF_ADDR_SENDER)); PRINTADDR(packetbuf_addr(PACKETBUF_ADDR_SENDER));

3
examples/osd/slip-radio/project-conf.h
View file

@ -39,9 +39,6 @@
#undef UIP_CONF_ROUTER #undef UIP_CONF_ROUTER
#define UIP_CONF_ROUTER 0 #define UIP_CONF_ROUTER 0
#undef UIP_CONF_IPV6_RPL
#define UIP_CONF_IPV6_RPL 0
#define CMD_CONF_OUTPUT slip_radio_cmd_output #define CMD_CONF_OUTPUT slip_radio_cmd_output
/* add the cmd_handler_cc2420 + some sensors if TARGET_SKY */ /* add the cmd_handler_cc2420 + some sensors if TARGET_SKY */