From 36e0dcf22f0c45a8b74055b8982325a028694c59 Mon Sep 17 00:00:00 2001 From: harald42 Date: Thu, 21 Feb 2013 16:00:48 +0100 Subject: [PATCH] bugfix compile and flash --- examples/osd/rpl-border-router/flash.sh | 2 +- examples/osd/rpl-border-router/project-conf.h | 3 +++ examples/osd/rpl-border-router/run.sh | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/examples/osd/rpl-border-router/flash.sh b/examples/osd/rpl-border-router/flash.sh index e92d472f6..07cfc9a65 100755 --- a/examples/osd/rpl-border-router/flash.sh +++ b/examples/osd/rpl-border-router/flash.sh @@ -1,2 +1,2 @@ #!/bin/bash -sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:er-example-server.osd-merkur.hex:a -U eeprom:w:er-example-server.osd-merkur.eep:a +sudo avrdude -pm128rfa1 -c arduino -P/dev/ttyUSB0 -b57600 -e -U flash:w:border-router.osd-merkur.hex:a -U eeprom:w:border-router.osd-merkur.eep:a diff --git a/examples/osd/rpl-border-router/project-conf.h b/examples/osd/rpl-border-router/project-conf.h index d393e34a8..3cc05fe90 100644 --- a/examples/osd/rpl-border-router/project-conf.h +++ b/examples/osd/rpl-border-router/project-conf.h @@ -41,6 +41,9 @@ #undef UIP_CONF_DS6_ROUTE_NBU #define UIP_CONF_DS6_ROUTE_NBU 50 +#undef UIP_CONF_TCP +#define UIP_CONF_TCP 1 + #ifndef QUEUEBUF_CONF_NUM #define QUEUEBUF_CONF_NUM 4 #endif diff --git a/examples/osd/rpl-border-router/run.sh b/examples/osd/rpl-border-router/run.sh index 4f21e9b63..098192f57 100755 --- a/examples/osd/rpl-border-router/run.sh +++ b/examples/osd/rpl-border-router/run.sh @@ -1,6 +1,6 @@ #!/bin/bash make clean TARGET=osd-merkur make TARGET=osd-merkur -avr-size -C --mcu=MCU=atmega128rfa1 er-example-server.osd-merkur -avr-objcopy -j .text -j .data -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.hex -avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex er-example-server.osd-merkur er-example-server.osd-merkur.eep +avr-size -C --mcu=MCU=atmega128rfa1 border-router.osd-merkur +avr-objcopy -j .text -j .data -O ihex border-router.osd-merkur border-router.osd-merkur.hex +avr-objcopy -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex border-router.osd-merkur border-router.osd-merkur.eep