cleanup code
This commit is contained in:
parent
829cd2517d
commit
c3f00a7106
4 changed files with 14 additions and 571 deletions
|
@ -47,26 +47,12 @@
|
|||
#define REST_RES_INFO 1
|
||||
#define REST_RES_DS1820 1
|
||||
#define REST_RES_DHT11 1
|
||||
#define REST_RES_TEMPERATURE 1
|
||||
#define REST_RES_CHUNKS 0
|
||||
#define REST_RES_SEPARATE 0
|
||||
#define REST_RES_PUSHING 0
|
||||
#define REST_RES_EVENT 0
|
||||
#define REST_RES_LEDS 0
|
||||
#define REST_RES_LEDS 1
|
||||
#define REST_RES_TOGGLE 0
|
||||
#define REST_RES_BATTERY 1
|
||||
|
||||
|
||||
#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"
|
||||
|
||||
// todo OSD-Testboard move to platform/dev
|
||||
#include "dev/key.h"
|
||||
#include "dev/led.h"
|
||||
#if REST_RES_DS1820
|
||||
#include "dev/ds1820.h"
|
||||
#endif
|
||||
|
@ -141,7 +127,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\" : \"V0.4.1\",\n");
|
||||
index += sprintf(message + index,"{\n \"version\" : \"V0.4.2\",\n");
|
||||
index += sprintf(message + index," \"name\" : \"6lowpan-climate\"\n");
|
||||
index += sprintf(message + index,"}\n");
|
||||
|
||||
|
@ -153,74 +139,6 @@ info_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_
|
|||
}
|
||||
#endif
|
||||
|
||||
|
||||
/*A simple actuator example, post variable mode, relay is activated or deactivated*/
|
||||
RESOURCE(led1, METHOD_GET | METHOD_PUT , "actors/led1", "title=\"Led1\";rt=\"led\"");
|
||||
void
|
||||
led1_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
{
|
||||
char mode[10];
|
||||
static uint8_t led1 = 0;
|
||||
static char name[17]="led1";
|
||||
int success = 1;
|
||||
|
||||
char temp[100];
|
||||
int index = 0;
|
||||
size_t len = 0;
|
||||
|
||||
const char *pmode = NULL;
|
||||
const char *pname = NULL;
|
||||
|
||||
switch(REST.get_method_type(request)){
|
||||
case METHOD_GET:
|
||||
// jSON Format
|
||||
index += sprintf(temp + index,"{\n \"name\" : \"%s\",\n",name);
|
||||
if(led1 == 0)
|
||||
index += sprintf(temp + index," \"mode\" : \"off\"\n");
|
||||
if(led1 == 1)
|
||||
index += sprintf(temp + index," \"mode\" : \"on\"\n");
|
||||
index += sprintf(temp + index,"}\n");
|
||||
|
||||
len = strlen(temp);
|
||||
memcpy(buffer, temp,len );
|
||||
|
||||
REST.set_header_content_type(response, REST.type.APPLICATION_JSON);
|
||||
REST.set_response_payload(response, buffer, len);
|
||||
break;
|
||||
case METHOD_POST:
|
||||
success = 0;
|
||||
break;
|
||||
case METHOD_PUT:
|
||||
if (success && (len=REST.get_post_variable(request, "mode", &pmode))) {
|
||||
PRINTF("name %s\n", mode);
|
||||
memcpy(mode, pmode,len);
|
||||
mode[len]=0;
|
||||
if (!strcmp(mode, "on")) {
|
||||
led1_on();
|
||||
led1 = 1;
|
||||
} else if (!strcmp(mode, "off")) {
|
||||
led1_off();
|
||||
led1 = 0;
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
} else if (success && (len=REST.get_post_variable(request, "name", &pname))) {
|
||||
PRINTF("name %s\n", name);
|
||||
memcpy(name, pname,len);
|
||||
name[len]=0;
|
||||
} else {
|
||||
success = 0;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
success = 0;
|
||||
}
|
||||
|
||||
if (!success) {
|
||||
REST.set_response_status(response, REST.status.BAD_REQUEST);
|
||||
}
|
||||
}
|
||||
|
||||
#if REST_RES_DS1820
|
||||
/*A simple getter example. Returns the reading from ds1820 sensor*/
|
||||
RESOURCE(ds1820, METHOD_GET, "sensors/temp", "title=\"Temperatur DS1820\";rt=\"temperature-c\"");
|
||||
|
@ -309,245 +227,6 @@ dht11_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred
|
|||
}
|
||||
#endif //REST_RES_DHT11
|
||||
|
||||
/******************************************************************************/
|
||||
#if REST_RES_CHUNKS
|
||||
/*
|
||||
* For data larger than REST_MAX_CHUNK_SIZE (e.g., stored in flash) resources must be aware of the buffer limitation
|
||||
* and split their responses by themselves. To transfer the complete resource through a TCP stream or CoAP's blockwise transfer,
|
||||
* the byte offset where to continue is provided to the handler as int32_t pointer.
|
||||
* These chunk-wise resources must set the offset value to its new position or -1 of the end is reached.
|
||||
* (The offset for CoAP's blockwise transfer can go up to 2'147'481'600 = ~2047 M for block size 2048 (reduced to 1024 in observe-03.)
|
||||
*/
|
||||
RESOURCE(chunks, METHOD_GET, "test/chunks", "title=\"Blockwise demo\";rt=\"Data\"");
|
||||
|
||||
#define CHUNKS_TOTAL 2050
|
||||
|
||||
void
|
||||
chunks_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
{
|
||||
int32_t strpos = 0;
|
||||
|
||||
/* Check the offset for boundaries of the resource data. */
|
||||
if (*offset>=CHUNKS_TOTAL)
|
||||
{
|
||||
REST.set_response_status(response, REST.status.BAD_OPTION);
|
||||
/* A block error message should not exceed the minimum block size (16). */
|
||||
|
||||
const char *error_msg = "BlockOutOfScope";
|
||||
REST.set_response_payload(response, error_msg, strlen(error_msg));
|
||||
return;
|
||||
}
|
||||
|
||||
/* Generate data until reaching CHUNKS_TOTAL. */
|
||||
while (strpos<preferred_size)
|
||||
{
|
||||
strpos += snprintf((char *)buffer+strpos, preferred_size-strpos+1, "|%ld|", *offset);
|
||||
}
|
||||
|
||||
/* snprintf() does not adjust return value if truncated by size. */
|
||||
if (strpos > preferred_size)
|
||||
{
|
||||
strpos = preferred_size;
|
||||
}
|
||||
|
||||
/* Truncate if above CHUNKS_TOTAL bytes. */
|
||||
if (*offset+(int32_t)strpos > CHUNKS_TOTAL)
|
||||
{
|
||||
strpos = CHUNKS_TOTAL - *offset;
|
||||
}
|
||||
|
||||
REST.set_response_payload(response, buffer, strpos);
|
||||
|
||||
/* IMPORTANT for chunk-wise resources: Signal chunk awareness to REST engine. */
|
||||
*offset += strpos;
|
||||
|
||||
/* Signal end of resource representation. */
|
||||
if (*offset>=CHUNKS_TOTAL)
|
||||
{
|
||||
*offset = -1;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/******************************************************************************/
|
||||
#if REST_RES_SEPARATE && defined (PLATFORM_HAS_BUTTON) && WITH_COAP > 3
|
||||
/* Required to manually (=not by the engine) handle the response transaction. */
|
||||
#include "er-coap-07-separate.h"
|
||||
#include "er-coap-07-transactions.h"
|
||||
/*
|
||||
* CoAP-specific example for separate responses.
|
||||
* Note the call "rest_set_pre_handler(&resource_separate, coap_separate_handler);" in the main process.
|
||||
* The pre-handler takes care of the empty ACK and updates the MID and message type for CON requests.
|
||||
* The resource handler must store all information that required to finalize the response later.
|
||||
*/
|
||||
RESOURCE(separate, METHOD_GET, "test/separate", "title=\"Separate demo\"");
|
||||
|
||||
/* A structure to store the required information */
|
||||
typedef struct application_separate_store {
|
||||
/* Provided by Erbium to store generic request information such as remote address and token. */
|
||||
coap_separate_t request_metadata;
|
||||
/* Add fields for addition information to be stored for finalizing, e.g.: */
|
||||
char buffer[16];
|
||||
} application_separate_store_t;
|
||||
|
||||
static uint8_t separate_active = 0;
|
||||
static application_separate_store_t separate_store[1];
|
||||
|
||||
void
|
||||
separate_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
{
|
||||
/*
|
||||
* Example allows only one open separate response.
|
||||
* For multiple, the application must manage the list of stores.
|
||||
*/
|
||||
if (separate_active)
|
||||
{
|
||||
coap_separate_reject();
|
||||
}
|
||||
else
|
||||
{
|
||||
separate_active = 1;
|
||||
|
||||
/* Take over and skip response by engine. */
|
||||
coap_separate_accept(request, &separate_store->request_metadata);
|
||||
/* Be aware to respect the Block2 option, which is also stored in the coap_separate_t. */
|
||||
|
||||
/*
|
||||
* At the moment, only the minimal information is stored in the store (client address, port, token, MID, type, and Block2).
|
||||
* Extend the store, if the application requires additional information from this handler.
|
||||
* buffer is an example field for custom information.
|
||||
*/
|
||||
snprintf(separate_store->buffer, sizeof(separate_store->buffer), "StoredInfo");
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
separate_finalize_handler()
|
||||
{
|
||||
if (separate_active)
|
||||
{
|
||||
coap_transaction_t *transaction = NULL;
|
||||
if ( (transaction = coap_new_transaction(separate_store->request_metadata.mid, &separate_store->request_metadata.addr, separate_store->request_metadata.port)) )
|
||||
{
|
||||
coap_packet_t response[1]; /* This way the packet can be treated as pointer as usual. */
|
||||
|
||||
/* Restore the request information for the response. */
|
||||
coap_separate_resume(response, &separate_store->request_metadata, CONTENT_2_05);
|
||||
|
||||
coap_set_payload(response, separate_store->buffer, strlen(separate_store->buffer));
|
||||
|
||||
/*
|
||||
* Be aware to respect the Block2 option, which is also stored in the coap_separate_t.
|
||||
* As it is a critical option, this example resource pretends to handle it for compliance.
|
||||
*/
|
||||
coap_set_header_block2(response, separate_store->request_metadata.block2_num, 0, separate_store->request_metadata.block2_size);
|
||||
|
||||
/* Warning: No check for serialization error. */
|
||||
transaction->packet_len = coap_serialize_message(response, transaction->packet);
|
||||
coap_send_transaction(transaction);
|
||||
/* The engine will clear the transaction (right after send for NON, after acked for CON). */
|
||||
|
||||
separate_active = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* Set timer for retry, send error message, ...
|
||||
* The example simply waits for another button press.
|
||||
*/
|
||||
}
|
||||
} /* if (separate_active) */
|
||||
}
|
||||
#endif
|
||||
|
||||
/******************************************************************************/
|
||||
#if REST_RES_PUSHING
|
||||
/*
|
||||
* Example for a periodic resource.
|
||||
* It takes an additional period parameter, which defines the interval to call [name]_periodic_handler().
|
||||
* A default post_handler takes care of subscriptions by managing a list of subscribers to notify.
|
||||
*/
|
||||
PERIODIC_RESOURCE(pushing, METHOD_GET, "test/push", "title=\"Periodic demo\";obs", 5*CLOCK_SECOND);
|
||||
|
||||
void
|
||||
pushing_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
{
|
||||
REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
|
||||
|
||||
/* Usually, a CoAP server would response with the resource representation matching the periodic_handler. */
|
||||
const char *msg = "It's periodic!";
|
||||
REST.set_response_payload(response, msg, strlen(msg));
|
||||
|
||||
/* A post_handler that handles subscriptions will be called for periodic resources by the REST framework. */
|
||||
}
|
||||
|
||||
/*
|
||||
* Additionally, a handler function named [resource name]_handler must be implemented for each PERIODIC_RESOURCE.
|
||||
* It will be called by the REST manager process with the defined period.
|
||||
*/
|
||||
void
|
||||
pushing_periodic_handler(resource_t *r)
|
||||
{
|
||||
static uint16_t obs_counter = 0;
|
||||
static char content[11];
|
||||
|
||||
++obs_counter;
|
||||
|
||||
PRINTF("TICK %u for /%s\n", obs_counter, r->url);
|
||||
|
||||
/* Build notification. */
|
||||
coap_packet_t notification[1]; /* This way the packet can be treated as pointer as usual. */
|
||||
coap_init_message(notification, COAP_TYPE_NON, CONTENT_2_05, 0 );
|
||||
coap_set_payload(notification, content, snprintf(content, sizeof(content), "TICK %u", obs_counter));
|
||||
|
||||
/* Notify the registered observers with the given message type, observe option, and payload. */
|
||||
REST.notify_subscribers(r, obs_counter, notification);
|
||||
}
|
||||
#endif
|
||||
|
||||
/******************************************************************************/
|
||||
#if REST_RES_EVENT && defined (PLATFORM_HAS_BUTTON)
|
||||
/*
|
||||
* Example for an event resource.
|
||||
* Additionally takes a period parameter that defines the interval to call [name]_periodic_handler().
|
||||
* A default post_handler takes care of subscriptions and manages a list of subscribers to notify.
|
||||
*/
|
||||
EVENT_RESOURCE(event, METHOD_GET, "sensors/button", "title=\"Event demo\";obs");
|
||||
|
||||
void
|
||||
event_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
{
|
||||
REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
|
||||
/* Usually, a CoAP server would response with the current resource representation. */
|
||||
const char *msg = "It's eventful!";
|
||||
REST.set_response_payload(response, (uint8_t *)msg, strlen(msg));
|
||||
|
||||
/* A post_handler that handles subscriptions/observing will be called for periodic resources by the framework. */
|
||||
}
|
||||
|
||||
/* Additionally, a handler function named [resource name]_event_handler must be implemented for each PERIODIC_RESOURCE defined.
|
||||
* It will be called by the REST manager process with the defined period. */
|
||||
void
|
||||
event_event_handler(resource_t *r)
|
||||
{
|
||||
static uint16_t event_counter = 0;
|
||||
static char content[12];
|
||||
|
||||
++event_counter;
|
||||
|
||||
PRINTF("TICK %u for /%s\n", event_counter, r->url);
|
||||
|
||||
/* Build notification. */
|
||||
coap_packet_t notification[1]; /* This way the packet can be treated as pointer as usual. */
|
||||
coap_init_message(notification, COAP_TYPE_CON, CONTENT_2_05, 0 );
|
||||
coap_set_payload(notification, content, snprintf(content, sizeof(content), "EVENT %u", event_counter));
|
||||
|
||||
/* Notify the registered observers with the given message type, observe option, and payload. */
|
||||
REST.notify_subscribers(r, event_counter, notification);
|
||||
}
|
||||
#endif /* PLATFORM_HAS_BUTTON */
|
||||
|
||||
|
||||
/******************************************************************************/
|
||||
#if defined (PLATFORM_HAS_LEDS)
|
||||
/******************************************************************************/
|
||||
|
@ -612,42 +291,6 @@ toggle_handler(void* request, void* response, uint8_t *buffer, uint16_t preferre
|
|||
#endif
|
||||
#endif /* PLATFORM_HAS_LEDS */
|
||||
|
||||
|
||||
/******************************************************************************/
|
||||
#if REST_RES_TEMPERATURE && defined (PLATFORM_HAS_TEMPERATURE)
|
||||
/* A simple getter example. Returns the reading from light sensor with a simple etag */
|
||||
RESOURCE(temperature, METHOD_GET, "sensors/cputemp", "title=\"Temperature status\";rt=\"temperature-c\"");
|
||||
void
|
||||
temperature_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
|
||||
{
|
||||
int temperature = temperature_sensor.value(0);
|
||||
|
||||
const uint16_t *accept = NULL;
|
||||
int num = REST.get_header_accept(request, &accept);
|
||||
|
||||
if ((num==0) || (num && accept[0]==REST.type.TEXT_PLAIN))
|
||||
{
|
||||
REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
|
||||
snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "%d", temperature);
|
||||
|
||||
REST.set_response_payload(response, (uint8_t *)buffer, strlen((char *)buffer));
|
||||
}
|
||||
else if (num && (accept[0]==REST.type.APPLICATION_JSON))
|
||||
{
|
||||
REST.set_header_content_type(response, REST.type.APPLICATION_JSON);
|
||||
snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "{'temperature':%d}", temperature);
|
||||
|
||||
REST.set_response_payload(response, buffer, strlen((char *)buffer));
|
||||
}
|
||||
else
|
||||
{
|
||||
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));
|
||||
}
|
||||
}
|
||||
#endif /* PLATFORM_HAS_TEMPERATURE */
|
||||
|
||||
/******************************************************************************/
|
||||
#if REST_RES_BATTERY && defined (PLATFORM_HAS_BATTERY)
|
||||
/* A simple getter example. Returns the reading from light sensor with a simple etag */
|
||||
|
@ -686,14 +329,15 @@ battery_handler(void* request, void* response, uint8_t *buffer, uint16_t preferr
|
|||
void
|
||||
hw_init()
|
||||
{
|
||||
led1_off();
|
||||
#if defined (PLATFORM_HAS_LEDS)
|
||||
leds_off(LEDS_RED);
|
||||
#endif
|
||||
#if REST_RES_DS1820
|
||||
ds1820_temp();
|
||||
#endif
|
||||
#if REST_RES_DHT11
|
||||
//DHT_INIT();
|
||||
DHT_Read_Data(&dht11_temp, &dht11_hum);
|
||||
// DHT_Read_Data(&dht11_temp, &dht11_hum);
|
||||
#endif
|
||||
}
|
||||
#define MESURE_INTERVAL (20 * CLOCK_SECOND)
|
||||
|
@ -738,8 +382,6 @@ PROCESS_THREAD(rest_server_example, ev, data)
|
|||
rest_init_engine();
|
||||
|
||||
/* Activate the application-specific resources. */
|
||||
rest_activate_resource(&resource_led1);
|
||||
/* Activate the application-specific resources. */
|
||||
#if REST_RES_DS1820
|
||||
rest_activate_resource(&resource_ds1820);
|
||||
#endif
|
||||
|
@ -749,22 +391,6 @@ PROCESS_THREAD(rest_server_example, ev, data)
|
|||
#if REST_RES_INFO
|
||||
rest_activate_resource(&resource_info);
|
||||
#endif
|
||||
#if REST_RES_CHUNKS
|
||||
rest_activate_resource(&resource_chunks);
|
||||
#endif
|
||||
#if REST_RES_PUSHING
|
||||
rest_activate_periodic_resource(&periodic_resource_pushing);
|
||||
#endif
|
||||
#if defined (PLATFORM_HAS_BUTTON) && REST_RES_EVENT
|
||||
rest_activate_event_resource(&resource_event);
|
||||
#endif
|
||||
#if defined (PLATFORM_HAS_BUTTON) && REST_RES_SEPARATE && WITH_COAP > 3
|
||||
/* No pre-handler anymore, user coap_separate_accept() and coap_separate_reject(). */
|
||||
rest_activate_resource(&resource_separate);
|
||||
#endif
|
||||
#if defined (PLATFORM_HAS_BUTTON) && (REST_RES_EVENT || (REST_RES_SEPARATE && WITH_COAP > 3))
|
||||
SENSORS_ACTIVATE(button_sensor);
|
||||
#endif
|
||||
#if defined (PLATFORM_HAS_LEDS)
|
||||
#if REST_RES_LEDS
|
||||
rest_activate_resource(&resource_leds);
|
||||
|
@ -789,14 +415,6 @@ PROCESS_THREAD(rest_server_example, ev, data)
|
|||
#if defined (PLATFORM_HAS_BUTTON)
|
||||
if (ev == sensors_event && data == &button_sensor) {
|
||||
PRINTF("BUTTON\n");
|
||||
#if REST_RES_EVENT
|
||||
/* Call the event_handler for this application-specific event. */
|
||||
event_event_handler(&resource_event);
|
||||
#endif
|
||||
#if REST_RES_SEPARATE && WITH_COAP>3
|
||||
/* Also call the separate response example handler. */
|
||||
separate_finalize_handler();
|
||||
#endif
|
||||
}
|
||||
#endif /* PLATFORM_HAS_BUTTON */
|
||||
if(etimer_expired(&ds_periodic_timer)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue