From 8b887ca42918e663fcd7563f4f5910c5787bd98e Mon Sep 17 00:00:00 2001 From: Harald Pichler Date: Sat, 20 Aug 2016 14:09:44 +0200 Subject: [PATCH] add button led bled to project --- .../osd/triggerbaord/resources/res-bled.c | 104 ++++++++++++++++++ examples/osd/triggerbaord/sketch.pde | 15 ++- .../osd-merkur-128/Makefile.osd-merkur-128 | 2 +- 3 files changed, 115 insertions(+), 6 deletions(-) create mode 100644 examples/osd/triggerbaord/resources/res-bled.c diff --git a/examples/osd/triggerbaord/resources/res-bled.c b/examples/osd/triggerbaord/resources/res-bled.c new file mode 100644 index 000000000..0afa1889d --- /dev/null +++ b/examples/osd/triggerbaord/resources/res-bled.c @@ -0,0 +1,104 @@ +/* + * 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 + * Door 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); +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_bled, + "title=\"LED: , POST/PUT mode=on|off\";rt=\"Control\"", + res_get_handler, + res_post_put_handler, + res_post_put_handler, + NULL); + +extern uint8_t bled_pin; +extern uint8_t bled_status; + +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", bled_status); + + 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, "{'led':%d}", bled_status); + + 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 *mode = NULL; + int success = 1; + + if(success && (len = REST.get_post_variable(request, "mode", &mode))) { + if(strncmp(mode, "on", len) == 0) { + digitalWrite(bled_pin, HIGH); + bled_status=1; + } else if(strncmp(mode, "off", len) == 0) { + digitalWrite(bled_pin, LOW); + bled_status=0; + } else { + success = 0; + } + } else { + success = 0; + } if(!success) { + REST.set_response_status(response, REST.status.BAD_REQUEST); + } +} diff --git a/examples/osd/triggerbaord/sketch.pde b/examples/osd/triggerbaord/sketch.pde index 73aeb00f7..9980238b1 100644 --- a/examples/osd/triggerbaord/sketch.pde +++ b/examples/osd/triggerbaord/sketch.pde @@ -16,10 +16,9 @@ extern "C" { #include "net/netstack.h" #include "dev/button-sensor.h" - - extern resource_t - res_led, + res_led, + res_bled, res_battery, res_cputemp, res_event, @@ -28,6 +27,8 @@ extern resource_t uint8_t led_pin=4; uint8_t led_status; +uint8_t bled_pin=7; +uint8_t bled_status; } void setup (void) @@ -36,15 +37,19 @@ void setup (void) pinMode(led_pin, OUTPUT); digitalWrite(led_pin, HIGH); led_status=0; + // switch off the bled + pinMode(bled_pin, OUTPUT); + digitalWrite(bled_pin, LOW); + bled_status=0; // sensors SENSORS_ACTIVATE(button_sensor); // init coap resourcen rest_init_engine (); rest_activate_resource (&res_led, "s/led"); + rest_activate_resource (&res_bled, "s/bled"); rest_activate_resource (&res_battery, "s/battery"); rest_activate_resource (&res_cputemp, "s/cputemp"); - rest_activate_resource(&res_event, "s/button"); -// rest_activate_resource (&res_battery, "p/server"); + rest_activate_resource(&res_event, "s/button"); // NETSTACK_MAC.off(1); } diff --git a/platform/osd-merkur-128/Makefile.osd-merkur-128 b/platform/osd-merkur-128/Makefile.osd-merkur-128 index 8817f3855..48881a6f0 100644 --- a/platform/osd-merkur-128/Makefile.osd-merkur-128 +++ b/platform/osd-merkur-128/Makefile.osd-merkur-128 @@ -85,7 +85,7 @@ include $(CONTIKIAVR)/Makefile.avr include $(CONTIKIAVR)/radio/Makefile.radio MODULES += core/net/mac core/net core/net/mac/sicslowmac \ - core/net/mac/contikimac core/net/llsec \ + core/net/mac/contikimac core/net/llsec core/net/llsec/noncoresec \ # core/net/ipv6 core/net/ipv4 core/net/ip \ # core/net/rime \ # core/net/rpl \