diff --git a/examples/osd/arduino-climate3/resources/res-htu21dtemp.c b/examples/osd/arduino-climate3/resources/res-htu21dtemp.c index abb57197f..cdc9a9a7d 100644 --- a/examples/osd/arduino-climate3/resources/res-htu21dtemp.c +++ b/examples/osd/arduino-climate3/resources/res-htu21dtemp.c @@ -46,7 +46,7 @@ static void res_get_handler(void *request, void *response, uint8_t *buffer, uint /* A simple getter example. Returns the reading from the sensor with a simple etag */ RESOURCE(res_htu21dtemp, - "title=\"Moisture status\";rt=\"Moisture\"", + "title=\"Temperature status\";rt=\"Temperatur\"", res_get_handler, NULL, NULL, @@ -68,7 +68,7 @@ res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferr REST.set_response_payload(response, buffer, strlen((char *)buffer)); } else if(accept == REST.type.APPLICATION_JSON) { REST.set_header_content_type(response, REST.type.APPLICATION_JSON); - snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "{'moisture':%s}", htu21d_temp_s); + snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "{'temperature':%s}", htu21d_temp_s); REST.set_response_payload(response, buffer, strlen((char *)buffer)); } else { diff --git a/examples/osd/arduino-dallastemp/resources/res-htu21dhum.c b/examples/osd/arduino-dallastemp/resources/res-htu21dhum.c deleted file mode 100644 index f66c71c74..000000000 --- a/examples/osd/arduino-dallastemp/resources/res-htu21dhum.c +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (c) 2013, Institute for Pervasive Computing, ETH Zurich - * 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. - * - * This file is part of the Contiki operating system. - */ - -/** - * \file - * Moisture resource - * \author - * Harald Pichler - */ - -#include "contiki.h" - -#include -#include "rest-engine.h" -#include "Arduino.h" - -static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset); - -/* A simple getter example. Returns the reading from the sensor with a simple etag */ -RESOURCE(res_htu21dhum, - "title=\"Moisture status\";rt=\"Moisture\"", - res_get_handler, - NULL, - NULL, - NULL); - -extern char htu21d_hum_s[8]; - - -static void -res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset) -{ - - unsigned int accept = -1; - REST.get_header_accept(request, &accept); - - if(accept == -1 || accept == REST.type.TEXT_PLAIN) { - REST.set_header_content_type(response, REST.type.TEXT_PLAIN); - snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "%s", htu21d_hum_s); - - REST.set_response_payload(response, buffer, strlen((char *)buffer)); - } else if(accept == REST.type.APPLICATION_JSON) { - REST.set_header_content_type(response, REST.type.APPLICATION_JSON); - snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "{'moisture':%s}", htu21d_hum_s); - - 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)); - } -} diff --git a/examples/osd/arduino-dallastemp/resources/res-htu21dtemp.c b/examples/osd/arduino-dallastemp/resources/res-htu21dtemp.c deleted file mode 100644 index d95a88cdd..000000000 --- a/examples/osd/arduino-dallastemp/resources/res-htu21dtemp.c +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2013, Institute for Pervasive Computing, ETH Zurich - * 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. - * - * This file is part of the Contiki operating system. - */ - -/** - * \file - * Moisture resource - * \author - * Harald Pichler - */ - -#include "contiki.h" - -#include -#include "rest-engine.h" -#include "Arduino.h" - -static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset); - -/* A simple getter example. Returns the reading from the sensor with a simple etag */ -RESOURCE(res_htu21dtemp, - "title=\"Moisture status\";rt=\"Moisture\"", - res_get_handler, - NULL, - NULL, - NULL); - -extern char d_temp_s[8]; - -static void -res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset) -{ - - unsigned int accept = -1; - REST.get_header_accept(request, &accept); - - if(accept == -1 || accept == REST.type.TEXT_PLAIN) { - REST.set_header_content_type(response, REST.type.TEXT_PLAIN); - snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "%s", d_temp_s); - - REST.set_response_payload(response, buffer, strlen((char *)buffer)); - } else if(accept == REST.type.APPLICATION_JSON) { - REST.set_header_content_type(response, REST.type.APPLICATION_JSON); - snprintf((char *)buffer, REST_MAX_CHUNK_SIZE, "{'moisture':%s}", d_temp_s); - - 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)); - } -} diff --git a/examples/osd/arduino-dallastemp/sketch.pde b/examples/osd/arduino-dallastemp/sketch.pde index 8993a4e68..e85af6d65 100644 --- a/examples/osd/arduino-dallastemp/sketch.pde +++ b/examples/osd/arduino-dallastemp/sketch.pde @@ -33,10 +33,8 @@ DallasTemperature dsensors(&oneWire); // arrays to hold device addresses DeviceAddress insideThermometer, outsideThermometer; -extern resource_t res_htu21dtemp, res_htu21dhum, res_battery; -float htu21d_hum; +extern resource_t res_dtemp, res_battery; float d_temp; -char htu21d_hum_s[8]; char d_temp_s[8]; #define LED_PIN 4 @@ -147,8 +145,7 @@ void setup (void) printf("\n"); // init coap resourcen rest_init_engine (); - rest_activate_resource (&res_htu21dtemp, "s/temp"); - rest_activate_resource (&res_htu21dhum, "s/hum"); + rest_activate_resource (&res_dtemp, "s/temp"); rest_activate_resource (&res_battery, "s/batter"); }