add relay

examples/osd/wirelessplug/Makefile

@@ -1,4 +1,4 @@
-all: er-example-server er-example-client
+all: er-example-server
 # Use this target explicitly if requried: er-plugtest-server
 
 CONTIKI=../../..
@@ -13,6 +13,7 @@ endif
 endif
 endif
 
+PROJECT_SOURCEFILES += relay.c
 # variable for root Makefile.include
 WITH_UIP6=1
 # for some platforms

examples/osd/wirelessplug/er-example-server.c

@@ -93,6 +93,7 @@
 #include "dev/radio-sensor.h"
 #endif
 
+#include "relay.h"
 
 /* For CoAP-specific example: not required for normal RESTful Web service. */
 #if WITH_COAP == 3
@@ -164,7 +165,7 @@ void
 plug1_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
 {
   char mode[10];
-  static uint8_t led2 = 0;
+  static uint8_t relay1 = 0;
   static char name[17]="plug1";
   int success = 1;
 
@@ -179,9 +180,9 @@ plug1_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred
    case METHOD_GET:
      // jSON Format
      index += sprintf(temp + index,"{\n \"name\" : \"%s\",\n",name);
-     if(led2 == 0)
+     if(relay1 == 0)
          index += sprintf(temp + index," \"mode\" : \"off\"\n");
-     if(led2 == 1)
+     if(relay1 == 1)
          index += sprintf(temp + index," \"mode\" : \"on\"\n");
      index += sprintf(temp + index,"}\n");
 
@@ -200,11 +201,11 @@ plug1_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred
        memcpy(mode, pmode,len);
        mode[len]=0;
        if (!strcmp(mode, "on")) {
-         led2_on();
+         relay1_on();
-         led2 = 1;
+         relay1 = 1;
        } else if (!strcmp(mode, "off")) {
-         led2_off();
+         relay1_off();
-         led2 = 0;
+         relay1 = 0;
        } else {
          success = 0;
        }

examples/osd/wirelessplug/relay.c

@@ -0,0 +1,70 @@
+/*
+ *  Copyright (c) 2012  harald pichler
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * 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.
+ *  * Neither the name of the copyright holders nor the names of
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
+ */
+/**
+ * \file
+ *
+ * \brief
+ *      This file provides Raven LED support.
+ *
+ * \author
+ *      Harald Pichler harald@the-develop.net
+ *
+ */
+
+#include "relay.h"
+
+/**
+ * \addtogroup relay
+ * \{
+*/
+/*---------------------------------------------------------------------------*/
+
+/**
+ * \brief Turns the relay1 off.
+*/
+void
+relay1_off(void)
+{
+    DDRG  |=  (1<<PING5);
+    PORTG &= ~(1<<PING5);
+}
+
+/*---------------------------------------------------------------------------*/
+
+/**
+ *  \brief Turns the relay1 on.
+*/
+void
+relay1_on(void)
+{
+    DDRG  |= (1<<PING5);
+    PORTG |= (1<<PING5);
+}
+/*---------------------------------------------------------------------------*/

examples/osd/wirelessplug/relay.h

@@ -0,0 +1,52 @@
+/*
+ *  Copyright (c) 2012  Harald Pichler
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * 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.
+ *  * Neither the name of the copyright holders nor the names of
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
+ */
+/**
+ * \file
+ *
+ * \brief
+ *      This file provides Raven LED support.
+ *
+ * \author
+ *      Harald Pichler harald@the-develop.net
+ *
+ */
+
+#ifndef __RELAY_H__
+#define __RELAY_H__
+
+#include <avr/io.h>
+
+/** @name Relay Functions */
+/** @{ */
+void relay1_on(void);
+void relay1_off(void);
+/** @} */
+
+#endif /* __RELAY_H__ */