riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ETX-functionality is now part of a common routing-module

Browse Source
This commit is contained in:
Fabian Brandt 2014-03-25 16:22:54 +01:00
parent db3ad29285
commit ef5eaff1bc
7 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.dep
View File

@ -34,6 +34,14 @@ ifneq (,$(filter sixlowborder,$(USEMODULE)))
endif endif
endif endif
ifneq (,$(filter rpl,$(USEMODULE)))
USEMODULE += routing
endif
ifneq (,$(filter routing,$(USEMODULE)))
USEMODULE += sixlowpan
endif
ifneq (,$(filter sixlowpan,$(USEMODULE))) ifneq (,$(filter sixlowpan,$(USEMODULE)))
ifeq (,$(filter ieee802154,$(USEMODULE))) ifeq (,$(filter ieee802154,$(USEMODULE)))
USEMODULE += ieee802154 USEMODULE += ieee802154

1
examples/rpl_udp/Makefile
View File

@ -54,7 +54,6 @@ USEMODULE += posix
USEMODULE += ps USEMODULE += ps
USEMODULE += vtimer USEMODULE += vtimer
USEMODULE += defaulttransceiver USEMODULE += defaulttransceiver
USEMODULE += sixlowpan
USEMODULE += rpl USEMODULE += rpl
USEMODULE += destiny USEMODULE += destiny

3
sys/Makefile
View File

@ -62,6 +62,9 @@ endif
ifneq (,$(filter rpl,$(USEMODULE))) ifneq (,$(filter rpl,$(USEMODULE)))
DIRS += net/routing/rpl DIRS += net/routing/rpl
endif endif
ifneq (,$(filter routing,$(USEMODULE)))
DIRS += net/routing
endif
ifneq (,$(filter ieee802154,$(USEMODULE))) ifneq (,$(filter ieee802154,$(USEMODULE)))
DIRS += net/link_layer/ieee802154 DIRS += net/link_layer/ieee802154
endif endif

0
sys/net/routing/rpl/etx_beaconing.h → sys/net/include/etx_beaconing.h
View File

3
sys/net/routing/Makefile Normal file
View File

@ -0,0 +1,3 @@
MODULE:=$(shell basename $(CURDIR))
include $(RIOTBASE)/Makefile.base

3
sys/net/routing/rpl/etx_beaconing.c → sys/net/routing/etx_beaconing.c
View File

@ -101,7 +101,6 @@ transceiver_command_t tcmd;
//Message to send probes with //Message to send probes with
msg_t mesg; msg_t mesg;
//RPL-address
static ipv6_addr_t *own_address; static ipv6_addr_t *own_address;
static etx_probe_t *etx_get_send_buf(void) static etx_probe_t *etx_get_send_buf(void)
@ -113,7 +112,7 @@ static etx_probe_t *etx_get_rec_buf(void)
return ((etx_probe_t *) &(etx_rec_buf[0])); return ((etx_probe_t *) &(etx_rec_buf[0]));
} }
void show_candidates(void) void etx_show_candidates(void)
{ {
etx_neighbor_t *candidate; etx_neighbor_t *candidate;
etx_neighbor_t *end; etx_neighbor_t *end;

2
sys/net/routing/rpl/rpl.c
View File

@ -209,7 +209,7 @@ uint8_t rpl_init(int if_id)
/* INSERT NEW OBJECTIVE FUNCTIONS HERE */ /* INSERT NEW OBJECTIVE FUNCTIONS HERE */
objective_functions[0] = rpl_get_of0(); objective_functions[0] = rpl_get_of0();
/* objective_functions[1] = rpl_get_of_ETX() */ objective_functions[1] = rpl_get_of_mrhof();
sixlowpan_lowpan_init_interface(if_id); sixlowpan_lowpan_init_interface(if_id);
/* need link local prefix to query _our_ corresponding address */ /* need link local prefix to query _our_ corresponding address */