More cleanup
This commit is contained in:
parent
dc9e77eaf2
commit
a642c9696d
@ -42,10 +42,6 @@
|
||||
|
||||
#define IPSO_TEMPERATURE example_ipso_temperature
|
||||
|
||||
/* Disabling TCP on CoAP nodes. */
|
||||
#undef UIP_CONF_TCP
|
||||
#define UIP_CONF_TCP 0
|
||||
|
||||
/* Increase rpl-border-router IP-buffer when using more than 64. */
|
||||
#undef REST_MAX_CHUNK_SIZE
|
||||
#define REST_MAX_CHUNK_SIZE 64
|
||||
|
@ -54,13 +54,6 @@
|
||||
#define UIP_CONF_BUFFER_SIZE 256
|
||||
*/
|
||||
|
||||
#undef RPL_CONF_MAX_DAG_PER_INSTANCE
|
||||
#define RPL_CONF_MAX_DAG_PER_INSTANCE 1
|
||||
|
||||
/* Disabling TCP on CoAP nodes. */
|
||||
#undef UIP_CONF_TCP
|
||||
#define UIP_CONF_TCP 0
|
||||
|
||||
/* Increase rpl-border-router IP-buffer when using more than 64. */
|
||||
#undef REST_MAX_CHUNK_SIZE
|
||||
#define REST_MAX_CHUNK_SIZE 48
|
||||
|
@ -33,27 +33,11 @@
|
||||
#include "jsontree.h"
|
||||
#define HTTPD_WS_CONF_USER_STATE struct jsontree_context json
|
||||
|
||||
|
||||
/* #define JSON_WS_CONF_CALLBACK_PROTO "http" | "udp" | "cosm" */
|
||||
#define JSON_WS_CONF_CALLBACK_PROTO "http"
|
||||
#define JSON_WS_CONF_CALLBACK_PORT 80
|
||||
#define JSON_WS_CONF_CALLBACK_INTERVAL 120
|
||||
|
||||
/* needs to be ~4 for fragmentation to work */
|
||||
#undef QUEUEBUF_CONF_NUM
|
||||
#define QUEUEBUF_CONF_NUM 4
|
||||
|
||||
#undef NETSTACK_MAX_ROUTE_ENTRIES
|
||||
#define NETSTACK_MAX_ROUTE_ENTRIES 7
|
||||
#undef NBR_TABLE_CONF_MAX_NEIGHBORS
|
||||
#define NBR_TABLE_CONF_MAX_NEIGHBORS 7
|
||||
|
||||
#undef UIP_CONF_BUFFER_SIZE
|
||||
#define UIP_CONF_BUFFER_SIZE 140
|
||||
|
||||
/* #undef UIP_CONF_RECEIVE_WINDOW */
|
||||
/* #define UIP_CONF_RECEIVE_WINDOW 35 */
|
||||
|
||||
#undef WEBSERVER_CONF_INBUF_SIZE
|
||||
#define WEBSERVER_CONF_INBUF_SIZE 200
|
||||
|
||||
|
@ -52,9 +52,6 @@
|
||||
#undef UIP_MCAST6_ROUTE_CONF_ROUTES
|
||||
#define UIP_MCAST6_ROUTE_CONF_ROUTES 1
|
||||
|
||||
#undef UIP_CONF_TCP
|
||||
#define UIP_CONF_TCP 0
|
||||
|
||||
/* Code/RAM footprint savings so that things will fit on our device */
|
||||
#undef NETSTACK_MAX_ROUTE_ENTRIES
|
||||
#define NETSTACK_MAX_ROUTE_ENTRIES 10
|
||||
|
@ -33,12 +33,6 @@
|
||||
#undef UIP_FALLBACK_INTERFACE
|
||||
#define UIP_FALLBACK_INTERFACE rpl_interface
|
||||
|
||||
#undef QUEUEBUF_CONF_NUM
|
||||
#define QUEUEBUF_CONF_NUM 4
|
||||
|
||||
#undef UIP_CONF_BUFFER_SIZE
|
||||
#define UIP_CONF_BUFFER_SIZE 1280
|
||||
|
||||
#define SLIP_DEV_CONF_SEND_DELAY (CLOCK_SECOND / 32)
|
||||
|
||||
#undef WEBSERVER_CONF_CFS_CONNS
|
||||
|
@ -35,14 +35,6 @@
|
||||
#define UIP_FALLBACK_INTERFACE rpl_interface
|
||||
#endif
|
||||
|
||||
#ifndef QUEUEBUF_CONF_NUM
|
||||
#define QUEUEBUF_CONF_NUM 4
|
||||
#endif
|
||||
|
||||
#ifndef UIP_CONF_BUFFER_SIZE
|
||||
#define UIP_CONF_BUFFER_SIZE 140
|
||||
#endif
|
||||
|
||||
#ifndef WEBSERVER_CONF_CFS_CONNS
|
||||
#define WEBSERVER_CONF_CFS_CONNS 2
|
||||
#endif
|
||||
|
@ -43,15 +43,9 @@
|
||||
|
||||
/* Save some space */
|
||||
|
||||
#undef UIP_CONF_ND6_SEND_NA
|
||||
#define UIP_CONF_ND6_SEND_NA 0
|
||||
|
||||
#undef SICSLOWPAN_CONF_FRAG
|
||||
#define SICSLOWPAN_CONF_FRAG 0
|
||||
|
||||
#undef UIP_CONF_TCP
|
||||
#define UIP_CONF_TCP 0
|
||||
|
||||
#if WITH_TSCH
|
||||
|
||||
/*******************************************************/
|
||||
|
@ -1,13 +1,6 @@
|
||||
all: udp-client udp-server
|
||||
CONTIKI=../../..
|
||||
|
||||
CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
|
||||
|
||||
ifdef WITH_COMPOWER
|
||||
APPS+=powertrace
|
||||
CFLAGS+= -DWITH_COMPOWER=1 -DQUEUEBUF_CONF_NUM=4
|
||||
endif
|
||||
|
||||
ifdef SERVER_REPLY
|
||||
CFLAGS+=-DSERVER_REPLY=$(SERVER_REPLY)
|
||||
endif
|
||||
|
@ -1,51 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2015, Swedish Institute of Computer Science.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the Institute nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef PROJECT_CONF_H_
|
||||
#define PROJECT_CONF_H_
|
||||
|
||||
#ifdef TEST_MORE_ROUTES
|
||||
/* configure number of neighbors and routes */
|
||||
#define NBR_TABLE_CONF_MAX_NEIGHBORS 10
|
||||
#define NETSTACK_MAX_ROUTE_ENTRIES 30
|
||||
#else
|
||||
/* configure number of neighbors and routes */
|
||||
#define NBR_TABLE_CONF_MAX_NEIGHBORS 10
|
||||
#define NETSTACK_MAX_ROUTE_ENTRIES 10
|
||||
#endif /* TEST_MORE_ROUTES */
|
||||
|
||||
/* Define as minutes */
|
||||
#define RPL_CONF_DEFAULT_LIFETIME_UNIT 60
|
||||
|
||||
/* 10 minutes lifetime of routes */
|
||||
#define RPL_CONF_DEFAULT_LIFETIME 10
|
||||
|
||||
#define RPL_CONF_DEFAULT_ROUTE_INFINITE_LIFETIME 1
|
||||
|
||||
#endif
|
@ -171,9 +171,6 @@ PROCESS_THREAD(udp_client_process, ev, data)
|
||||
{
|
||||
static struct etimer periodic;
|
||||
static struct ctimer backoff_timer;
|
||||
#if WITH_COMPOWER
|
||||
static int print = 0;
|
||||
#endif
|
||||
|
||||
PROCESS_BEGIN();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user