From 682df76b792dff0c59f7c0e01def3dc92b41b6e7 Mon Sep 17 00:00:00 2001
From: harald42 <harald@20150300048NB.evva.com>
Date: Thu, 3 Mar 2016 10:32:38 +0100
Subject: [PATCH] add cputem to common resources and example
---
examples/osd/arduino-merkurboard/sketch.pde | 3 +-
examples/osd/resources-common/res-cputemp.c | 83 +++++++++++++++++++++
2 files changed, 85 insertions(+), 1 deletion(-)
create mode 100644 examples/osd/resources-common/res-cputemp.c
diff --git a/examples/osd/arduino-merkurboard/sketch.pde b/examples/osd/arduino-merkurboard/sketch.pde
index caa2c4c7a..0f60b8dad 100644
--- a/examples/osd/arduino-merkurboard/sketch.pde
+++ b/examples/osd/arduino-merkurboard/sketch.pde
@@ -16,7 +16,7 @@ extern "C" {
extern volatile uint8_t mcusleepcycle; // default 16
-extern resource_t res_leds, res_battery;
+extern resource_t res_leds, res_battery, res_cputemp;
uint8_t door_pin = 3;
uint8_t door_status = 0;
@@ -32,6 +32,7 @@ void setup (void)
rest_init_engine ();
rest_activate_resource (&res_leds, "s/leds");
rest_activate_resource (&res_battery, "s/battery");
+ rest_activate_resource (&res_cputemp, "s/cputemp");
// NETSTACK_MAC.off(1);
}
diff --git a/examples/osd/resources-common/res-cputemp.c b/examples/osd/resources-common/res-cputemp.c
new file mode 100644
index 000000000..8a748b74d
--- /dev/null
+++ b/examples/osd/resources-common/res-cputemp.c
@@ -0,0 +1,83 @@
+/*
+ * 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 <harald@the-develop.net>
+ */
+
+#include "contiki.h"
+
+#include <string.h>
+#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_cputemp,
+ "title=\"CPU temperature status\";rt=\"Temperature\"",
+ res_get_handler,
+ NULL,
+ NULL,
+ 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);
+
+ int cputemp = readInternalTemp();
+ int f_integral = (int)(cputemp/100);
+ int f_centi = cputemp - f_integral*100;
+
+ 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.%02d", f_integral, f_centi);
+
+ 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, "{'cputemp':%d.%02d}", f_integral, f_centi);
+
+ 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));
+ }
+}
+