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

Merge branch 'master' into osd

Browse source 
Conflicts:
	examples/osd/triggerbaord/sketch.pde
This commit is contained in:
Harald Pichler 2016-10-26 17:03:37 +02:00
commit e6dbb8c3f2
246 changed files with 6885 additions and 2878 deletions
Download patch file Download diff file Expand all files Collapse all files

3
examples/osd/rpl-border-router/project-conf.h
View file

@ -31,6 +31,9 @@
#ifndef PROJECT_ROUTER_CONF_H_
#define PROJECT_ROUTER_CONF_H_
#undef RDC_CONF_MCU_SLEEP
#define RDC_CONF_MCU_SLEEP 0
#ifndef UIP_FALLBACK_INTERFACE
#define UIP_FALLBACK_INTERFACE rpl_interface
#endif