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

cleanup code add coap13 support

Browse source
This commit is contained in:
Harald Pichler 2013-12-06 15:17:13 +01:00
parent 2408af0b93
commit 7ea29294d7
3 changed files with 86 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

10
examples/osd/light-actor/er-example-server.c
View file

@ -80,6 +80,10 @@
#include "er-coap-03.h"
#elif WITH_COAP == 7
#include "er-coap-07.h"
#elif WITH_COAP == 12
#include "er-coap-12.h"
#elif WITH_COAP == 13
#include "er-coap-13.h"
#else
#warning "Erbium example without CoAP-specifc functionality"
#endif /* CoAP-specific example */
@ -119,7 +123,7 @@ info_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_
/* Some data that has the length up to REST_MAX_CHUNK_SIZE. For more, see the chunk resource. */
// jSON Format
index += sprintf(message + index,"{\n \"Version\" : \"V1.0pre1\",\n");
index += sprintf(message + index,"{\n \"Version\" : \"V1.0pre2\",\n");
index += sprintf(message + index," \"name\" : \"light-actor\"\n");
index += sprintf(message + index,"}\n");
@ -441,7 +445,7 @@ temperature_handler(void* request, void* response, uint8_t *buffer, uint16_t pre
}
else
{
REST.set_response_status(response, REST.status.UNSUPPORTED_MADIA_TYPE);
REST.set_response_status(response, REST.status.NOT_ACCEPTABLE);
const char *msg = "Supporting content-types text/plain and application/json";
REST.set_response_payload(response, msg, strlen(msg));
}
@ -476,7 +480,7 @@ battery_handler(void* request, void* response, uint8_t *buffer, uint16_t preferr
}
else
{
REST.set_response_status(response, REST.status.UNSUPPORTED_MADIA_TYPE);
REST.set_response_status(response, REST.status.NOT_ACCEPTABLE);
const char *msg = "Supporting content-types text/plain and application/json";
REST.set_response_payload(response, msg, strlen(msg));
}