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

Updated README and Makefile.

Browse source
This commit is contained in:
Matthias Kovatsch 2014-05-15 13:12:22 +02:00 committed by Matthias Kovatsch
parent a26533f501
commit 2683e13da5
2 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
examples/er-rest-example/Makefile Executable file → Normal file
View file

@ -41,7 +41,7 @@ include $(CONTIKI)/Makefile.include
# minimal-net target is currently broken in Contiki # minimal-net target is currently broken in Contiki
ifeq ($(TARGET), minimal-net) ifeq ($(TARGET), minimal-net)
CFLAGS += -DHARD_CODED_ADDRESS=\"bbbb::10\" CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\"
${info INFO: er-example compiling with large buffers} ${info INFO: er-example compiling with large buffers}
CFLAGS += -DUIP_CONF_BUFFER_SIZE=1300 CFLAGS += -DUIP_CONF_BUFFER_SIZE=1300
CFLAGS += -DREST_MAX_CHUNK_SIZE=1024 CFLAGS += -DREST_MAX_CHUNK_SIZE=1024
@ -65,4 +65,10 @@ connect-router: $(CONTIKI)/tools/tunslip6
sudo $(CONTIKI)/tools/tunslip6 aaaa::1/64 sudo $(CONTIKI)/tools/tunslip6 aaaa::1/64
connect-router-cooja: $(CONTIKI)/tools/tunslip6 connect-router-cooja: $(CONTIKI)/tools/tunslip6
sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 aaaa::1/64 sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 -p 60001 aaaa::1/64
connect-router-native: $(CONTIKI)/examples/ipv6/native-border-router/border-router.native
sudo $(CONTIKI)/exmples/ipv6/native-border-router/border-router.native -a 127.0.0.1 -p 60001 aaaa::1/64
connect-minimal:
sudo ip address add fdfd::1/64 dev tap0

25
examples/er-rest-example/README.md
View file

@ -21,6 +21,7 @@ PRELIMINARIES
You can disable RDC in border-router project-conf.h (not really required as BR keeps radio turned on). You can disable RDC in border-router project-conf.h (not really required as BR keeps radio turned on).
#undef NETSTACK_CONF_RDC #undef NETSTACK_CONF_RDC
#define NETSTACK_CONF_RDC nullrdc_driver #define NETSTACK_CONF_RDC nullrdc_driver
- Alternatively, you can use the native-border-router together with the slip-radio.
- For convenience, define the Cooja addresses in /etc/hosts - For convenience, define the Cooja addresses in /etc/hosts
aaaa::0212:7401:0001:0101 cooja1 aaaa::0212:7401:0001:0101 cooja1
aaaa::0212:7402:0002:0202 cooja2 aaaa::0212:7402:0002:0202 cooja2
@ -125,10 +126,10 @@ Under Windows/Cygwin, WPCAP might need a patch in
DETAILS DETAILS
------- -------
Erbium currently implements draft 13. Central features are commented in Erbium implements the Proposed Standard of CoAP. Central features are commented
er-example-server.c. In general, apps/er-coap-13 supports: in er-example-server.c. In general, apps/er-coap supports:
- All draft 13 header options - All draft-18 header options
- CON Retransmissions (note COAP_MAX_OPEN_TRANSACTIONS) - CON Retransmissions (note COAP_MAX_OPEN_TRANSACTIONS)
- Blockwise Transfers (note REST_MAX_CHUNK_SIZE, see er-plugtest-server.c for - Blockwise Transfers (note REST_MAX_CHUNK_SIZE, see er-plugtest-server.c for
Block1 uploads) Block1 uploads)
@ -138,24 +139,6 @@ er-example-server.c. In general, apps/er-coap-13 supports:
- Observing Resources (see EVENT_ and PRERIODIC_RESOURCE, note - Observing Resources (see EVENT_ and PRERIODIC_RESOURCE, note
COAP_MAX_OBSERVERS) COAP_MAX_OBSERVERS)
REST IMPLEMENTATIONS
--------------------
The Makefile uses WITH_COAP to configure different implementations for the
Erbium (Er) REST Engine.
- WITH_COAP=13 uses Erbium CoAP 13 apps/er-coap-13/. The default port for
coap-13 is 5683.
- WITH_COAP=12 uses Erbium CoAP 12 apps/er-coap-12/. The default port for
coap-12 is 5683.
- WITH_COAP=7 uses Erbium CoAP 08 apps/er-coap-07/. The default port for
coap-07/-08 is 5683.
- WITH_COAP=3 uses Erbium CoAP 03 apps/er-coap-03/. The default port for
coap-03 is 61616. er-coap-03 produces some warnings, as it not fully
maintained anymore.
- WITH_COAP=0 is a stub to link an Erbium HTTP engine that uses the same
resource abstraction (REST.x() functions and RESOURCE macros.
TODOs TODOs
----- -----