From b2040a6cd914bce4a9fa1d2ca499e8efdaa75ef7 Mon Sep 17 00:00:00 2001 From: harald42 Date: Tue, 12 Feb 2013 10:19:10 +0100 Subject: [PATCH] change rt tag and disable energest and radio stat --- examples/osd/er-rest-example-dht11/er-example-server.c | 2 +- platform/osd-er-lp24/contiki-conf.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/osd/er-rest-example-dht11/er-example-server.c b/examples/osd/er-rest-example-dht11/er-example-server.c index 3eac87b8a..3b8829913 100644 --- a/examples/osd/er-rest-example-dht11/er-example-server.c +++ b/examples/osd/er-rest-example-dht11/er-example-server.c @@ -975,7 +975,7 @@ temperature_handler(void* request, void* response, uint8_t *buffer, uint16_t pre /******************************************************************************/ #if REST_RES_BATTERY && defined (PLATFORM_HAS_BATTERY) /* A simple getter example. Returns the reading from light sensor with a simple etag */ -RESOURCE(battery, METHOD_GET, "sensors/battery", "title=\"Battery status\";rt=\"Battery\""); +RESOURCE(battery, METHOD_GET, "sensors/battery", "title=\"Battery status\";rt=\"battery-mV\""); void battery_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset) { diff --git a/platform/osd-er-lp24/contiki-conf.h b/platform/osd-er-lp24/contiki-conf.h index 558e41b24..8a4d0efa6 100644 --- a/platform/osd-er-lp24/contiki-conf.h +++ b/platform/osd-er-lp24/contiki-conf.h @@ -101,10 +101,10 @@ typedef unsigned long off_t; /* RADIOSTATS is used in rf230bb, clock.c and the webserver cgi to report radio usage */ /* It has less overhead than ENERGEST */ -#define RADIOSTATS 1 +#define RADIOSTATS 0 /* More extensive stats, via main loop printfs or webserver status pages */ -#define ENERGEST_CONF_ON 1 +#define ENERGEST_CONF_ON 0 /* Packet statistics */ typedef unsigned short uip_stats_t; @@ -182,8 +182,8 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_DHCP_LIGHT 1 -#if 1 /* No radio cycling */ -//#if 0 /* radio cycling */ +//#if 1 /* No radio cycling */ +#if 0 /* radio cycling */ #define NETSTACK_CONF_MAC nullmac_driver #define NETSTACK_CONF_RDC sicslowmac_driver