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

change rt tag and disable energest and radio stat

Browse source
This commit is contained in:
harald42 2013-02-12 10:19:10 +01:00 committed by harald
parent 2e35f2225d
commit b2040a6cd9
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/osd/er-rest-example-dht11/er-example-server.c
View file

@ -975,7 +975,7 @@ temperature_handler(void* request, void* response, uint8_t *buffer, uint16_t pre
/******************************************************************************/ /******************************************************************************/
#if REST_RES_BATTERY && defined (PLATFORM_HAS_BATTERY) #if REST_RES_BATTERY && defined (PLATFORM_HAS_BATTERY)
/* A simple getter example. Returns the reading from light sensor with a simple etag */ /* 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 void
battery_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset) battery_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
{ {

8
platform/osd-er-lp24/contiki-conf.h
View file

@ -101,10 +101,10 @@ typedef unsigned long off_t;
/* RADIOSTATS is used in rf230bb, clock.c and the webserver cgi to report radio usage */ /* RADIOSTATS is used in rf230bb, clock.c and the webserver cgi to report radio usage */
/* It has less overhead than ENERGEST */ /* It has less overhead than ENERGEST */
#define RADIOSTATS 1 #define RADIOSTATS 0
/* More extensive stats, via main loop printfs or webserver status pages */ /* More extensive stats, via main loop printfs or webserver status pages */
#define ENERGEST_CONF_ON 1 #define ENERGEST_CONF_ON 0
/* Packet statistics */ /* Packet statistics */
typedef unsigned short uip_stats_t; typedef unsigned short uip_stats_t;
@ -182,8 +182,8 @@ typedef unsigned short uip_stats_t;
#define UIP_CONF_DHCP_LIGHT 1 #define UIP_CONF_DHCP_LIGHT 1
#if 1 /* No radio cycling */ //#if 1 /* No radio cycling */
//#if 0 /* radio cycling */ #if 0 /* radio cycling */
#define NETSTACK_CONF_MAC nullmac_driver #define NETSTACK_CONF_MAC nullmac_driver
#define NETSTACK_CONF_RDC sicslowmac_driver #define NETSTACK_CONF_RDC sicslowmac_driver