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

Updated Erbium (Er) examples and removed unsupported static routing module.

Browse source
This commit is contained in:
Matthias Kovatsch 2013-06-19 14:53:21 +02:00
parent 5e18efa10c
commit c61dd6135e
8 changed files with 22 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

17
examples/er-rest-example/er-example-server.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, Matthias Kovatsch and other contributors.
* Copyright (c) 2013, Matthias Kovatsch
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -45,8 +45,7 @@
/* Define which resources to include to meet memory constraints. */
#define REST_RES_HELLO 0
#define REST_RES_MIRROR 0 /* causes largest code size */
#define REST_RES_CHUNKS 0
#define REST_RES_CHUNKS 1
#define REST_RES_SEPARATE 1
#define REST_RES_PUSHING 1
#define REST_RES_EVENT 1
@ -56,14 +55,10 @@
#define REST_RES_LIGHT 0
#define REST_RES_BATTERY 0
#define REST_RES_RADIO 0
#define REST_RES_MIRROR 0 /* causes largest code size */
#if !UIP_CONF_IPV6_RPL && !defined (CONTIKI_TARGET_MINIMAL_NET) && !defined (CONTIKI_TARGET_NATIVE)
#warning "Compiling with static routing!"
#include "static-routing.h"
#endif
#include "erbium.h"
@ -811,12 +806,6 @@ PROCESS_THREAD(rest_server_example, ev, data)
PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
PRINTF("REST max chunk: %u\n", REST_MAX_CHUNK_SIZE);
/* if static routes are used rather than RPL */
#if !UIP_CONF_IPV6_RPL && !defined (CONTIKI_TARGET_MINIMAL_NET) && !defined (CONTIKI_TARGET_NATIVE)
set_global_address();
configure_routing();
#endif
/* Initialize the REST engine. */
rest_init_engine();