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

Merge branch 'osd' into ico

Browse source 
Conflicts resolved:
	core/net/mac/contikimac/contikimac.c
This commit is contained in:
Ralf Schlatterbeck 2016-06-30 09:28:54 +02:00
commit 7d63a0f487
1020 changed files with 70078 additions and 10930 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/ipv6/native-border-router/Makefile
View file

@ -24,4 +24,4 @@ CONTIKI_WITH_IPV6 = 1
include $(CONTIKI)/Makefile.include
connect-router: border-router.native
sudo ./border-router.native aaaa::1/64
sudo ./border-router.native fd00::1/64

4
examples/ipv6/native-border-router/slip-config.c
View file

@ -67,7 +67,7 @@ int
slip_config_handle_arguments(int argc, char **argv)
{
const char *prog;
char c;
int c;
int baudrate = 115200;
slip_config_verbose = 0;
@ -125,7 +125,7 @@ slip_config_handle_arguments(int argc, char **argv)
case 'h':
default:
fprintf(stderr,"usage: %s [options] ipaddress\n", prog);
fprintf(stderr,"example: border-router.native -L -v2 -s ttyUSB1 aaaa::1/64\n");
fprintf(stderr,"example: border-router.native -L -v2 -s ttyUSB1 fd00::1/64\n");
fprintf(stderr,"Options are:\n");
#ifdef linux
fprintf(stderr," -B baudrate 9600,19200,38400,57600,115200,921600 (default 115200)\n");