initial upload

examples/osd/arduino-i2c-scanner/Makefile

@@ -0,0 +1,70 @@
+# Set this to the name of your sketch (without extension .pde)
+SKETCH=sketch
+EXE=arduino-example
+
+all: $(EXE)
+
+CONTIKI=../../..
+
+# Contiki IPv6 configuration
+CONTIKI_WITH_IPV6 = 1
+
+CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
+
+PROJECT_SOURCEFILES += ${SKETCH}.cpp
+
+# automatically build RESTful resources
+REST_RESOURCES_DIR = ./resources
+REST_RESOURCES_DIR_COMMON = ../resources-common
+REST_RESOURCES_FILES= $(notdir \
+    $(shell find $(REST_RESOURCES_DIR) -name '*.c') \
+    $(shell find $(REST_RESOURCES_DIR_COMMON) -name '*.c') \
+    )
+
+PROJECTDIRS += $(REST_RESOURCES_DIR) $(REST_RESOURCES_DIR_COMMON)
+PROJECT_SOURCEFILES += $(REST_RESOURCES_FILES)
+
+# variable for Makefile.include
+ifneq ($(TARGET), minimal-net)
+CFLAGS += -DUIP_CONF_IPV6_RPL=1
+else
+# minimal-net does not support RPL under Linux and is mostly used to test CoAP only
+${info INFO: compiling without RPL}
+CFLAGS += -DUIP_CONF_IPV6_RPL=0
+CFLAGS += -DHARD_CODED_ADDRESS=\"fdfd::10\"
+${info INFO: compiling with large buffers}
+CFLAGS += -DUIP_CONF_BUFFER_SIZE=2048
+CFLAGS += -DREST_MAX_CHUNK_SIZE=1024
+CFLAGS += -DCOAP_MAX_HEADER_SIZE=640
+endif
+
+# linker optimizations
+SMALL=1
+
+
+# REST Engine shall use Erbium CoAP implementation
+APPS += er-coap
+APPS += rest-engine
+APPS += arduino
+
+include $(CONTIKI)/Makefile.include
+include $(CONTIKI)/apps/arduino/Makefile.include
+
+$(CONTIKI)/tools/tunslip6:      $(CONTIKI)/tools/tunslip6.c
+	(cd $(CONTIKI)/tools && $(MAKE) tunslip6)
+
+connect-router: $(CONTIKI)/tools/tunslip6
+	sudo $(CONTIKI)/tools/tunslip6 aaaa::1/64
+
+connect-router-cooja:   $(CONTIKI)/tools/tunslip6
+	sudo $(CONTIKI)/tools/tunslip6 -a 127.0.0.1 aaaa::1/64
+
+connect-minimal:
+	sudo ip address add fdfd::1/64 dev tap0
+
+avr-size: $(EXE).$(TARGET).sz
+
+flash: $(EXE).$(TARGET).u $(EXE).$(TARGET).eu
+
+.PHONY: flash avr-size
+.PRECIOUS: $(EXE).$(TARGET).hex $(EXE).$(TARGET).eep

examples/osd/arduino-i2c-scanner/README.md

@@ -0,0 +1,11 @@
+Arduino compatibility example
+=============================
+
+This example shows that it is now possible to re-use arduino sketches in
+Contiki. This example documents the necessary magic. Arduino specifies
+two routines, `setup` and `loop`. Before `setup` is called, the
+framework initializes hardware. In original Arduino, all this is done in
+a `main` function (in C). For contiki we define a process that does the
+same.
+
+See the documentation file in apps/contiki-compat/README.md

examples/osd/arduino-i2c-scanner/arduino-example.c

@@ -0,0 +1,2 @@
+#include <arduino-process.h>
+AUTOSTART_PROCESSES(&arduino_sketch);

examples/osd/arduino-i2c-scanner/arduino-merkurbaord.geany

@@ -0,0 +1,55 @@
+[file_prefs]
+final_new_line=true
+ensure_convert_new_lines=false
+strip_trailing_spaces=false
+replace_tabs=false
+
+[indentation]
+indent_width=4
+indent_type=1
+indent_hard_tab_width=8
+detect_indent=false
+detect_indent_width=false
+indent_mode=2
+
+[project]
+name=arduino-merkurbaord
+base_path=/home/harald/install/osd-contiki/examples/osd/arduino-merkurboard/
+description=
+file_patterns=
+
+[long line marker]
+long_line_behaviour=1
+long_line_column=72
+
+[files]
+current_page=0
+FILE_NAME_0=1660;None;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2Finstall%2Fosd-contiki%2Fexamples%2Fosd%2Farduino-bmp280%2Fsketch.pde;0;4
+FILE_NAME_1=2030;None;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2Finstall%2Fosd-contiki%2Fexamples%2Fosd%2Farduino-bmp280%2FBarometer_Sensor%2Fexamples%2Fbme280test%2Fbme280test.ino;0;4
+FILE_NAME_2=0;C;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2Finstall%2Fosd-contiki%2Fexamples%2Fosd%2Farduino-bmp280%2FBarometer_Sensor%2FAdafruit_BME280.h;0;4
+FILE_NAME_3=849;C;0;EISO-8859-1;1;1;0;%2Fhome%2Fharald%2Finstall%2Fosd-contiki%2Fexamples%2Fosd%2Farduino-bmp280%2FAdafruit_Sensor-master%2FAdafruit_Sensor.h;0;4
+FILE_NAME_4=0;C;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2Finstall%2Fosd-contiki%2Fexamples%2Fosd%2Farduino-bmp085%2FBarometer.h;0;4
+FILE_NAME_5=808;C;0;EISO-8859-1;1;1;0;%2Fhome%2Fharald%2Finstall%2Fosd-contiki%2Fexamples%2Fosd%2Farduino-bmp280%2FAdafruit_Sensor.h;0;4
+FILE_NAME_6=2607;C;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2Finstall%2Fosd-contiki%2Fexamples%2Fosd%2Farduino-bmp280%2Fresources%2Fres-bmptemp.c;0;4
+FILE_NAME_7=4136;None;0;EUTF-8;1;1;0;%2Fhome%2Fharald%2Finstall%2Fosd-contiki%2Fexamples%2Fosd%2Fopentrigger-board%2Fsketch.pde;0;4
+
+[VTE]
+last_dir=/home/harald
+
+[build-menu]
+NF_00_LB=_Make
+NF_00_CM=make TARGET=osd-merkur-256
+NF_00_WD=
+NF_01_LB=Make flash
+NF_01_CM=make TARGET=osd-merkur-256 flash
+NF_01_WD=
+NF_03_LB=Make Clean
+NF_03_CM=make clean TARGET=osd-merkur-256
+NF_03_WD=
+C++FT_00_LB=_Kompilieren
+C++FT_00_CM=make TARGET=osd-merkur-256
+C++FT_00_WD=
+C++FT_01_LB=_Erstellen
+C++FT_01_CM=make TARGET=osd-merkur-256 flash
+C++FT_01_WD=
+filetypes=C++;

examples/osd/arduino-i2c-scanner/flash.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+make TARGET=osd-merkur-128 flash

examples/osd/arduino-i2c-scanner/project-conf.h

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2010, Swedish Institute of Computer Science.
+ * 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.
+ *
+ *
+ */
+
+#ifndef PROJECT_RPL_WEB_CONF_H_
+#define PROJECT_RPL_WEB_CONF_H_
+
+#define PLATFORM_HAS_LEDS    1
+//#define PLATFORM_HAS_BUTTON  1
+#define PLATFORM_HAS_BATTERY 1
+
+
+#define LOOP_INTERVAL		(10 * CLOCK_SECOND)
+
+/* Save energy */
+//#define RDC_CONF_PT_YIELD_OFF
+
+/* For Debug: Dont allow MCU sleeping between channel checks */
+#undef RDC_CONF_MCU_SLEEP
+#define RDC_CONF_MCU_SLEEP       0
+
+/* Disabling RDC for demo purposes. Core updates often require more memory. */
+/* For projects, optimize memory and enable RDC again. */
+//#undef NETSTACK_CONF_RDC
+//#define NETSTACK_CONF_RDC     nullrdc_driver
+//#undef NETSTACK_CONF_MAC
+//#define  NETSTACK_CONF_MAC	nullmac_driver
+
+/* Increase rpl-border-router IP-buffer when using more than 64. */
+//#undef REST_MAX_CHUNK_SIZE
+//#define REST_MAX_CHUNK_SIZE    64
+
+/* Estimate your header size, especially when using Proxy-Uri. */
+/*
+#undef COAP_MAX_HEADER_SIZE
+#define COAP_MAX_HEADER_SIZE    70
+*/
+
+/* The IP buffer size must fit all other hops, in particular the border router. */
+
+#undef UIP_CONF_BUFFER_SIZE
+#define UIP_CONF_BUFFER_SIZE    256
+
+
+/* Multiplies with chunk size, be aware of memory constraints. */
+#undef COAP_MAX_OPEN_TRANSACTIONS
+#define COAP_MAX_OPEN_TRANSACTIONS   4
+
+/* Must be <= open transaction number, default is COAP_MAX_OPEN_TRANSACTIONS-1. */
+/*
+#undef COAP_MAX_OBSERVERS
+#define COAP_MAX_OBSERVERS      2
+*/
+
+/* Filtering .well-known/core per query can be disabled to save space. */
+/*
+#undef COAP_LINK_FORMAT_FILTERING
+#define COAP_LINK_FORMAT_FILTERING      0
+*/
+
+
+#endif /* PROJECT_RPL_WEB_CONF_H_ */

examples/osd/arduino-i2c-scanner/resources/res-led.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 <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);
+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_led,
+         "title=\"LED: , POST/PUT mode=on|off\";rt=\"Control\"",
+         res_get_handler,
+         res_post_put_handler,
+         res_post_put_handler,
+         NULL);
+
+extern  uint8_t led_pin;
+extern  uint8_t led_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", led_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}", led_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(led_pin, LOW);
+      led_status=1;
+    } else if(strncmp(mode, "off", len) == 0) {
+      digitalWrite(led_pin, HIGH);
+      led_status=0;
+    } else {
+      success = 0;
+    }
+  } else {
+    success = 0;
+  } if(!success) {
+    REST.set_response_status(response, REST.status.BAD_REQUEST);
+  }
+}

examples/osd/arduino-i2c-scanner/run.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+# For the ages-old bootloader (before 2014) you want to use
+# BOOTLOADER_GET_MAC=0x0001f3a0 as parameter to make below.
+make clean TARGET=osd-merkur-128
+make TARGET=osd-merkur-128

examples/osd/arduino-i2c-scanner/sketch.pde

@@ -0,0 +1,75 @@
+/*
+ * Sample arduino sketch using contiki features.
+ * We turn the LED off 
+ * We allow read the moisture sensor
+ * Unfortunately sleeping for long times in loop() isn't currently
+ * possible, something turns off the CPU (including PWM outputs) if a
+ * Proto-Thread is taking too long. We need to find out how to sleep in
+ * a Contiki-compatible way.
+ * Note that for a normal arduino sketch you won't have to include any
+ * of the contiki-specific files here, the sketch should just work.
+ */
+
+#include <Wire.h>
+
+extern "C" {
+#include "arduino-process.h"
+#include "rest-engine.h"
+#include "net/netstack.h"
+
+extern resource_t res_led, res_battery, res_cputemp;
+
+uint8_t led_pin=4;
+uint8_t led_status;
+}
+
+void setup (void)
+{
+    // switch off the led
+    pinMode(led_pin, OUTPUT);
+    digitalWrite(led_pin, HIGH);
+    led_status=0;
+    // i2c
+    Wire.begin();
+    // init coap resourcen
+    rest_init_engine ();
+    rest_activate_resource (&res_led, "s/led");
+    rest_activate_resource (&res_battery, "s/battery");
+    rest_activate_resource (&res_cputemp, "s/cputemp");
+    
+ //   NETSTACK_MAC.off(1);
+    mcu_sleep_set(128);
+}
+
+void loop (void)
+{
+  byte error, address;
+  int nDevices;
+ 
+  printf("Scanning...\n");
+ 
+  nDevices = 0;
+  for(address = 1; address < 127; address++ )
+  {
+    // The i2c_scanner uses the return value of
+    // the Write.endTransmisstion to see if
+    // a device did acknowledge to the address.
+    Wire.beginTransmission(address);
+    error = Wire.endTransmission();
+ 
+    if (error == 0)
+    {
+      printf("I2C device found at address %2X",address); 
+      nDevices++;
+    }
+    else if (error==4)
+    {
+      printf("Unknow error at address %2X",address);
+    }    
+  }
+  printf("\n");
+  if (nDevices == 0)
+    printf("No I2C devices found\n");
+  else
+    printf("done\n");
+}