From 325e41ae6a626e44999284cc496846cf270a0a81 Mon Sep 17 00:00:00 2001 From: Harald Pichler Date: Fri, 6 Oct 2017 13:40:20 +0200 Subject: [PATCH] print partition --- examples/osd/ota-update/sketch.pde | 2 - examples/osd/resources-common/res-rfchannel.c | 94 ------------------- 2 files changed, 96 deletions(-) delete mode 100644 examples/osd/resources-common/res-rfchannel.c diff --git a/examples/osd/ota-update/sketch.pde b/examples/osd/ota-update/sketch.pde index a1737dd7a..537e8cdd7 100644 --- a/examples/osd/ota-update/sketch.pde +++ b/examples/osd/ota-update/sketch.pde @@ -3,9 +3,7 @@ */ extern "C" { -#include #include "contiki.h" -#include "contiki-net.h" #include "bootloader_if.h" #include "er-coap.h" #include "ota-update.h" diff --git a/examples/osd/resources-common/res-rfchannel.c b/examples/osd/resources-common/res-rfchannel.c deleted file mode 100644 index de7316797..000000000 --- a/examples/osd/resources-common/res-rfchannel.c +++ /dev/null @@ -1,94 +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 - * rfchannel resource - * \author - * Harald Pichler - */ - -#include "contiki.h" - -#include -#include "rest-engine.h" -#include "Arduino.h" -#include "params.h" - -static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset); -static void res_post_put_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_rfchannel, - "title=\"RF-Channel: , POST/PUT value 11 .. 26\";rt=\"Control\"", - res_get_handler, - res_post_put_handler, - res_post_put_handler, - NULL); - -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, "%d", params_get_channel()); - - 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, "{'rfchannel':%d}", params_get_channel()); - - 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)); - } -} - -static void -res_post_put_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset) -{ - size_t len = 0; - const char *value = NULL; - int success = 1; - - if(success && (len = REST.get_post_variable(request, "value", &value))) { - set_param(RADIO_PARAM_CHANNEL, atoi(value)); - } else { - success = 0; - } if(!success) { - REST.set_response_status(response, REST.status.BAD_REQUEST); - } -}